Cleanup imports
Add Heroku compatability