Fix database problem on Heroku
Clean up database setup