moving to non-heroku setup