WIP: Heroku deploy cleanup