Pumping Systems Cleanup

@Revrok_Net on twitter