Removal of diagnostics