Refactor; remove Heroku deps