Refactor; remove Heroku specific files