Remove piston dependence