Changes for CleanUp and Heroku.