NXIO-141: remove timeout - cleanup