Fixing Env variables
Eliminated Env variables