heroku adoption and cleanups