Cleanup and updates for heroku deployment