refectoring to remove Heroku-only references