Cleaning things up for heroku deployment