Cleanup for move to heroku