Got rid of temporary env vars for testing