Removed env and DS store