diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java
index 61967f246..a8e76aa4e 100644
--- a/src/main/java/noppes/npcs/CustomNpcs.java
+++ b/src/main/java/noppes/npcs/CustomNpcs.java
@@ -180,7 +180,10 @@ public class CustomNpcs {
         MinecraftForge.EVENT_BUS.register(scriptPlayerEventHandler);
         FMLCommonHandler.instance().bus().register(scriptPlayerEventHandler);
 
-        FMLCommonHandler.instance().bus().register(new ScriptForgeEventHandler().registerForgeEvents());
+        ScriptForgeEventHandler forgeEventHandler = new ScriptForgeEventHandler();
+        MinecraftForge.EVENT_BUS.register(forgeEventHandler.registerForgeEvents());
+        FMLCommonHandler.instance().bus().register(forgeEventHandler.registerForgeEvents());
+
 		FMLCommonHandler.instance().bus().register(new ServerTickHandler());
         
         registerNpc(EntityNPCHumanMale.class, "npchumanmale");
diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java
index 3732e1802..a5e620ce6 100644
--- a/src/main/java/noppes/npcs/ServerEventsHandler.java
+++ b/src/main/java/noppes/npcs/ServerEventsHandler.java
@@ -69,13 +69,6 @@ public class ServerEventsHandler {
 //		exps.put(player.getCommandSenderName(), player.experienceTotal);
 //	}
 
-	@SubscribeEvent
-	public void invoke(CommandEvent event){
-		if(CustomNpcs.getServer() != null && ScriptController.Instance.forgeScripts.isEnabled()) {
-			EventHooks.onForgeEvent(new ForgeEvent(event), event);
-		}
-	}
-
 	@SubscribeEvent
 	public void invoke(EntityInteractEvent event) {
 		ItemStack item = event.entityPlayer.getCurrentEquippedItem();
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
index 9b8e11e86..e6328ab6b 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
@@ -170,10 +170,6 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
                         }
                     }
                 }
-                String eventName = CommandEvent.class.getName();
-                int i = eventName.lastIndexOf(".");
-                eventName = StringUtils.uncapitalize(eventName.substring(i + 1).replace("$", ""));
-                hookList.add(eventName);
             }
             hooks.setUnsortedList(hookList);
             addScroll(hooks);