Removed env checks