diff --git a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
index 0eece10..fdec66e 100644
--- a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
+++ b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
@@ -48,7 +48,6 @@ import me.mattstudios.citizenscmd.utility.EnumTypes;
 import me.mattstudios.citizenscmd.utility.Messages;
 import me.mattstudios.citizenscmd.utility.Util;
 import net.citizensnpcs.api.event.NPCLeftClickEvent;
-import net.citizensnpcs.api.event.NPCRemoveEvent;
 import net.citizensnpcs.api.event.NPCRightClickEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.kyori.adventure.audience.Audience;
@@ -228,15 +227,6 @@ public class NPCClickListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onRemoveNPC(NPCRemoveEvent event) {
-        if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
-            return;
-        }
-
-        plugin.getDataHandler().removeNPCData(event.getNPC().getId());
-    }
-
     /**
      * Does the main commands for both left and right clicks.
      *
diff --git a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
index b77b5ec..76c8fab 100644
--- a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
+++ b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
@@ -6,6 +6,7 @@ import org.bukkit.event.Listener;
 
 import me.mattstudios.citizenscmd.CitizensCMD;
 import net.citizensnpcs.api.event.NPCCloneEvent;
+import net.citizensnpcs.api.event.NPCRemoveEvent;
 
 public class NPCListener implements Listener {
 
@@ -16,11 +17,20 @@ public class NPCListener implements Listener {
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void on(NPCCloneEvent event) {
+    public void onCloneNPC(NPCCloneEvent event) {
         if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
             return;
         }
 
         plugin.getDataHandler().cloneData(event.getNPC().getId(), event.getClone().getId());
     }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onRemoveNPC(NPCRemoveEvent event) {
+        if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
+            return;
+        }
+
+        plugin.getDataHandler().removeNPCData(event.getNPC().getId());
+    }
 }