Removed unnecessary environment pointers