NXBOOK-733 final cleanup