More cleaning up. Preparing for Heroku.