Simplify and Heroku changes