diff --git a/cpp/ql/src/Diagnostics/ExtractorErrorMsft.ql b/cpp/ql/src/Diagnostics/ExtractorErrorMsft.ql
deleted file mode 100644
index 072047ec2798..000000000000
--- a/cpp/ql/src/Diagnostics/ExtractorErrorMsft.ql
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @name Extraction errors msft
- * @description List all extraction errors for files in the source code directory.
- * @id cpp/extractor-error-msft
- * @kind problem
- * @tags security
- *       extraction
- */
-
- import cpp
- import ExtractionErrors
- 
- from ExtractionError error
- select error.getFile(), error.getErrorMessage()
-
- 
\ No newline at end of file
diff --git a/csharp/ql/src/Diagnostics/ExtractorErrorMsft.ql b/csharp/ql/src/Diagnostics/ExtractorErrorMsft.ql
deleted file mode 100644
index 948da7f885f3..000000000000
--- a/csharp/ql/src/Diagnostics/ExtractorErrorMsft.ql
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @name Extraction error msft
- * @description An error message reported by the extractor, limited to those files where there are no
- *              compilation errors. This indicates a bug or limitation in the extractor, and could lead
- *              to inaccurate results.
- * @id cs/extractor-error-msft
- * @kind problem
- * @tags security
- *       extraction
- */
-
- import csharp
- import semmle.code.csharp.commons.Diagnostics
- 
- from ExtractorError error
- select error.getLocation().getFile(), error.getText()
- 
\ No newline at end of file
diff --git a/go/ql/src/Diagnostics/ExtractorErrorMsft.ql b/go/ql/src/Diagnostics/ExtractorErrorMsft.ql
deleted file mode 100644
index 244018669e9e..000000000000
--- a/go/ql/src/Diagnostics/ExtractorErrorMsft.ql
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @name Extraction errors msft
- * @description List all extraction errors for files in the source code directory.
- * @id go/extractor-error-msft
- * @kind problem
- * @tags security
- *       extraction
- */
-
-import go
-import semmle.go.DiagnosticsReporting
-
-// Go does not have warnings, so all errors have error severity
-predicate reportableDiagnosticsMsft(Diagnostic d, File f, string msg) {
-    // Only report errors for files that would have been extracted
-    f = d.getFile() and
-    exists(f.getAChild()) and
-    msg = removeAbsolutePaths(d.getMessage())
-  }
-  
-from Diagnostic d, File f, string msg
-where reportableDiagnostics(d, f, msg)
-select f, msg
diff --git a/java/ql/src/Diagnostics/ExtractionErrorMsft.ql b/java/ql/src/Diagnostics/ExtractionErrorMsft.ql
deleted file mode 100644
index b90c39210f1d..000000000000
--- a/java/ql/src/Diagnostics/ExtractionErrorMsft.ql
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @name Extraction errors msft
- * @description A list of extraction errors for files in the source code directory.
- * @id java/extractor-error-msft
- * @kind problem
- * @tags security
- *       extraction
- */
-
-import java
-import DiagnosticsReporting
-
-private predicate knownErrorsMsft(Diagnostic d, File f, string msg) {
-      d.getSeverity() = [6, 7, 8] and
-      f = d.getLocation().getFile()
-      msg = d.getMessage()
-  }
-  
-  private predicate unknownErrorsMsft(Diagnostic d, File f, string msg) {
-    not knownErrors(d, _, _) and
-    d.getSeverity() > 3 and
-    d.getLocation().getFile() = f and
-    exists(f.getRelativePath()) and
-    msg = "Unknown error"
-  }
-
-from Diagnostic d, File f, string msg
-where
-    knownErrorsMsft(Diagnostic d, File f, string msg) or
-    unknownErrorsMsft(Diagnostic d, File f, string msg)
-select f, msg
diff --git a/javascript/ql/src/Diagnostics/ExtractionErrorMsft.ql b/javascript/ql/src/Diagnostics/ExtractionErrorMsft.ql
deleted file mode 100644
index ca7b9760ff4f..000000000000
--- a/javascript/ql/src/Diagnostics/ExtractionErrorMsft.ql
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @name Extraction errors msft
- * @description List all extraction errors for files in the source code directory.
- * @id js/extractor-error-msft
- * @kind problem
- * @tags security
- *       extraction
- */
-
- import javascript
- 
- from Error error
- where
-   exists(error.getFile().getRelativePath()) and
-   error.isFatal()
- select error.getFile(), error.getMessage()
- 
\ No newline at end of file
diff --git a/python/ql/src/Diagnostics/ExtractorErrorMsft.ql b/python/ql/src/Diagnostics/ExtractorErrorMsft.ql
deleted file mode 100644
index 49b4da524076..000000000000
--- a/python/ql/src/Diagnostics/ExtractorErrorMsft.ql
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @name Python extraction warnings msft
- * @description List all extraction warnings for Python files in the source code directory.
- * @id py/extractor-error-msft
- * @kind problem
- * @tags security
- *       extraction
- */
-
- import python
-
- from SyntaxError error, File file
- where
-   file = error.getFile() and
-   exists(file.getRelativePath())
- select file, error.getMessage()
- 
\ No newline at end of file
diff --git a/ruby/ql/src/queries/diagnostics/ExtractorErrorMsft.ql b/ruby/ql/src/queries/diagnostics/ExtractorErrorMsft.ql
deleted file mode 100644
index edcdf010d10f..000000000000
--- a/ruby/ql/src/queries/diagnostics/ExtractorErrorMsft.ql
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @name Extraction errors msft
- * @description List all extraction errors for files in the source code directory.
- * @id rb/extractor-error-msft
- * @kind problem
- * @tags security
- *       extraction
- */
-
- import codeql.ruby.AST
- import codeql.ruby.Diagnostics
- 
- from ExtractionError error, File f
- where
-   f = error.getLocation().getFile() and
-   exists(f.getRelativePath())
- select f, error.getMessage()
- 
\ No newline at end of file
diff --git a/rust/ql/src/queries/diagnostics/ExtractorErrorMsft.ql b/rust/ql/src/queries/diagnostics/ExtractorErrorMsft.ql
deleted file mode 100644
index 3d17ffbbc806..000000000000
--- a/rust/ql/src/queries/diagnostics/ExtractorErrorMsft.ql
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @name Extraction errors msft
- * @description List all extraction errors for files in the source code directory.
- * @id rust/extractor-error-msft
- * @kind problem
- * @tags security
- *       extraction
- */
-
- import codeql.rust.Diagnostics
- import codeql.files.FileSystem
- 
- from ExtractionError error, File f
- where
-   f = error.getLocation().getFile() and
-   exists(f.getRelativePath())
- select f, error.getMessage()
-
- 
\ No newline at end of file
diff --git a/swift/ql/src/diagnostics/ExtractorErrorMsft.ql b/swift/ql/src/diagnostics/ExtractorErrorMsft.ql
deleted file mode 100644
index a897d52744d7..000000000000
--- a/swift/ql/src/diagnostics/ExtractorErrorMsft.ql
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @name Compiler errors msft
- * @description List all compiler errors for files in the source code directory.
- * @id swift/extractor-error-msft
- * @kind problem
- * @tags security
- *       extraction
- */
-
- import swift
-
- from CompilerError error
- select error.getFile(), error.getText()
- 
\ No newline at end of file