Revert " env setup"

This reverts commit 7f9f542f9ee5972da9bd1bb1818374636a3b0989.
 env setup II