Deploy to heroku worked, general code cleanup