cleaning up imports in heroku-base