NXIO-201: cleanup