Cleaned for Heroku