forgot to comment out old stuff
Merge branch 'envConfigRefactor' into dev