diff --git a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
index b5f69fc40..0383e1f33 100644
--- a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
+++ b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
@@ -36,7 +36,6 @@ import net.citizensnpcs.api.jnbt.CompoundTag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.util.BoundingBox;
 import net.citizensnpcs.api.util.EntityDim;
 import net.citizensnpcs.npc.ai.MCNavigationStrategy.MCNavigator;
@@ -156,7 +155,7 @@ public interface NMSBridge {
 
     public void removeFromWorld(org.bukkit.entity.Entity entity);
 
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity);
+    public void removeHookIfNecessary(FishHook entity);
 
     public void replaceTrackerEntry(Entity entity);
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
index d7450d666..3384c1f50 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
@@ -94,7 +94,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1045,11 +1044,11 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         EntityFishingHook hook = (EntityFishingHook) NMSImpl.getHandle(entity);
         if (hook.hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hook.hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hook.hooked.getBukkitEntity());
         if (npc == null)
             return;
         if (npc.isProtected()) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
index 0a53438a9..6ed9f887a 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
@@ -94,7 +94,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1103,11 +1102,11 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         EntityFishingHook hook = (EntityFishingHook) NMSImpl.getHandle(entity);
         if (hook.hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hook.hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hook.hooked.getBukkitEntity());
         if (npc == null)
             return;
         if (npc.isProtected()) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
index 111d9d1c0..26a814f22 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
@@ -94,7 +94,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1115,11 +1114,11 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         EntityFishingHook hook = (EntityFishingHook) NMSImpl.getHandle(entity);
         if (hook.hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hook.hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hook.hooked.getBukkitEntity());
         if (npc == null)
             return;
         if (npc.isProtected()) {
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
index 910440e3d..0fbd0ba39 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
@@ -95,7 +95,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1152,11 +1151,11 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         EntityFishingHook hook = (EntityFishingHook) NMSImpl.getHandle(entity);
         if (hook.hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hook.hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hook.hooked.getBukkitEntity());
         if (npc == null)
             return;
         if (npc.isProtected()) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
index 96219cb3c..1f10354da 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
@@ -93,7 +93,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1177,11 +1176,11 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         EntityFishingHook hook = (EntityFishingHook) NMSImpl.getHandle(entity);
         if (hook.hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hook.hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hook.hooked.getBukkitEntity());
         if (npc == null)
             return;
         if (npc.isProtected()) {
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
index 5845a4ebf..348eb47a9 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
@@ -93,7 +93,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1194,11 +1193,11 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         EntityFishingHook hook = (EntityFishingHook) NMSImpl.getHandle(entity);
         if (hook.hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hook.hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hook.hooked.getBukkitEntity());
         if (npc == null)
             return;
         if (npc.isProtected()) {
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
index 5826b4a55..175a484cb 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
@@ -95,7 +95,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1218,7 +1217,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         if (FISHING_HOOK_HOOKED == null)
             return;
         EntityFishingHook hook = (EntityFishingHook) NMSImpl.getHandle(entity);
@@ -1230,7 +1229,7 @@ public class NMSImpl implements NMSBridge {
         }
         if (hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hooked.getBukkitEntity());
         if (npc == null)
             return;
         if (npc.isProtected()) {
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
index f7fffebab..136ecc2c9 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
@@ -92,7 +92,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1218,12 +1217,12 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         FishingHook hook = (FishingHook) NMSImpl.getHandle(entity);
         Entity hooked = hook.getHookedIn();
         if (hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hooked.getBukkitEntity());
         if (npc != null && npc.isProtected()) {
             hook.hookedIn = null;
             hook.getBukkitEntity().remove();
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
index ed9db126f..e952e52ad 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
@@ -93,7 +93,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1226,12 +1225,12 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         FishingHook hook = (FishingHook) NMSImpl.getHandle(entity);
         Entity hooked = hook.getHookedIn();
         if (hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hooked.getBukkitEntity());
         if (npc != null && npc.isProtected()) {
             hook.hookedIn = null;
             hook.getBukkitEntity().remove();
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
index 446451368..3c895dee6 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
@@ -98,7 +98,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1326,12 +1325,12 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         FishingHook hook = (FishingHook) getHandle(entity);
         Entity hooked = hook.getHookedIn();
         if (hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hooked.getBukkitEntity());
         if (npc != null && npc.isProtected()) {
             hook.hookedIn = null;
             hook.getBukkitEntity().remove();
diff --git a/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/util/NMSImpl.java b/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/util/NMSImpl.java
index a30164562..03f5d3602 100644
--- a/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/util/NMSImpl.java
+++ b/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/util/NMSImpl.java
@@ -97,7 +97,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.BoundingBox;
@@ -1327,12 +1326,12 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         FishingHook hook = (FishingHook) getHandle(entity);
         Entity hooked = hook.getHookedIn();
         if (hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hooked.getBukkitEntity());
         if (npc != null && npc.isProtected()) {
             hook.hookedIn = null;
             hook.getBukkitEntity().remove();
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
index 8b43034e0..95fb7af31 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
@@ -91,7 +91,6 @@ import net.citizensnpcs.api.jnbt.Tag;
 import net.citizensnpcs.api.npc.BlockBreaker;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.util.BoundingBox;
 import net.citizensnpcs.api.util.EntityDim;
 import net.citizensnpcs.api.util.Messaging;
@@ -976,11 +975,11 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
+    public void removeHookIfNecessary(FishHook entity) {
         EntityFishingHook hook = (EntityFishingHook) NMSImpl.getHandle(entity);
         if (hook.hooked == null)
             return;
-        NPC npc = npcRegistry.getNPC(hook.hooked.getBukkitEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(hook.hooked.getBukkitEntity());
         if (npc == null)
             return;
         if (npc.isProtected()) {