pimpathon cleanups