NXIO-169 NXIO-152: correctly put in scope the environment from the
response when updating it, remove commented lines
Cleanup