diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll
index 43bf134ea79..13909ae953b 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll
@@ -25,7 +25,7 @@ import cpp
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) data flow analyses.
  */
-deprecated module DataFlow {
+module DataFlow {
   private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<CppOldDataFlow>
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow2.qll
index 19ffa16b76c..c87fc0c8e39 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow2.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow2.qll
@@ -17,6 +17,6 @@ import cpp
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) data flow analyses.
  */
-deprecated module DataFlow2 {
+module DataFlow2 {
   import semmle.code.cpp.dataflow.internal.DataFlowImpl2
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow3.qll
index 554b2e155b4..01d13afe9bb 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow3.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow3.qll
@@ -17,6 +17,6 @@ import cpp
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) data flow analyses.
  */
-deprecated module DataFlow3 {
+module DataFlow3 {
   import semmle.code.cpp.dataflow.internal.DataFlowImpl3
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow4.qll
index fdd4e8ab7ae..6d7598db9d1 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow4.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow4.qll
@@ -17,6 +17,6 @@ import cpp
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) data flow analyses.
  */
-deprecated module DataFlow4 {
+module DataFlow4 {
   import semmle.code.cpp.dataflow.internal.DataFlowImpl4
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
index 8a8db1bdcce..dc4066b16d4 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
@@ -24,7 +24,7 @@ import semmle.code.cpp.dataflow.DataFlow2
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) taint-tracking analyses.
  */
-deprecated module TaintTracking {
+module TaintTracking {
   import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
   private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.cpp.dataflow.internal.TaintTrackingImplSpecific
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking2.qll
index dce00316cbb..93ac23be468 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking2.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking2.qll
@@ -17,6 +17,6 @@
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) taint-tracking analyses.
  */
-deprecated module TaintTracking2 {
+module TaintTracking2 {
   import semmle.code.cpp.dataflow.internal.tainttracking2.TaintTrackingImpl
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow.qll
deleted file mode 100644
index 0507aff8135..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow.qll
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Provides a library for local (intra-procedural) and global (inter-procedural)
- * data flow analysis: deciding whether data can flow from a _source_ to a
- * _sink_.
- *
- * Unless configured otherwise, _flow_ means that the exact value of
- * the source may reach the sink. We do not track flow across pointer
- * dereferences or array indexing. To track these types of flow, where the
- * exact value may not be preserved, import
- * `semmle.code.cpp.dataflow.TaintTracking`.
- *
- * To use global (interprocedural) data flow, extend the class
- * `DataFlow::Configuration` as documented on that class. To use local
- * (intraprocedural) data flow between expressions, call
- * `DataFlow::localExprFlow`. For more general cases of local data flow, call
- * `DataFlow::localFlow` or `DataFlow::localFlowStep` with arguments of type
- * `DataFlow::Node`.
- */
-
- import cpp
-
- /**
-  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow` instead.
-  *
-  * Provides classes for performing local (intra-procedural) and
-  * global (inter-procedural) data flow analyses.
-  */
- module DataFlow {
-    private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
-    private import codeql.dataflow.DataFlow
-    import DataFlowMake<CppOldDataFlow>
-    import semmle.code.cpp.dataflow.internal.DataFlowImpl1
- }
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow2.qll b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow2.qll
deleted file mode 100644
index a768b617677..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow2.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Provides a `DataFlow2` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
- */
-
- import cpp
-
- /**
-  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow2` instead.
-  *
-  * Provides classes for performing local (intra-procedural) and
-  * global (inter-procedural) data flow analyses.
-  */
- module DataFlow2 {
-   import semmle.code.cpp.dataflow.internal.DataFlowImpl2
- }
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow3.qll b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow3.qll
deleted file mode 100644
index 662850e080e..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow3.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Provides a `DataFlow3` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
- */
-
- import cpp
-
- /**
-  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow3` instead.
-  *
-  * Provides classes for performing local (intra-procedural) and
-  * global (inter-procedural) data flow analyses.
-  */
- module DataFlow3 {
-   import semmle.code.cpp.dataflow.internal.DataFlowImpl3
- }
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow4.qll b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow4.qll
deleted file mode 100644
index 0765577e7bd..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow4.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Provides a `DataFlow4` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
- */
-
- import cpp
-
- /**
-  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow4` instead.
-  *
-  * Provides classes for performing local (intra-procedural) and
-  * global (inter-procedural) data flow analyses.
-  */
- module DataFlow4 {
-   import semmle.code.cpp.dataflow.internal.DataFlowImpl4
- }
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking.qll
deleted file mode 100644
index 0d39ef3e6ed..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking.qll
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- *
- * We define _taint propagation_ informally to mean that a substantial part of
- * the information from the source is preserved at the sink. For example, taint
- * propagates from `x` to `x + 100`, but it does not propagate from `x` to `x >
- * 100` since we consider a single bit of information to be too little.
- *
- * To use global (interprocedural) taint tracking, extend the class
- * `TaintTracking::Configuration` as documented on that class. To use local
- * (intraprocedural) taint tracking between expressions, call
- * `TaintTracking::localExprTaint`. For more general cases of local taint
- * tracking, call `TaintTracking::localTaint` or
- * `TaintTracking::localTaintStep` with arguments of type `DataFlow::Node`.
- */
-
- import semmle.code.cpp.temp.DataFlow
- import semmle.code.cpp.temp.DataFlow2
- 
- /**
-  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.TaintTracking` instead.
-  *
-  * Provides classes for performing local (intra-procedural) and
-  * global (inter-procedural) taint-tracking analyses.
-  */
- module TaintTracking {
-  import semmle.code.cpp.dataflow.internal.TaintTrackingUtil
-  private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
-  private import semmle.code.cpp.dataflow.internal.TaintTrackingImplSpecific
-  private import codeql.dataflow.TaintTracking
-  import TaintFlowMake<CppOldDataFlow, CppOldTaintTracking>
-  import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTrackingImpl
- }
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking2.qll b/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking2.qll
deleted file mode 100644
index 830827cecc5..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking2.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Provides a `TaintTracking2` module, which is a copy of the `TaintTracking`
- * module. Use this class when data-flow configurations or taint-tracking
- * configurations must depend on each other. Two classes extending
- * `DataFlow::Configuration` should never depend on each other, but one of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`. The
- * `TaintTracking::Configuration` class extends `DataFlow::Configuration`, and
- * `TaintTracking2::Configuration` extends `DataFlow2::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.TaintTracking` for the full documentation.
- */
-
-/**
- * DEPRECATED: Use `semmle.code.cpp.dataflow.new.TaintTracking2` instead.
- *
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking2 {
-    import semmle.code.cpp.dataflow.internal.tainttracking2.TaintTrackingImpl
-}
\ No newline at end of file