diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java
index d9ac3190e9..4e62fc0ab0 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java
@@ -1,11 +1,9 @@
-
 package org.bukkit.craftbukkit;
 
 import net.minecraft.server.Entity;
 import net.minecraft.server.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.Vector;
-import org.bukkit.Vehicle;
 import org.bukkit.World;
 
 public abstract class CraftEntity implements org.bukkit.Entity {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java
index df36affa78..f8d74c94bb 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java
@@ -1,6 +1,5 @@
 package org.bukkit.craftbukkit;
 
-import java.util.ArrayList;
 import net.minecraft.server.InventoryPlayer;
 
 import org.bukkit.ItemStack;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2444070d65..c60118ceda 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -34,7 +34,7 @@ public final class CraftServer implements Server {
 
         if (pluginFolder.exists()) {
             try {
-                Plugin[] plugins = plugins = pluginManager.loadPlugins(pluginFolder);
+                Plugin[] plugins = pluginManager.loadPlugins(pluginFolder);
 
                 for (Plugin plugin : plugins) {
                     pluginManager.enablePlugin(plugin);
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 28deed207c..66f28647d0 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1,4 +1,3 @@
-
 package org.bukkit.craftbukkit;
 
 import java.util.HashMap;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
index db33837468..2d75096f76 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -1,4 +1,3 @@
-
 package org.bukkit.craftbukkit;
 
 import java.io.File;