Revert "Everything working except Heroku"

This reverts commit e2cd63ede14ff34ceb0ea6ec25b2ea2f44a9c1a2.