cleanups, prepare for heroku