diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 65b56472d4..12c5ad8423 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -2,7 +2,6 @@
 package org.bukkit.craftbukkit;
 
 import java.lang.ref.WeakReference;
-import java.util.HashMap;
 import net.minecraft.server.ChunkPosition;
 
 import net.minecraft.server.WorldServer;
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 7522fbfc44..a60e0bcbb8 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -2,8 +2,6 @@ package org.bukkit.craftbukkit;
 
 import java.io.File;
 import java.io.IOException;
-import java.text.DateFormat;
-import java.text.Format;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.List;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 410e4c8c27..46c527c660 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -21,7 +21,6 @@ import net.minecraft.server.ItemStack;
 import net.minecraft.server.World;
 import net.minecraft.server.WorldServer;
 
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -31,7 +30,6 @@ import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.block.CraftBlock;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.CreatureType;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.Action;
@@ -80,7 +78,7 @@ public class CraftEventFactory {
 
         boolean canBuild = canBuild(craftWorld, player, placedBlock.getX(), placedBlock.getZ());
 
-        BlockPlaceEvent event = new BlockPlaceEvent(Type.BLOCK_PLACE, placedBlock, replacedBlockState, blockClicked, itemInHand, player, canBuild);
+        BlockPlaceEvent event = new BlockPlaceEvent(placedBlock, replacedBlockState, blockClicked, itemInHand, player, canBuild);
         craftServer.getPluginManager().callEvent(event);
 
         return event;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/ConcurrentSoftMap.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/ConcurrentSoftMap.java
index 0099ae9235..bbf5693bc9 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/ConcurrentSoftMap.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/ConcurrentSoftMap.java
@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.util;
 
 import java.util.Map;
-import java.util.AbstractMap;
 import java.util.LinkedList;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.Set;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java
index bcf78df357..79e7d43963 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java
@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.util;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import net.minecraft.server.Chunk;
 import net.minecraft.server.MinecraftServer;
 import static org.bukkit.craftbukkit.util.Java15Compat.Arrays_copyOf;