diff --git a/pom.xml b/pom.xml
index b411757..c737fb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cyberpwn</groupId>
 	<artifactId>fap</artifactId>
-	<version>1.5</version>
+	<version>1.6</version>
 	<name>FAP</name>
 	<description>Fast Async Physics</description>
 	<properties>
diff --git a/src/main/java/org/cyberpwn/fap/FAPController.java b/src/main/java/org/cyberpwn/fap/FAPController.java
index 686e66b..a52cdbc 100644
--- a/src/main/java/org/cyberpwn/fap/FAPController.java
+++ b/src/main/java/org/cyberpwn/fap/FAPController.java
@@ -1,6 +1,5 @@
 package org.cyberpwn.fap;
 
-import org.cyberpwn.fap.handler.PistonHandler;
 import org.cyberpwn.fap.handler.TNTHandler;
 import org.phantomapi.async.A;
 import org.phantomapi.clust.AsyncConfig;
@@ -32,7 +31,6 @@ public class FAPController extends ConfigurableController
 	private GList<Operation> queued;
 	private static FAPController inst;
 	private TNTHandler tntHandler;
-	private PistonHandler pistonHandler;
 	private boolean running;
 	
 	public FAPController(Controllable parentController)
@@ -45,10 +43,8 @@ public FAPController(Controllable parentController)
 		running = false;
 		
 		tntHandler = new TNTHandler();
-		pistonHandler = new PistonHandler();
 		
 		register(tntHandler);
-		register(pistonHandler);
 	}
 	
 	public void queueOperation(Operation operation)
diff --git a/src/main/java/org/cyberpwn/fap/handler/PistonHandler.java b/src/main/java/org/cyberpwn/fap/handler/PistonHandler.java
deleted file mode 100644
index facc67b..0000000
--- a/src/main/java/org/cyberpwn/fap/handler/PistonHandler.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.cyberpwn.fap.handler;
-
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.material.PistonBaseMaterial;
-import org.bukkit.material.PistonExtensionMaterial;
-import org.cyberpwn.fap.FAPController;
-import org.cyberpwn.fap.FAPHandler;
-import org.phantomapi.lang.GList;
-import org.phantomapi.lang.GSound;
-import org.phantomapi.statistics.Monitorable;
-import org.phantomapi.world.Photon;
-
-public class PistonHandler extends FAPHandler implements Monitorable
-{
-	public PistonHandler()
-	{
-		super("piston");
-	}
-	
-	@Override
-	public String getMonitorableData()
-	{
-		return "?";
-	}
-	
-	@Override
-	public void onStart()
-	{
-		loadCluster(this, "handlers");
-	}
-	
-	@SuppressWarnings("deprecation")
-	@EventHandler
-	public void on(BlockPistonExtendEvent e)
-	{
-		e.setCancelled(true);
-		
-		new GSound(Sound.PISTON_EXTEND, 1f, 1.5f).play(e.getBlock().getLocation());
-		BlockFace face = e.getDirection();
-		GList<Block> blocks = new GList<Block>(e.getBlocks());
-		Block piston = e.getBlock();
-		
-		for(Block i : blocks)
-		{
-			FAPController.wq.set(i.getLocation(), Material.AIR);
-		}
-		
-		for(Block i : blocks)
-		{
-			FAPController.wq.set(i.getLocation().clone().add(face.getModX(), face.getModY(), face.getModZ()), i.getType(), i.getData());
-		}
-		
-		PistonExtensionMaterial pem = new PistonExtensionMaterial(Material.PISTON_EXTENSION);
-		PistonBaseMaterial pbm = (PistonBaseMaterial) piston.getState().getData();
-		pbm.setPowered(true);
-		pem.setSticky(pbm.isSticky());
-		pem.setFacingDirection(pbm.getFacing());
-		
-		FAPController.wq.set(piston.getLocation(), pbm.getItemType(), pbm.getData());
-		FAPController.wq.set(piston.getLocation().clone().add(face.getModX(), face.getModY(), face.getModZ()), Material.PISTON_EXTENSION, pem.getData());
-		FAPController.wq.flush();
-	}
-	
-	@SuppressWarnings("deprecation")
-	@EventHandler
-	public void on(BlockPistonRetractEvent e)
-	{
-		e.setCancelled(true);
-		
-		new GSound(Sound.PISTON_RETRACT, 1f, 1.5f).play(e.getBlock().getLocation());
-		BlockFace face = e.isSticky() ? e.getDirection().getOppositeFace() : e.getDirection();
-		GList<Block> blocks = new GList<Block>(e.getBlocks());
-		Block piston = e.getBlock();
-		PistonBaseMaterial pbm = new PistonBaseMaterial(e.isSticky() ? Material.PISTON_STICKY_BASE : Material.PISTON_BASE);
-		pbm.setPowered(false);
-		pbm.setFacingDirection(face);
-		FAPController.wq.set(piston.getLocation(), pbm.getItemType(), pbm.getData());
-		FAPController.wq.set(piston.getLocation().clone().add(face.getModX(), face.getModY(), face.getModZ()), Material.AIR);
-		face = face.getOppositeFace();
-		
-		for(Block i : blocks)
-		{
-			FAPController.wq.set(i.getLocation(), Material.AIR);
-		}
-		
-		for(Block i : blocks)
-		{
-			FAPController.wq.set(i.getLocation().clone().add(face.getModX(), face.getModY(), face.getModZ()), i.getType(), i.getData());
-		}
-		
-		FAPController.wq.flush();
-		Photon.relight(e.getBlock());
-	}
-}