diff --git a/NMS/v1_16_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSItem.java b/NMS/v1_16_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSItem.java
index 9319f1e3..3c1e24fc 100644
--- a/NMS/v1_16_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSItem.java
+++ b/NMS/v1_16_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSItem.java
@@ -14,6 +14,12 @@
  */
 package com.gmail.filoghost.holographicdisplays.nms.v1_16_R1;
 
+import java.util.logging.Level;
+
+import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
+import org.bukkit.entity.Player;
+
 import com.gmail.filoghost.holographicdisplays.api.line.ItemLine;
 import com.gmail.filoghost.holographicdisplays.nms.interfaces.ItemPickupManager;
 import com.gmail.filoghost.holographicdisplays.nms.interfaces.entity.NMSEntityBase;
@@ -21,12 +27,19 @@ import com.gmail.filoghost.holographicdisplays.nms.interfaces.entity.NMSItem;
 import com.gmail.filoghost.holographicdisplays.util.ConsoleLogger;
 import com.gmail.filoghost.holographicdisplays.util.ItemUtils;
 import com.gmail.filoghost.holographicdisplays.util.reflection.ReflectField;
-import net.minecraft.server.v1_16_R1.*;
-import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
-import org.bukkit.entity.Player;
 
-import java.util.logging.Level;
+import net.minecraft.server.v1_16_R1.Blocks;
+import net.minecraft.server.v1_16_R1.DamageSource;
+import net.minecraft.server.v1_16_R1.Entity;
+import net.minecraft.server.v1_16_R1.EntityHuman;
+import net.minecraft.server.v1_16_R1.EntityItem;
+import net.minecraft.server.v1_16_R1.EntityPlayer;
+import net.minecraft.server.v1_16_R1.EntityTypes;
+import net.minecraft.server.v1_16_R1.ItemStack;
+import net.minecraft.server.v1_16_R1.NBTTagCompound;
+import net.minecraft.server.v1_16_R1.NBTTagList;
+import net.minecraft.server.v1_16_R1.NBTTagString;
+import net.minecraft.server.v1_16_R1.World;
 
 public class EntityNMSItem extends EntityItem implements NMSItem {
 
diff --git a/NMS/v1_16_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R1/NmsManagerImpl.java b/NMS/v1_16_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R1/NmsManagerImpl.java
index d8120294..f4e0fffb 100644
--- a/NMS/v1_16_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R1/NmsManagerImpl.java
+++ b/NMS/v1_16_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R1/NmsManagerImpl.java
@@ -16,7 +16,6 @@ package com.gmail.filoghost.holographicdisplays.nms.v1_16_R1;
 
 import java.util.List;
 
-import net.minecraft.server.v1_16_R1.EnumChatFormat;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_16_R1.CraftWorld;
 import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity;