Fixes #2873 Removing diagnostics