nit cleanup