Removing Heroku dependencies