More cleanup, getting ready for Heroku