NXIO-158: cleanup