diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java
index d7adef4e..6aac6f8f 100644
--- a/src/resonantinduction/ResonantInduction.java
+++ b/src/resonantinduction/ResonantInduction.java
@@ -168,8 +168,6 @@ public class ResonantInduction
 		GameRegistry.registerTileEntity(TileEntityEMContractor.class, blockEMContractor.getUnlocalizedName());
 		GameRegistry.registerTileEntity(TileEntityBattery.class, blockBattery.getUnlocalizedName());
 
-		TickRegistry.registerTickHandler(new BatteryManager(), Side.SERVER);
-
 		ResonantInduction.proxy.registerRenderers();
 
 		TabRI.ITEMSTACK = new ItemStack(blockTesla);
diff --git a/src/resonantinduction/battery/BatteryManager.java b/src/resonantinduction/battery/BatteryManager.java
index 8480fa60..e3db07de 100644
--- a/src/resonantinduction/battery/BatteryManager.java
+++ b/src/resonantinduction/battery/BatteryManager.java
@@ -1,42 +1,14 @@
 package resonantinduction.battery;
 
-import java.util.EnumSet;
-
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import resonantinduction.api.IBattery;
-import cpw.mods.fml.common.ITickHandler;
-import cpw.mods.fml.common.TickType;
 
-public class BatteryManager implements ITickHandler
+public class BatteryManager
 {
 	public static final int CELLS_PER_BATTERY = 16;
 	
-	@Override
-	public void tickStart(EnumSet<TickType> type, Object... tickData)
-	{
-		
-	}
-
-	@Override
-	public void tickEnd(EnumSet<TickType> type, Object... tickData)
-	{
-		
-	}
-
-	@Override
-	public EnumSet<TickType> ticks()
-	{
-		return EnumSet.of(TickType.WORLD);
-	}
-
-	@Override
-	public String getLabel()
-	{
-		return "BatteryMultiblockManager";
-	}
-	
 	public static class SlotOut extends Slot
 	{
 		public SlotOut(IInventory inventory, int index, int x, int y)