Removed piston dependency