Got rid of envvars being set