diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java
index 1d0ff0fe..37bb85ef 100644
--- a/common/buildcraft/BuildCraftCore.java
+++ b/common/buildcraft/BuildCraftCore.java
@@ -40,7 +40,6 @@ import buildcraft.core.BuildCraftConfiguration;
 import buildcraft.core.DefaultActionProvider;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.DefaultTriggerProvider;
-import buildcraft.core.EntityBlock;
 import buildcraft.core.EntityEnergyLaser;
 import buildcraft.core.EntityLaser;
 import buildcraft.core.EntityRobot;
diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java
index b7a50005..e93b9fb1 100644
--- a/common/buildcraft/BuildCraftFactory.java
+++ b/common/buildcraft/BuildCraftFactory.java
@@ -20,10 +20,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.ProxyCore;
-import buildcraft.core.network.EntityIds;
 import buildcraft.factory.BlockAutoWorkbench;
 import buildcraft.factory.BlockFrame;
 import buildcraft.factory.BlockHopper;
@@ -37,7 +35,6 @@ import buildcraft.factory.BptBlockAutoWorkbench;
 import buildcraft.factory.BptBlockFrame;
 import buildcraft.factory.BptBlockRefinery;
 import buildcraft.factory.BptBlockTank;
-import buildcraft.factory.EntityMechanicalArm;
 import buildcraft.factory.FactoryProxy;
 import buildcraft.factory.GuiHandler;
 import buildcraft.factory.TileAssemblyTable;
diff --git a/common/buildcraft/factory/EntityMechanicalArm.java b/common/buildcraft/factory/EntityMechanicalArm.java
index a8ceeb93..4b9cfe1a 100644
--- a/common/buildcraft/factory/EntityMechanicalArm.java
+++ b/common/buildcraft/factory/EntityMechanicalArm.java
@@ -9,13 +9,11 @@
 
 package buildcraft.factory;
 
-import com.google.common.collect.SetMultimap;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 
 import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 import buildcraft.BuildCraftFactory;
-import buildcraft.api.core.Position;
 import buildcraft.core.EntityBlock;
 import net.minecraft.src.Entity;
 import net.minecraft.src.NBTTagCompound;