Fixed bug with setting the environment
Removed unused class
Merge branch 'develop'