remove redundant wip stuff from master
do not override env variable if already set
refactor conf