Remove some diagnostics