LPS-45656 Cleanup env variables
LPS-45656 SF