Test version for Heroku
Database debug
Cleaning up non-Heroku stuff