Remove special piston code