Remove another undefined $env and TODO comment for it too

Follow-Up: Ie69a68c8ff429ac79796890d1843cf2a2b9c32e8
Change-Id: I767cb09215f8b51a9e88c770d3b0f87c37452d00
Merge "Remove another undefined $env and TODO comment for it too"