diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
index 00b22c641..28dd51ed6 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
@@ -100,6 +100,7 @@ public final class RS {
 
         MinecraftForge.EVENT_BUS.register(new NetworkNodeListener());
         MinecraftForge.EVENT_BUS.register(new NetworkListener());
+        MinecraftForge.EVENT_BUS.register(new BlockListener());
 
         API.instance().getStorageDiskRegistry().add(ItemStorageDiskFactory.ID, new ItemStorageDiskFactory());
         API.instance().getStorageDiskRegistry().add(FluidStorageDiskFactory.ID, new FluidStorageDiskFactory());
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockListener.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockListener.java
new file mode 100644
index 000000000..a5e28356f
--- /dev/null
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockListener.java
@@ -0,0 +1,14 @@
+package com.raoulvdberge.refinedstorage.block;
+
+import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+public class BlockListener {
+    // Allow break without tool
+    @SubscribeEvent
+    public void onHarvestCheck(PlayerEvent.HarvestCheck e) {
+        if (e.getTargetBlock().getBlock() instanceof BaseBlock) {
+            e.setCanHarvest(true);
+        }
+    }
+}
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
deleted file mode 100755
index 95c5eaaba..000000000
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.raoulvdberge.refinedstorage.proxy;
-
-public class ProxyCommon {
-    /* TODO
-    public void preInit(FMLPreInitializationEvent e) {
-        MinecraftForge.EVENT_BUS.register(this);
-
-        IntegrationInventorySorter.register();
-    }
-
-    public void init(FMLInitializationEvent e) {
-        if (IntegrationCraftingTweaks.isLoaded()) {
-            IntegrationCraftingTweaks.register();
-        }
-    }
-
-    @SubscribeEvent
-    public void onHarvestCheck(PlayerEvent.HarvestCheck e) {
-        if (e.getTargetBlock().getBlock() instanceof BlockBase) {
-            e.setCanHarvest(true); // Allow break without tool
-        }
-    }*/
-}