NXIO-142: cleanup