diff --git a/fmp/CableBusPart.java b/fmp/CableBusPart.java
index 175c9f4c5..092a86dd5 100644
--- a/fmp/CableBusPart.java
+++ b/fmp/CableBusPart.java
@@ -496,4 +496,9 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
 		return cb.isEmpty();
 	}
 
+	@Override
+	public void cleanup() {
+		tile().remPart( this );
+	}
+
 }
diff --git a/parts/CableBusContainer.java b/parts/CableBusContainer.java
index 169da6041..08ecc954e 100644
--- a/parts/CableBusContainer.java
+++ b/parts/CableBusContainer.java
@@ -968,4 +968,9 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
 		return myLayerFlags;
 	}
 
+	@Override
+	public void cleanup() {
+		tcb.cleanup();
+	}
+
 }
diff --git a/parts/PartPlacement.java b/parts/PartPlacement.java
index af5d5c554..bff7ff4ba 100644
--- a/parts/PartPlacement.java
+++ b/parts/PartPlacement.java
@@ -104,7 +104,7 @@ public class PartPlacement
 						}
 
 						if ( host.isEmpty() )
-							world.setBlock( x, y, z, Platform.air );
+							host.cleanup();
 
 						if ( is != null && !is.isEmpty() )
 						{
diff --git a/tile/networking/TileCableBus.java b/tile/networking/TileCableBus.java
index 5f23133c3..962fcaa84 100644
--- a/tile/networking/TileCableBus.java
+++ b/tile/networking/TileCableBus.java
@@ -41,7 +41,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
 
 	public CableBusContainer cb = new CableBusContainer( this );
 	private int oldLV = -1; // on re-calculate light when it changes
-
+		
 	class CableBusHandler extends AETileEventHandler
 	{
 
@@ -319,6 +319,11 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
 	{
 		return cb.getLayerFlags();
 	}
+	
+	@Override
+	public void cleanup() {
+		getWorldObj().setBlock( xCoord, yCoord, zCoord, Platform.air );
+	}
 
 	/**
 	 * Immibis MB Support