Do some spring cleaning in PyPump (yes - in winter)