Group final NLM cleanups in seingle method
Reference cleanup infrastructure