diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorDisable.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorDisable.java
new file mode 100644
index 00000000..4c7e3e24
--- /dev/null
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorDisable.java
@@ -0,0 +1,16 @@
+package de.steamwar.bausystem.features.simulator;
+
+import de.steamwar.bausystem.linkage.Disable;
+import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.bausystem.linkage.Linked;
+
+@Linked(LinkageType.DISABLE_LINK)
+public class TNTSimulatorDisable implements Disable {
+
+    @Override
+    public void disable() {
+        for (TNTSimulator simulator : TNTSimulator.TNT_SIMULATOR_MAP.values()) {
+            simulator.save();
+        }
+    }
+}
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java
index ba3b3763..f2743fb8 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java
@@ -23,7 +23,6 @@ package de.steamwar.bausystem.features.simulator;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.Disable;
 import de.steamwar.bausystem.linkage.LinkageType;
 import de.steamwar.bausystem.linkage.Linked;
 import org.bukkit.FluidCollisionMode;
@@ -48,8 +47,7 @@ import static de.steamwar.bausystem.features.simulator.TNTSimulator.WAND;
 import static de.steamwar.bausystem.features.simulator.TNTSimulator.get;
 
 @Linked(LinkageType.LISTENER)
-@Linked(LinkageType.DISABLE_LINK)
-public class TNTSimulatorListener implements Listener, Disable {
+public class TNTSimulatorListener implements Listener {
 
     private boolean permissionCheck(Player player) {
         if (!Permission.hasPermission(player, Permission.WORLD)) {
@@ -144,11 +142,4 @@ public class TNTSimulatorListener implements Listener, Disable {
     public void onPlayerQuit(PlayerQuitEvent event) {
         get(event.getPlayer()).saveAndDelete();
     }
-
-    @Override
-    public void disable() {
-        for (TNTSimulator simulator : TNTSimulator.TNT_SIMULATOR_MAP.values()) {
-            simulator.save();
-        }
-    }
 }
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java
index 5669cae3..74adbee9 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java
@@ -37,7 +37,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 @Linked(LinkageType.LISTENER)
@@ -64,7 +63,6 @@ public class SmartPlaceListener implements Listener {
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
-        System.out.println(event);
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
         if (event.getPlayer().getGameMode() == GameMode.SPECTATOR) return;
         if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return;