more nt cleanup