Cleanup and preparing for Heroku