SetupEnvironment() - clean commit