diff --git a/src/net/citizensnpcs/npc/CitizensNPCManager.java b/src/net/citizensnpcs/npc/CitizensNPCManager.java
index ae4ecdd2d..551cf6188 100644
--- a/src/net/citizensnpcs/npc/CitizensNPCManager.java
+++ b/src/net/citizensnpcs/npc/CitizensNPCManager.java
@@ -48,12 +48,7 @@ public class CitizensNPCManager implements NPCManager {
 
 	@Override
 	public NPC getNPC(int id) {
-		for (NPC npc : spawned.values()) {
-			if (npc.getId() == id) {
-				return npc;
-			}
-		}
-		return null;
+		return byID.get(id);
 	}
 
 	@Override
@@ -115,6 +110,10 @@ public class CitizensNPCManager implements NPCManager {
 		spawned.remove(mcEntity.getPlayer());
 	}
 
+	public void remove(NPC npc) {
+		byID.remove(npc.getId());
+	}
+
 	private WorldServer getWorldServer(World world) {
 		return ((CraftWorld) world).getHandle();
 	}