Remove piston dependency