Removed some problematic dependencies for the sake of Heroku