cleaning stuff up so it works on heroku