add more to env setup, remove more from cloudconfig