Removed the Env singleton