No longer necessary
Refactoring with better naming and remove old Env class