NLM: Clean up before introducing new debugging messages