Preparing project for Heroku
Cleanup and fixes