Revert "Refactoring Environment"

This reverts commit 3b70e19fe94ddb277b42330f51b6cc4969d54962.