make sure more env vars are cleaned when changing