Removed Env. Specific changes