diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/SkillAPIHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/SkillAPIHK.java
index 415c4568..92f56216 100644
--- a/src/main/java/su/nightexpress/quantumrpg/hooks/external/SkillAPIHK.java
+++ b/src/main/java/su/nightexpress/quantumrpg/hooks/external/SkillAPIHK.java
@@ -20,7 +20,6 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/ModuleItem.java b/src/main/java/su/nightexpress/quantumrpg/modules/ModuleItem.java
index 5d775512..a133b21c 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/ModuleItem.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/ModuleItem.java
@@ -24,7 +24,6 @@
 import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.modules.api.QModuleDrop;
 import su.nightexpress.quantumrpg.modules.list.identify.IdentifyManager.UnidentifiedItem;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/command/MDropCmd.java b/src/main/java/su/nightexpress/quantumrpg/modules/command/MDropCmd.java
index 2f4f2c52..5b357f54 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/command/MDropCmd.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/command/MDropCmd.java
@@ -8,7 +8,6 @@
 import mc.promcteam.engine.utils.LocUT;
 import mc.promcteam.engine.utils.random.Rnd;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/command/MGetCmd.java b/src/main/java/su/nightexpress/quantumrpg/modules/command/MGetCmd.java
index 92145110..6b27d104 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/command/MGetCmd.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/command/MGetCmd.java
@@ -6,7 +6,6 @@
 import mc.promcteam.engine.items.exception.MissingProviderException;
 import mc.promcteam.engine.utils.ItemUT;
 import mc.promcteam.engine.utils.random.Rnd;
-import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/command/MGiveCmd.java b/src/main/java/su/nightexpress/quantumrpg/modules/command/MGiveCmd.java
index c890de60..0825744c 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/command/MGiveCmd.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/command/MGiveCmd.java
@@ -7,7 +7,6 @@
 import mc.promcteam.engine.utils.ItemUT;
 import mc.promcteam.engine.utils.PlayerUT;
 import mc.promcteam.engine.utils.random.Rnd;
-import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/UsesByLevelGUI.java b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/UsesByLevelGUI.java
index cbb4f1f5..05584e08 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/UsesByLevelGUI.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/UsesByLevelGUI.java
@@ -1,7 +1,7 @@
 package su.nightexpress.quantumrpg.modules.list.itemgenerator.editor;
 
-import mc.promcteam.engine.manager.api.menu.Slot;
 import mc.promcteam.engine.config.api.JYML;
+import mc.promcteam.engine.manager.api.menu.Slot;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/materials/MainModelDataGUI.java b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/materials/MainModelDataGUI.java
index 0a3384ed..cb89c96a 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/materials/MainModelDataGUI.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/materials/MainModelDataGUI.java
@@ -1,7 +1,7 @@
 package su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.materials;
 
-import mc.promcteam.engine.manager.api.menu.Slot;
 import mc.promcteam.engine.config.api.JYML;
+import mc.promcteam.engine.manager.api.menu.Slot;
 import mc.promcteam.engine.utils.StringUT;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/materials/ModelDataGUI.java b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/materials/ModelDataGUI.java
index a8963e28..273c0f8e 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/materials/ModelDataGUI.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/materials/ModelDataGUI.java
@@ -1,7 +1,7 @@
 package su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.materials;
 
-import mc.promcteam.engine.manager.api.menu.Slot;
 import mc.promcteam.engine.config.api.JYML;
+import mc.promcteam.engine.manager.api.menu.Slot;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.AbstractEditorGUI;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/skills/NewSkillGUI.java b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/skills/NewSkillGUI.java
index 5f8b6c26..fb661675 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/skills/NewSkillGUI.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/skills/NewSkillGUI.java
@@ -1,7 +1,7 @@
 package su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.skills;
 
-import mc.promcteam.engine.manager.api.menu.Slot;
 import mc.promcteam.engine.config.api.JYML;
+import mc.promcteam.engine.manager.api.menu.Slot;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/skills/SkillListGUI.java b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/skills/SkillListGUI.java
index 45662392..d4b8ea1e 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/skills/SkillListGUI.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/skills/SkillListGUI.java
@@ -1,7 +1,7 @@
 package su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.skills;
 
-import mc.promcteam.engine.manager.api.menu.Slot;
 import mc.promcteam.engine.config.api.JYML;
+import mc.promcteam.engine.manager.api.menu.Slot;
 import mc.promcteam.engine.utils.StringUT;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/sockets/SocketGUI.java b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/sockets/SocketGUI.java
index 6885162f..5c303c88 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/sockets/SocketGUI.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/sockets/SocketGUI.java
@@ -8,7 +8,6 @@
 import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.AbstractEditorGUI;
 import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.EditorGUI;
 import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.LoreGUI;
-import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.skills.SkillGUI;
 import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.stats.MainStatsGUI;
 
 import java.util.ArrayList;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/trimmings/TrimmingMaterialGUI.java b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/trimmings/TrimmingMaterialGUI.java
index eddf6ab8..09b66cdc 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/trimmings/TrimmingMaterialGUI.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/trimmings/TrimmingMaterialGUI.java
@@ -4,7 +4,6 @@
 import org.bukkit.Material;
 import org.bukkit.Registry;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.meta.trim.ArmorTrim;
 import org.bukkit.inventory.meta.trim.TrimMaterial;
 import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.AbstractEditorGUI;
 import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.EditorGUI;
diff --git a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/trimmings/TrimmingPatternsGUI.java b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/trimmings/TrimmingPatternsGUI.java
index eb986912..99867bfb 100644
--- a/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/trimmings/TrimmingPatternsGUI.java
+++ b/src/main/java/su/nightexpress/quantumrpg/modules/list/itemgenerator/editor/trimmings/TrimmingPatternsGUI.java
@@ -4,7 +4,6 @@
 import org.bukkit.Material;
 import org.bukkit.Registry;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.meta.trim.ArmorTrim;
 import org.bukkit.inventory.meta.trim.TrimPattern;
 import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.AbstractEditorGUI;
 import su.nightexpress.quantumrpg.modules.list.itemgenerator.editor.EditorGUI;
diff --git a/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/UniversalPacketHandler.java b/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/UniversalPacketHandler.java
index 8b12d98d..6613949f 100644
--- a/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/UniversalPacketHandler.java
+++ b/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/UniversalPacketHandler.java
@@ -5,14 +5,11 @@
 import mc.promcteam.engine.nms.packets.IPacketHandler;
 import mc.promcteam.engine.nms.packets.events.EnginePlayerPacketEvent;
 import mc.promcteam.engine.nms.packets.events.EngineServerPacketEvent;
-import mc.promcteam.engine.utils.ItemUT;
 import mc.promcteam.engine.utils.Reflex;
 import mc.promcteam.engine.utils.reflection.ReflectionManager;
 import mc.promcteam.engine.utils.reflection.ReflectionUtil;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -23,12 +20,10 @@
 import su.nightexpress.quantumrpg.data.api.UserEntityNamesMode;
 import su.nightexpress.quantumrpg.data.api.UserProfile;
 import su.nightexpress.quantumrpg.manager.EntityManager;
-import su.nightexpress.quantumrpg.modules.list.itemhints.ItemHintsManager;
-import su.nightexpress.quantumrpg.nms.packets.PacketManager;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.List;
+import java.util.UUID;
 
 public class UniversalPacketHandler implements IPacketHandler {
 
diff --git a/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/V1_17_R1.java b/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/V1_17_R1.java
index 6081919a..95a61bcd 100644
--- a/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/V1_17_R1.java
+++ b/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/V1_17_R1.java
@@ -6,12 +6,9 @@
 import mc.promcteam.engine.nms.packets.IPacketHandler;
 import mc.promcteam.engine.nms.packets.events.EnginePlayerPacketEvent;
 import mc.promcteam.engine.nms.packets.events.EngineServerPacketEvent;
-import mc.promcteam.engine.utils.ItemUT;
 import mc.promcteam.engine.utils.Reflex;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -22,14 +19,9 @@
 import su.nightexpress.quantumrpg.data.api.UserEntityNamesMode;
 import su.nightexpress.quantumrpg.data.api.UserProfile;
 import su.nightexpress.quantumrpg.manager.EntityManager;
-import su.nightexpress.quantumrpg.modules.list.itemhints.ItemHintsManager;
-import su.nightexpress.quantumrpg.nms.packets.PacketManager;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 
 public class V1_17_R1 extends UniversalPacketHandler implements IPacketHandler {
diff --git a/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/V1_18_R1.java b/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/V1_18_R1.java
index 51ffb1f0..e0686f8c 100644
--- a/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/V1_18_R1.java
+++ b/src/main/java/su/nightexpress/quantumrpg/nms/packets/versions/V1_18_R1.java
@@ -6,18 +6,13 @@
 import mc.promcteam.engine.nms.packets.IPacketHandler;
 import mc.promcteam.engine.nms.packets.events.EnginePlayerPacketEvent;
 import mc.promcteam.engine.nms.packets.events.EngineServerPacketEvent;
-import mc.promcteam.engine.utils.ItemUT;
 import mc.promcteam.engine.utils.Reflex;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.scoreboard.Scoreboard;
-import org.bukkit.scoreboard.Team;
 import org.jetbrains.annotations.NotNull;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.api.event.EntityEquipmentChangeEvent;
@@ -26,7 +21,6 @@
 import su.nightexpress.quantumrpg.data.api.UserEntityNamesMode;
 import su.nightexpress.quantumrpg.data.api.UserProfile;
 import su.nightexpress.quantumrpg.manager.EntityManager;
-import su.nightexpress.quantumrpg.modules.list.itemhints.ItemHintsManager;
 
 import java.lang.reflect.Method;
 import java.util.List;