remove dependence on ENV vars and use app_config
Merge branch 'hotfix/env-vars'