Removed the use of env_id completely