Removed unnecessary code in Environment