Code cleanup in diagnostics