Merge "Optimizing: Speed up HEnvironment use removal"