Removed the use of env_id completely
Removed the use of env_id completely