Remove overlay diagnostics correctly