Some cleanup, repush to heroku