removing NH_DIAGNOSTIC