Remove useless ENV Variables

[gkLeo]

Description / Motivation

Remove useless ENV Variables.

How Has This Been Tested?

Local

Types of changes

• [ ] Bug fix (non-breaking change which fixes an issue)
• [ ] New feature (non-breaking change which adds functionality)
• [ ] Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• [x] I have read the Contributing guide.
• [x] My code/comments/docs fully adhere to the Code of Conduct.
• [x] My change is a code change.
• [ ] My change is a documentation change and there are NO other updates required.

[robearlam]

This looks good, but there are now conflicts due to the re-structure that was completed. Can you please fix up the conflicts?

[gkLeo]

@robearlam conflicts were resolved.