diff --git a/src/main/java/com/hbm/blocks/generic/BlockEmitter.java b/src/main/java/com/hbm/blocks/generic/BlockEmitter.java
index fa38c3618..c6d8d59f6 100644
--- a/src/main/java/com/hbm/blocks/generic/BlockEmitter.java
+++ b/src/main/java/com/hbm/blocks/generic/BlockEmitter.java
@@ -4,13 +4,16 @@ import java.awt.Color;
 import java.util.List;
 
 import com.hbm.blocks.ITooltipProvider;
-import com.hbm.packet.toclient.AuxParticlePacketNT;
+import com.hbm.packet.PacketDispatcher;
 import com.hbm.tileentity.IBufPacketReceiver;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import api.hbm.block.IToolable;
+import com.hbm.tileentity.TileEntityLoadedBase;
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.BlockPistonBase;
diff --git a/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java b/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java
index b6044e274..fd525f9f6 100644
--- a/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java
+++ b/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java
@@ -10,8 +10,6 @@ import com.hbm.blocks.IPersistentInfoProvider;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.toclient.BufPacket;
 import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.tileentity.IPersistentNBT;
 import com.hbm.tileentity.TileEntityLoadedBase;
@@ -22,7 +20,6 @@ import com.hbm.util.fauxpointtwelve.BlockPos;
 import api.hbm.energymk2.IEnergyProviderMK2;
 import api.hbm.energymk2.IEnergyReceiverMK2;
 import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
diff --git a/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java b/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
index 3e931baae..f385a6f9d 100644
--- a/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
+++ b/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
@@ -1,6 +1,5 @@
 package com.hbm.tileentity;
 
-import com.hbm.packet.AuxGaugePacket;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.AuxGaugePacket;
 import com.hbm.packet.toclient.BufPacket;
diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityCharge.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityCharge.java
index 9ad2765c0..4d4b08836 100644
--- a/src/main/java/com/hbm/tileentity/bomb/TileEntityCharge.java
+++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityCharge.java
@@ -3,7 +3,6 @@ package com.hbm.tileentity.bomb;
 import com.hbm.blocks.bomb.BlockChargeBase;
 import com.hbm.tileentity.IBufPacketReceiver;
 
-import cpw.mods.fml.common.network.NetworkRegistry;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.tileentity.TileEntity;
 
diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHadronPower.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHadronPower.java
index ce8f2daa9..c42db2790 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityHadronPower.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHadronPower.java
@@ -1,13 +1,10 @@
 package com.hbm.tileentity.machine;
 
 import com.hbm.blocks.machine.BlockHadronPower;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.toclient.BufPacket;
 import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.tileentity.TileEntityLoadedBase;
 
 import api.hbm.energymk2.IEnergyReceiverMK2;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java
index 76e7714e2..15e1f0977 100644
--- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java
+++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java
@@ -5,15 +5,12 @@ import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.recipes.FractionRecipes;
 import com.hbm.lib.Library;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.toclient.BufPacket;
 import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.tileentity.TileEntityLoadedBase;
 import com.hbm.util.Tuple.Pair;
 import com.hbm.util.fauxpointtwelve.DirPos;
 
 import api.hbm.fluid.IFluidStandardTransceiver;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java
index 76694847d..ff74f602a 100644
--- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java
+++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java
@@ -224,7 +224,7 @@ public abstract class TileEntityRBMKBase extends TileEntityLoadedBase implements
 
 		NeutronNodeWorld.removeNode(new BlockPos(this)); // woo-fucking-hoo!!!
 	}
-	
+
 	@Override
 	public void markDirty() {
 		
diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityFileCabinet.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityFileCabinet.java
index aa9aff809..7b66c3d55 100644
--- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityFileCabinet.java
+++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityFileCabinet.java
@@ -2,12 +2,9 @@ package com.hbm.tileentity.machine.storage;
 
 import com.hbm.inventory.container.ContainerFileCabinet;
 import com.hbm.inventory.gui.GUIFileCabinet;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.toclient.BufPacket;
 import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.tileentity.IGUIProvider;
 
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityDroneWaypoint.java b/src/main/java/com/hbm/tileentity/network/TileEntityDroneWaypoint.java
index d2facb170..ffd51fb0f 100644
--- a/src/main/java/com/hbm/tileentity/network/TileEntityDroneWaypoint.java
+++ b/src/main/java/com/hbm/tileentity/network/TileEntityDroneWaypoint.java
@@ -4,12 +4,9 @@ import java.util.List;
 
 import com.hbm.entity.item.EntityDeliveryDrone;
 import com.hbm.util.ParticleUtil;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.toclient.BufPacket;
 import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.util.fauxpointtwelve.BlockPos;
 
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;