removed env separation