NONUM cleanup