diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar
index 264c07ee1..065dc1123 100644
Binary files a/lib/CitizensAPI.jar and b/lib/CitizensAPI.jar differ
diff --git a/src/net/citizensnpcs/Citizens.java b/src/net/citizensnpcs/Citizens.java
index b80364950..ba08480ad 100644
--- a/src/net/citizensnpcs/Citizens.java
+++ b/src/net/citizensnpcs/Citizens.java
@@ -1,13 +1,11 @@
 package net.citizensnpcs;
 
 import net.citizensnpcs.api.CitizensAPI;
-import net.citizensnpcs.api.CitizensPlugin;
-import net.citizensnpcs.api.npc.NPCManager;
 import net.citizensnpcs.npc.CitizensNPCManager;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-public class Citizens extends JavaPlugin implements CitizensPlugin {
+public class Citizens extends JavaPlugin {
 
 	@Override
 	public void onDisable() {
@@ -15,11 +13,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
 
 	@Override
 	public void onEnable() {
-		CitizensAPI.setInstance(this);
-	}
-
-	@Override
-	public NPCManager getNPCManager() {
-		return new CitizensNPCManager();
+		CitizensAPI.setNPCManager(new CitizensNPCManager());
 	}
 }
\ No newline at end of file