simplifications and preparation for heroku push