Pre-heroku cleanup