diff --git a/src/main/java/net/babamod/mineclass/Mineclass.java b/src/main/java/net/babamod/mineclass/Mineclass.java
index 4e01783..dd03f81 100644
--- a/src/main/java/net/babamod/mineclass/Mineclass.java
+++ b/src/main/java/net/babamod/mineclass/Mineclass.java
@@ -2,7 +2,7 @@ package net.babamod.mineclass;
 
 import net.babamod.mineclass.commands.CommandClass;
 import net.babamod.mineclass.utils.AppliedStatus;
-import net.babamod.mineclass.utils.MineClassListeners;
+import net.babamod.mineclass.listeners.MineClassListeners;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
diff --git a/src/main/java/net/babamod/mineclass/utils/MineClassListeners.java b/src/main/java/net/babamod/mineclass/listeners/MineClassListeners.java
similarity index 81%
rename from src/main/java/net/babamod/mineclass/utils/MineClassListeners.java
rename to src/main/java/net/babamod/mineclass/listeners/MineClassListeners.java
index d252efe..5caffeb 100644
--- a/src/main/java/net/babamod/mineclass/utils/MineClassListeners.java
+++ b/src/main/java/net/babamod/mineclass/listeners/MineClassListeners.java
@@ -1,7 +1,11 @@
-package net.babamod.mineclass.utils;
+package net.babamod.mineclass.listeners;
 
 import net.babamod.mineclass.Mineclass;
 import net.babamod.mineclass.classes.ClassWrapper;
+import net.babamod.mineclass.utils.AppliedStatus;
+import net.babamod.mineclass.utils.ApplyClassStatusTask;
+import net.babamod.mineclass.utils.ClassItemPossessed;
+import net.babamod.mineclass.utils.SmeltingEngine;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.SmallFireball;
@@ -91,14 +95,6 @@ public class MineClassListeners implements Listener {
       enchantItem(event);
     }
 
-    if ((event.getAction().equals(InventoryAction.PLACE_ALL)
-            || event.getAction().equals(InventoryAction.PLACE_ONE)
-            || event.getAction().equals(InventoryAction.PLACE_SOME))
-        && event.getWhoClicked() instanceof Player
-        && !(event.getClickedInventory() instanceof PlayerInventory)) {
-      unenchantItem(event);
-    }
-
     if ((event.getAction().equals(InventoryAction.MOVE_TO_OTHER_INVENTORY))
         && event.getWhoClicked() instanceof Player) {
       if (isForbiddenItem(event)) {
@@ -134,18 +130,6 @@ public class MineClassListeners implements Listener {
     }
   }
 
-  private void unenchantItem(InventoryClickEvent event) {
-    Player player = (Player) event.getWhoClicked();
-    if (AppliedStatus.getInstance().hasAClass(player.getName())) {
-      if (event.getCurrentItem() != null && ClassWrapper.isSoulBound(event.getCurrentItem())) {
-        ClassWrapper.removeAllEnchantments(event.getCurrentItem());
-      }
-      if (event.getCursor() != null && ClassWrapper.isSoulBound(event.getCursor())) {
-        ClassWrapper.removeAllEnchantments(event.getCursor());
-      }
-    }
-  }
-
   @EventHandler
   public void on(BlockBreakEvent event) {
     Player player = event.getPlayer();
@@ -173,22 +157,6 @@ public class MineClassListeners implements Listener {
     }
   }
 
-  @EventHandler
-  public void on(PlayerInteractEvent event) {
-    if (event.getItem() != null && event.getItem().getType().equals(Material.CROSSBOW)) {
-      if (event
-          .getPlayer()
-          .getInventory()
-          .getItemInOffHand()
-          .getType()
-          .equals(Material.FIREWORK_ROCKET)) {
-        event
-            .getPlayer()
-            .sendMessage("You've interacted with a crossbow with a firework in offhand.");
-      }
-    }
-  }
-
   @EventHandler
   public void on(EntityShootBowEvent event) {
     if (event.getBow() != null && event.getBow().getType().equals(Material.CROSSBOW)) {