remove an unused generic function
Add support for global and local env vars in manifests

[Finishes #58850912]