Clean-up to make run on Heroku