Some cleanup for pumps and vent pumps