Merge "Removing Deprecated ENV handling"