Trim old style var references
Trim old style var references.
Legacy variable usage removed
Legacy variable usage removed.
Removing legacy variable usage.
Remove legacy variable usage.
Trim legacy variable usage.
Legacy variable usage.