diag cleanup