removing javascript dataflow deprecations

2026-05-25 08:37:20 +02:00 · 2025-01-31 11:17:08 -08:00
parent 29d07ae059
commit 714036110c
19 changed files with 158 additions and 158 deletions
--- a/javascript/ql/lib/semmle/javascript/dataflow/AdditionalFlowSteps.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/AdditionalFlowSteps.qll
@@ -152,7 +152,7 @@ class LegacyFlowStep extends Unit {
   * Holds if `pred` &rarr; `succ` should be considered a data flow edge
   * transforming values with label `predlbl` to have label `succlbl`.
   */
-  deprecated predicate step(
+  predicate step(
    DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
    DataFlow::FlowLabel succlbl
  ) {
@@ -207,7 +207,7 @@ module LegacyFlowStep {
   * transforming values with label `predlbl` to have label `succlbl`.
   */
  cached
-  deprecated predicate step(
+  predicate step(
    DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
    DataFlow::FlowLabel succlbl
  ) {
@@ -282,7 +282,7 @@ class SharedFlowStep extends Unit {
   * Holds if `pred` &rarr; `succ` should be considered a data flow edge
   * transforming values with label `predlbl` to have label `succlbl`.
   */
-  deprecated predicate step(
+  predicate step(
    DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
    DataFlow::FlowLabel succlbl
  ) {
@@ -364,7 +364,7 @@ module SharedFlowStep {
   * Holds if `pred` &rarr; `succ` should be considered a data flow edge
   * transforming values with label `predlbl` to have label `succlbl`.
   */
-  deprecated predicate step(
+  predicate step(
    DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
    DataFlow::FlowLabel succlbl
  ) {
--- a/javascript/ql/lib/semmle/javascript/dataflow/BackwardExploration.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/BackwardExploration.qll
@@ -1,6 +1,6 @@
 /**
 * Alias for the library `semmle.javascript.explore.BackwardDataFlow`.
 */
-deprecated module;
+// deprecated module;

 import semmle.javascript.explore.BackwardDataFlow
--- a/javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll
@@ -63,7 +63,7 @@
 * Finally, we build `PathNode`s for all nodes that appear on a path
 * computed by `onPath`.
 */
-deprecated module;
+// deprecated module;

 private import javascript
 private import internal.FlowSteps
@@ -88,7 +88,7 @@ private import internal.DataFlowPrivate as DataFlowPrivate
 * define additional edges beyond the standard data flow edges (`isAdditionalFlowStep`)
 * and prohibit intermediate flow nodes and edges (`isBarrier`).
 */
-abstract deprecated class Configuration extends string {
+abstract class Configuration extends string {
  bindingset[this]
  Configuration() { any() }

@@ -284,7 +284,7 @@ abstract deprecated class Configuration extends string {
 * `isBarrierGuard` or `AdditionalBarrierGuardNode`.
 */
 pragma[nomagic]
-deprecated private predicate isBarrierGuardInternal(
+private predicate isBarrierGuardInternal(
  Configuration cfg, BarrierGuardNodeInternal guard
 ) {
  cfg.isBarrierGuard(guard)
@@ -309,7 +309,7 @@ deprecated private predicate isBarrierGuardInternal(
 * - "taint" additionally permits flow through transformations such as string operations,
 *   and is the default flow source for a `TaintTracking::Configuration`.
 */
-abstract deprecated class FlowLabel extends string {
+abstract class FlowLabel extends string {
  bindingset[this]
  FlowLabel() { any() }

@@ -338,16 +338,16 @@ abstract deprecated class FlowLabel extends string {
 *
 * This is an alias of `FlowLabel`, so the two types can be used interchangeably.
 */
-deprecated class TaintKind = FlowLabel;
+class TaintKind = FlowLabel;

 /**
 * A standard flow label, that is, either `FlowLabel::data()` or `FlowLabel::taint()`.
 */
-deprecated class StandardFlowLabel extends FlowLabel {
+class StandardFlowLabel extends FlowLabel {
  StandardFlowLabel() { this = "data" or this = "taint" }
 }

-deprecated module FlowLabel {
+module FlowLabel {
  /**
   * Gets the standard flow label for describing values that directly originate from a flow source.
   */
@@ -373,7 +373,7 @@ abstract private class BarrierGuardNodeInternal extends DataFlow::Node { }
 * classes as precise as possible: if two subclasses of `BarrierGuardNode` overlap, their
 * implementations of `blocks` will _both_ apply to any configuration that includes either of them.
 */
-abstract deprecated class BarrierGuardNode extends BarrierGuardNodeInternal {
+abstract class BarrierGuardNode extends BarrierGuardNodeInternal {
  /**
   * Holds if this node blocks expression `e` provided it evaluates to `outcome`.
   *
@@ -390,8 +390,8 @@ abstract deprecated class BarrierGuardNode extends BarrierGuardNodeInternal {
 /**
 * Barrier guards derived from other barrier guards.
 */
-abstract deprecated private class DerivedBarrierGuardNode extends BarrierGuardNodeInternal {
-  abstract deprecated predicate appliesTo(Configuration cfg);
+abstract private class DerivedBarrierGuardNode extends BarrierGuardNodeInternal {
+  abstract predicate appliesTo(Configuration cfg);

  /**
   * Holds if this node blocks expression `e` from flow of type `label`, provided it evaluates to `outcome`.
@@ -404,7 +404,7 @@ abstract deprecated private class DerivedBarrierGuardNode extends BarrierGuardNo
 /**
 * Barrier guards derived from `AdditionalSanitizerGuard`
 */
-deprecated private class BarrierGuardNodeFromAdditionalSanitizerGuard extends BarrierGuardNodeInternal instanceof TaintTracking::AdditionalSanitizerGuardNode
+private class BarrierGuardNodeFromAdditionalSanitizerGuard extends BarrierGuardNodeInternal instanceof TaintTracking::AdditionalSanitizerGuardNode
 { }

 /**
@@ -413,7 +413,7 @@ deprecated private class BarrierGuardNodeFromAdditionalSanitizerGuard extends Ba
 * `label` is bound to the blocked label, or the empty string if all labels should be blocked.
 */
 pragma[nomagic]
-deprecated private predicate barrierGuardBlocksExpr(
+private predicate barrierGuardBlocksExpr(
  BarrierGuardNodeInternal guard, boolean outcome, Expr test, string label
 ) {
  guard.(BarrierGuardNode).blocks(outcome, test) and label = ""
@@ -431,7 +431,7 @@ deprecated private predicate barrierGuardBlocksExpr(
 * Holds if `guard` may block the flow of a value reachable through exploratory flow.
 */
 pragma[nomagic]
-deprecated private predicate barrierGuardIsRelevant(BarrierGuardNodeInternal guard) {
+private predicate barrierGuardIsRelevant(BarrierGuardNodeInternal guard) {
  exists(Expr e |
    barrierGuardBlocksExpr(guard, _, e, _) and
    isRelevantForward(e.flow(), _)
@@ -445,7 +445,7 @@ deprecated private predicate barrierGuardIsRelevant(BarrierGuardNodeInternal gua
 * `label` is bound to the blocked label, or the empty string if all labels should be blocked.
 */
 pragma[nomagic]
-deprecated private predicate barrierGuardBlocksAccessPath(
+private predicate barrierGuardBlocksAccessPath(
  BarrierGuardNodeInternal guard, boolean outcome, AccessPath ap, string label
 ) {
  barrierGuardIsRelevant(guard) and
@@ -458,7 +458,7 @@ deprecated private predicate barrierGuardBlocksAccessPath(
 * This predicate is outlined to give the optimizer a hint about the join ordering.
 */
 pragma[nomagic]
-deprecated private predicate barrierGuardBlocksSsaRefinement(
+private predicate barrierGuardBlocksSsaRefinement(
  BarrierGuardNodeInternal guard, boolean outcome, SsaRefinementNode ref, string label
 ) {
  barrierGuardIsRelevant(guard) and
@@ -474,7 +474,7 @@ deprecated private predicate barrierGuardBlocksSsaRefinement(
 * `outcome` is bound to the outcome of `cond` for join-ordering purposes.
 */
 pragma[nomagic]
-deprecated private predicate barrierGuardUsedInCondition(
+private predicate barrierGuardUsedInCondition(
  BarrierGuardNodeInternal guard, ConditionGuardNode cond, boolean outcome
 ) {
  barrierGuardIsRelevant(guard) and
@@ -493,7 +493,7 @@ deprecated private predicate barrierGuardUsedInCondition(
 * `label` is bound to the blocked label, or the empty string if all labels should be blocked.
 */
 pragma[nomagic]
-deprecated private predicate barrierGuardBlocksNode(
+private predicate barrierGuardBlocksNode(
  BarrierGuardNodeInternal guard, DataFlow::Node nd, string label
 ) {
  // 1) `nd` is a use of a refinement node that blocks its input variable
@@ -518,7 +518,7 @@ deprecated private predicate barrierGuardBlocksNode(
 * `label` is bound to the blocked label, or the empty string if all labels should be blocked.
 */
 pragma[nomagic]
-deprecated private predicate barrierGuardBlocksEdge(
+private predicate barrierGuardBlocksEdge(
  BarrierGuardNodeInternal guard, DataFlow::Node pred, DataFlow::Node succ, string label
 ) {
  exists(
@@ -539,7 +539,7 @@ deprecated private predicate barrierGuardBlocksEdge(
 * This predicate exists to get a better join-order for the `barrierGuardBlocksEdge` predicate above.
 */
 pragma[noinline]
-deprecated private BasicBlock getADominatedBasicBlock(
+private BasicBlock getADominatedBasicBlock(
  BarrierGuardNodeInternal guard, ConditionGuardNode cond
 ) {
  barrierGuardIsRelevant(guard) and
@@ -553,7 +553,7 @@ deprecated private BasicBlock getADominatedBasicBlock(
 *
 * Only holds for barriers that should apply to all flow labels.
 */
-deprecated private predicate isBarrierEdgeRaw(
+private predicate isBarrierEdgeRaw(
  Configuration cfg, DataFlow::Node pred, DataFlow::Node succ
 ) {
  cfg.isBarrierEdge(pred, succ)
@@ -571,7 +571,7 @@ deprecated private predicate isBarrierEdgeRaw(
 * Only holds for barriers that should apply to all flow labels.
 */
 pragma[inline]
-deprecated private predicate isBarrierEdge(
+private predicate isBarrierEdge(
  Configuration cfg, DataFlow::Node pred, DataFlow::Node succ
 ) {
  isBarrierEdgeRaw(cfg, pred, succ)
@@ -585,7 +585,7 @@ deprecated private predicate isBarrierEdge(
 * Holds if there is a labeled barrier edge `pred -> succ` in `cfg` either through an explicit barrier edge
 * or one implied by a barrier guard.
 */
-deprecated private predicate isLabeledBarrierEdgeRaw(
+private predicate isLabeledBarrierEdgeRaw(
  Configuration cfg, DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel label
 ) {
  cfg.isBarrierEdge(pred, succ, label)
@@ -601,7 +601,7 @@ deprecated private predicate isLabeledBarrierEdgeRaw(
 * or one implied by a barrier guard, or by an out/in barrier for `pred` or `succ`, respectively.
 */
 pragma[inline]
-deprecated private predicate isLabeledBarrierEdge(
+private predicate isLabeledBarrierEdge(
  Configuration cfg, DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel label
 ) {
  isLabeledBarrierEdgeRaw(cfg, pred, succ, label)
@@ -614,7 +614,7 @@ deprecated private predicate isLabeledBarrierEdge(
 /**
 * A guard node that only blocks specific labels.
 */
-abstract deprecated class LabeledBarrierGuardNode extends BarrierGuardNode {
+abstract class LabeledBarrierGuardNode extends BarrierGuardNode {
  override predicate blocks(boolean outcome, Expr e) { none() }
 }

@@ -713,7 +713,7 @@ module PseudoProperties {
 * A data flow node that should be considered a source for some specific configuration,
 * in addition to any other sources that configuration may recognize.
 */
-abstract deprecated class AdditionalSource extends DataFlow::Node {
+abstract class AdditionalSource extends DataFlow::Node {
  /**
   * Holds if this data flow node should be considered a source node for
   * configuration `cfg`.
@@ -731,7 +731,7 @@ abstract deprecated class AdditionalSource extends DataFlow::Node {
 * A data flow node that should be considered a sink for some specific configuration,
 * in addition to any other sinks that configuration may recognize.
 */
-abstract deprecated class AdditionalSink extends DataFlow::Node {
+abstract class AdditionalSink extends DataFlow::Node {
  /**
   * Holds if this data flow node should be considered a sink node for
   * configuration `cfg`.
@@ -765,7 +765,7 @@ private class FlowStepThroughImport extends SharedFlowStep {
 * Summary steps through function calls are not taken into account.
 */
 pragma[inline]
-deprecated private predicate basicFlowStepNoBarrier(
+private predicate basicFlowStepNoBarrier(
  DataFlow::Node pred, DataFlow::Node succ, PathSummary summary, DataFlow::Configuration cfg
 ) {
  // Local flow
@@ -804,7 +804,7 @@ deprecated private predicate basicFlowStepNoBarrier(
 * and hence should only be used for purposes of approximation.
 */
 pragma[noinline]
-deprecated private predicate exploratoryFlowStep(
+private predicate exploratoryFlowStep(
  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration cfg
 ) {
  isRelevantForward(pred, cfg) and
@@ -823,7 +823,7 @@ deprecated private predicate exploratoryFlowStep(
 /**
 * Holds if `nd` is a source node for configuration `cfg`.
 */
-deprecated private predicate isSource(DataFlow::Node nd, DataFlow::Configuration cfg, FlowLabel lbl) {
+private predicate isSource(DataFlow::Node nd, DataFlow::Configuration cfg, FlowLabel lbl) {
  (cfg.isSource(nd) or nd.(AdditionalSource).isSourceFor(cfg)) and
  lbl = cfg.getDefaultSourceLabel()
  or
@@ -835,7 +835,7 @@ deprecated private predicate isSource(DataFlow::Node nd, DataFlow::Configuration
 /**
 * Holds if `nd` is a sink node for configuration `cfg`.
 */
-deprecated private predicate isSink(DataFlow::Node nd, DataFlow::Configuration cfg, FlowLabel lbl) {
+private predicate isSink(DataFlow::Node nd, DataFlow::Configuration cfg, FlowLabel lbl) {
  (cfg.isSink(nd) or nd.(AdditionalSink).isSinkFor(cfg)) and
  lbl = any(StandardFlowLabel f)
  or
@@ -848,7 +848,7 @@ deprecated private predicate isSink(DataFlow::Node nd, DataFlow::Configuration c
 * Holds if there exists a load-step from `pred` to `succ` under configuration `cfg`,
 * and the forwards exploratory flow has found a relevant store-step with the same property as the load-step.
 */
-deprecated private predicate exploratoryLoadStep(
+private predicate exploratoryLoadStep(
  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration cfg
 ) {
  exists(string prop | prop = getAForwardRelevantLoadProperty(cfg) |
@@ -865,7 +865,7 @@ deprecated private predicate exploratoryLoadStep(
 * This private predicate is only used in `exploratoryLoadStep`, and exists as a separate predicate to give the compiler a hint about join-ordering.
 */
 pragma[noinline]
-deprecated private string getAForwardRelevantLoadProperty(DataFlow::Configuration cfg) {
+private string getAForwardRelevantLoadProperty(DataFlow::Configuration cfg) {
  exists(DataFlow::Node previous | isRelevantForward(previous, cfg) |
    basicStoreStep(previous, _, result) or
    isAdditionalStoreStep(previous, _, result, cfg)
@@ -879,7 +879,7 @@ deprecated private string getAForwardRelevantLoadProperty(DataFlow::Configuratio
 *
 * The properties from this predicate are used as a white-list of properties for load/store steps that should always be considered in the exploratory flow.
 */
-deprecated private string getAPropertyUsedInLoadStore(DataFlow::Configuration cfg) {
+private string getAPropertyUsedInLoadStore(DataFlow::Configuration cfg) {
  exists(string loadProp, string storeProp |
    isAdditionalLoadStoreStep(_, _, loadProp, storeProp, cfg) and
    storeProp != loadProp and
@@ -892,7 +892,7 @@ deprecated private string getAPropertyUsedInLoadStore(DataFlow::Configuration cf
 * and somewhere in the program there exists a load-step that could possibly read the stored value.
 */
 pragma[noinline]
-deprecated private predicate exploratoryForwardStoreStep(
+private predicate exploratoryForwardStoreStep(
  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration cfg
 ) {
  exists(string prop |
@@ -910,7 +910,7 @@ deprecated private predicate exploratoryForwardStoreStep(
 * and `succ` has been found to be relevant during the backwards exploratory flow,
 * and the backwards exploratory flow has found a relevant load-step with the same property as the store-step.
 */
-deprecated private predicate exploratoryBackwardStoreStep(
+private predicate exploratoryBackwardStoreStep(
  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration cfg
 ) {
  exists(string prop | prop = getABackwardsRelevantStoreProperty(cfg) |
@@ -926,7 +926,7 @@ deprecated private predicate exploratoryBackwardStoreStep(
 * This private predicate is only used in `exploratoryBackwardStoreStep`, and exists as a separate predicate to give the compiler a hint about join-ordering.
 */
 pragma[noinline]
-deprecated private string getABackwardsRelevantStoreProperty(DataFlow::Configuration cfg) {
+private string getABackwardsRelevantStoreProperty(DataFlow::Configuration cfg) {
  exists(DataFlow::Node mid | isRelevant(mid, cfg) |
    basicLoadStep(mid, _, result) or
    isAdditionalLoadStep(mid, _, result, cfg)
@@ -940,7 +940,7 @@ deprecated private string getABackwardsRelevantStoreProperty(DataFlow::Configura
 *
 * No call/return matching is done, so this is a relatively coarse over-approximation.
 */
-deprecated private predicate isRelevantForward(DataFlow::Node nd, DataFlow::Configuration cfg) {
+private predicate isRelevantForward(DataFlow::Node nd, DataFlow::Configuration cfg) {
  isSource(nd, cfg, _) and isLive()
  or
  exists(DataFlow::Node mid |
@@ -956,7 +956,7 @@ deprecated private predicate isRelevantForward(DataFlow::Node nd, DataFlow::Conf
 *
 * No call/return matching is done, so this is a relatively coarse over-approximation.
 */
-deprecated private predicate isRelevant(DataFlow::Node nd, DataFlow::Configuration cfg) {
+private predicate isRelevant(DataFlow::Node nd, DataFlow::Configuration cfg) {
  isRelevantForward(nd, cfg) and isSink(nd, cfg, _)
  or
  exists(DataFlow::Node mid | isRelevant(mid, cfg) | isRelevantBackStep(mid, nd, cfg))
@@ -965,7 +965,7 @@ deprecated private predicate isRelevant(DataFlow::Node nd, DataFlow::Configurati
 /**
 * Holds if there is backwards data-flow step from `mid` to `nd` under `cfg`.
 */
-deprecated private predicate isRelevantBackStep(
+private predicate isRelevantBackStep(
  DataFlow::Node mid, DataFlow::Node nd, DataFlow::Configuration cfg
 ) {
  exploratoryFlowStep(nd, mid, cfg)
@@ -979,7 +979,7 @@ deprecated private predicate isRelevantBackStep(
 * either `pred` is an argument of `f` and `succ` the corresponding parameter, or
 * `pred` is a variable definition whose value is captured by `f` at `succ`.
 */
-deprecated private predicate callInputStep(
+private predicate callInputStep(
  Function f, DataFlow::Node invk, DataFlow::Node pred, DataFlow::Node succ,
  DataFlow::Configuration cfg
 ) {
@@ -1009,7 +1009,7 @@ deprecated private predicate callInputStep(
 * into account.
 */
 pragma[nomagic]
-deprecated private predicate reachableFromInput(
+private predicate reachableFromInput(
  Function f, DataFlow::Node invk, DataFlow::Node input, DataFlow::Node nd,
  DataFlow::Configuration cfg, PathSummary summary
 ) {
@@ -1028,7 +1028,7 @@ deprecated private predicate reachableFromInput(
 * to a path represented by `oldSummary` yielding a path represented by `newSummary`.
 */
 pragma[noinline]
-deprecated private predicate appendStep(
+private predicate appendStep(
  DataFlow::Node pred, DataFlow::Configuration cfg, PathSummary oldSummary, DataFlow::Node succ,
  PathSummary newSummary
 ) {
@@ -1044,7 +1044,7 @@ deprecated private predicate appendStep(
 * which is either an argument or a definition captured by the function, flows under
 * configuration `cfg`, possibly through callees.
 */
-deprecated private predicate flowThroughCall(
+private predicate flowThroughCall(
  DataFlow::Node input, DataFlow::Node output, DataFlow::Configuration cfg, PathSummary summary
 ) {
  exists(Function f, DataFlow::FunctionReturnNode ret |
@@ -1090,7 +1090,7 @@ deprecated private predicate flowThroughCall(
 * along a path summarized by `summary`.
 */
 pragma[nomagic]
-deprecated private predicate storeStep(
+private predicate storeStep(
  DataFlow::Node pred, DataFlow::Node succ, string prop, DataFlow::Configuration cfg,
  PathSummary summary
 ) {
@@ -1128,7 +1128,7 @@ deprecated private predicate storeStep(
 /**
 * Gets a dataflow-node for the operand of the await-expression `await`.
 */
-deprecated private DataFlow::Node getAwaitOperand(DataFlow::Node await) {
+private DataFlow::Node getAwaitOperand(DataFlow::Node await) {
  exists(AwaitExpr awaitExpr |
    result = awaitExpr.getOperand().getUnderlyingValue().flow() and
    await.asExpr() = awaitExpr
@@ -1138,7 +1138,7 @@ deprecated private DataFlow::Node getAwaitOperand(DataFlow::Node await) {
 /**
 * Holds if property `prop` of `arg` is read inside a function and returned to the call `succ`.
 */
-deprecated private predicate parameterPropRead(
+private predicate parameterPropRead(
  DataFlow::Node arg, string prop, DataFlow::Node succ, DataFlow::Configuration cfg,
  PathSummary summary
 ) {
@@ -1150,7 +1150,7 @@ deprecated private predicate parameterPropRead(

 // all the non-recursive parts of parameterPropRead outlined into a precomputed predicate
 pragma[noinline]
-deprecated private predicate parameterPropReadStep(
+private predicate parameterPropReadStep(
  DataFlow::SourceNode parm, DataFlow::Node read, string prop, DataFlow::Configuration cfg,
  DataFlow::Node arg, DataFlow::Node invk, Function f, DataFlow::Node succ
 ) {
@@ -1174,7 +1174,7 @@ deprecated private predicate parameterPropReadStep(
 * Holds if `read` may flow into a return statement of `f` under configuration `cfg`
 * (possibly through callees) along a path summarized by `summary`.
 */
-deprecated private predicate reachesReturn(
+private predicate reachesReturn(
  Function f, DataFlow::Node read, DataFlow::Configuration cfg, PathSummary summary
 ) {
  isRelevant(read, cfg) and
@@ -1192,7 +1192,7 @@ deprecated private predicate reachesReturn(

 // used in `getARelevantProp`, outlined for performance
 pragma[noinline]
-deprecated private string getARelevantStoreProp(DataFlow::Configuration cfg) {
+private string getARelevantStoreProp(DataFlow::Configuration cfg) {
  exists(DataFlow::Node previous | isRelevant(previous, cfg) |
    basicStoreStep(previous, _, result) or
    isAdditionalStoreStep(previous, _, result, cfg)
@@ -1201,7 +1201,7 @@ deprecated private string getARelevantStoreProp(DataFlow::Configuration cfg) {

 // used in `getARelevantProp`, outlined for performance
 pragma[noinline]
-deprecated private string getARelevantLoadProp(DataFlow::Configuration cfg) {
+private string getARelevantLoadProp(DataFlow::Configuration cfg) {
  exists(DataFlow::Node previous | isRelevant(previous, cfg) |
    basicLoadStep(previous, _, result) or
    isAdditionalLoadStep(previous, _, result, cfg)
@@ -1210,7 +1210,7 @@ deprecated private string getARelevantLoadProp(DataFlow::Configuration cfg) {

 /** Gets the name of a property that is both loaded and stored according to the exploratory analysis. */
 pragma[noinline]
-deprecated private string getARelevantProp(DataFlow::Configuration cfg) {
+private string getARelevantProp(DataFlow::Configuration cfg) {
  result = getARelevantStoreProp(cfg) and
  result = getARelevantLoadProp(cfg)
  or
@@ -1220,7 +1220,7 @@ deprecated private string getARelevantProp(DataFlow::Configuration cfg) {
 /**
 * Holds if the property `prop` of the object `pred` should be loaded into `succ`.
 */
-deprecated private predicate isAdditionalLoadStep(
+private predicate isAdditionalLoadStep(
  DataFlow::Node pred, DataFlow::Node succ, string prop, DataFlow::Configuration cfg
 ) {
  LegacyFlowStep::loadStep(pred, succ, prop)
@@ -1231,7 +1231,7 @@ deprecated private predicate isAdditionalLoadStep(
 /**
 * Holds if `pred` should be stored in the object `succ` under the property `prop`.
 */
-deprecated private predicate isAdditionalStoreStep(
+private predicate isAdditionalStoreStep(
  DataFlow::Node pred, DataFlow::Node succ, string prop, DataFlow::Configuration cfg
 ) {
  LegacyFlowStep::storeStep(pred, succ, prop)
@@ -1242,7 +1242,7 @@ deprecated private predicate isAdditionalStoreStep(
 /**
 * Holds if the property `loadProp` should be copied from the object `pred` to the property `storeProp` of object `succ`.
 */
-deprecated private predicate isAdditionalLoadStoreStep(
+private predicate isAdditionalLoadStoreStep(
  DataFlow::Node pred, DataFlow::Node succ, string loadProp, string storeProp,
  DataFlow::Configuration cfg
 ) {
@@ -1262,7 +1262,7 @@ deprecated private predicate isAdditionalLoadStoreStep(
 * Holds if property `prop` of `pred` may flow into `succ` along a path summarized by
 * `summary`.
 */
-deprecated private predicate loadStep(
+private predicate loadStep(
  DataFlow::Node pred, DataFlow::Node succ, string prop, DataFlow::Configuration cfg,
  PathSummary summary
 ) {
@@ -1284,7 +1284,7 @@ deprecated private predicate loadStep(
 * the flow that originally reached `base.startProp` used a call edge.
 */
 pragma[noopt]
-deprecated private predicate reachableFromStoreBase(
+private predicate reachableFromStoreBase(
  string startProp, string endProp, DataFlow::Node base, DataFlow::Node nd,
  DataFlow::Configuration cfg, TPathSummary summary, boolean onlyRelevantInCall
 ) {
@@ -1324,7 +1324,7 @@ deprecated private predicate reachableFromStoreBase(
  )
 }

-deprecated private boolean hasCall(PathSummary summary) { result = summary.hasCall() }
+private boolean hasCall(PathSummary summary) { result = summary.hasCall() }

 /**
 * Holds if the value of `pred` is written to a property of some base object, and that base
@@ -1334,7 +1334,7 @@ deprecated private boolean hasCall(PathSummary summary) { result = summary.hasCa
 * In other words, `pred` may flow to `succ` through a property.
 */
 pragma[noinline]
-deprecated private predicate flowThroughProperty(
+private predicate flowThroughProperty(
  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration cfg, PathSummary summary
 ) {
  exists(PathSummary oldSummary, PathSummary newSummary |
@@ -1350,7 +1350,7 @@ deprecated private predicate flowThroughProperty(
 * by `oldSummary`.
 */
 pragma[noinline]
-deprecated private predicate storeToLoad(
+private predicate storeToLoad(
  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration cfg, PathSummary oldSummary,
  PathSummary newSummary
 ) {
@@ -1372,7 +1372,7 @@ deprecated private predicate storeToLoad(
 * All of this is done under configuration `cfg`, and `arg` flows along a path
 * summarized by `summary`, while `cb` is only tracked locally.
 */
-deprecated private predicate summarizedHigherOrderCall(
+private predicate summarizedHigherOrderCall(
  DataFlow::Node arg, DataFlow::Node cb, int i, DataFlow::Configuration cfg, PathSummary summary
 ) {
  exists(
@@ -1402,7 +1402,7 @@ deprecated private predicate summarizedHigherOrderCall(
 * @see `summarizedHigherOrderCall`.
 */
 pragma[noinline]
-deprecated private predicate summarizedHigherOrderCallAux(
+private predicate summarizedHigherOrderCallAux(
  Function f, DataFlow::Node arg, DataFlow::Node innerArg, DataFlow::Configuration cfg,
  PathSummary oldSummary, DataFlow::SourceNode cbParm, DataFlow::InvokeNode inner, int j,
  DataFlow::Node cb
@@ -1440,7 +1440,7 @@ deprecated private predicate summarizedHigherOrderCallAux(
 *   invocation of the callback.
 */
 pragma[nomagic]
-deprecated private predicate higherOrderCall(
+private predicate higherOrderCall(
  DataFlow::Node arg, DataFlow::SourceNode callback, int i, DataFlow::Configuration cfg,
  PathSummary summary
 ) {
@@ -1476,7 +1476,7 @@ deprecated private predicate higherOrderCall(
 * All of this is done under configuration `cfg`, and `arg` flows along a path
 * summarized by `summary`, while `cb` is only tracked locally.
 */
-deprecated private predicate flowIntoHigherOrderCall(
+private predicate flowIntoHigherOrderCall(
  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration cfg, PathSummary summary
 ) {
  exists(DataFlow::FunctionNode cb, int i, PathSummary oldSummary |
@@ -1499,7 +1499,7 @@ deprecated private predicate flowIntoHigherOrderCall(
 * Holds if there is a flow step from `pred` to `succ` described by `summary`
 * under configuration `cfg`.
 */
-deprecated private predicate flowStep(
+private predicate flowStep(
  DataFlow::Node pred, DataFlow::Configuration cfg, DataFlow::Node succ, PathSummary summary
 ) {
  (
@@ -1527,7 +1527,7 @@ deprecated private predicate flowStep(
 * in zero or more steps.
 */
 pragma[nomagic]
-deprecated private predicate flowsTo(
+private predicate flowsTo(
  PathNode flowsource, DataFlow::Node source, SinkPathNode flowsink, DataFlow::Node sink,
  DataFlow::Configuration cfg
 ) {
@@ -1541,7 +1541,7 @@ deprecated private predicate flowsTo(
 * `summary`.
 */
 pragma[nomagic]
-deprecated private predicate reachableFromSource(
+private predicate reachableFromSource(
  DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary
 ) {
  exists(FlowLabel lbl |
@@ -1562,7 +1562,7 @@ deprecated private predicate reachableFromSource(
 * Holds if `nd` can be reached from a source under `cfg`, and in turn a sink is
 * reachable from `nd`, where the path from the source to `nd` is summarized by `summary`.
 */
-deprecated private predicate onPath(
+private predicate onPath(
  DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary
 ) {
  reachableFromSource(nd, cfg, summary) and
@@ -1583,7 +1583,7 @@ deprecated private predicate onPath(
 * This predicate has been outlined from `onPath` to give the optimizer a hint about join-ordering.
 */
 pragma[noinline]
-deprecated private predicate onPathStep(
+private predicate onPathStep(
  DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary, PathSummary stepSummary,
  DataFlow::Node mid
 ) {
@@ -1595,28 +1595,28 @@ deprecated private predicate onPathStep(
 * Holds if there is a configuration that has at least one source and at least one sink.
 */
 pragma[noinline]
-deprecated private predicate isLive() {
+private predicate isLive() {
  exists(DataFlow::Configuration cfg | isSource(_, cfg, _) and isSink(_, cfg, _))
 }

 /**
 * A data flow node on an inter-procedural path from a source.
 */
-deprecated private newtype TPathNode =
-  deprecated MkSourceNode(DataFlow::Node nd, DataFlow::Configuration cfg) {
+private newtype TPathNode =
+  MkSourceNode(DataFlow::Node nd, DataFlow::Configuration cfg) {
    isSourceNode(nd, cfg, _)
  } or
-  deprecated MkMidNode(DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary) {
+  MkMidNode(DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary) {
    isLive() and
    onPath(nd, cfg, summary)
  } or
-  deprecated MkSinkNode(DataFlow::Node nd, DataFlow::Configuration cfg) { isSinkNode(nd, cfg, _) }
+  MkSinkNode(DataFlow::Node nd, DataFlow::Configuration cfg) { isSinkNode(nd, cfg, _) }

 /**
 * Holds if `nd` is a source node for configuration `cfg`, and there is a path from `nd` to a sink
 * with the given `summary`.
 */
-deprecated private predicate isSourceNode(
+private predicate isSourceNode(
  DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary
 ) {
  exists(FlowLabel lbl | summary = PathSummary::level(lbl) |
@@ -1630,7 +1630,7 @@ deprecated private predicate isSourceNode(
 * Holds if `nd` is a sink node for configuration `cfg`, and there is a path from a source to `nd`
 * with the given `summary`.
 */
-deprecated private predicate isSinkNode(
+private predicate isSinkNode(
  DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary
 ) {
  isSink(nd, cfg, summary.getEndLabel()) and
@@ -1645,7 +1645,7 @@ deprecated private predicate isSinkNode(
 * from computing a cross-product of all path nodes belonging to the same configuration.
 */
 bindingset[cfg, result]
-deprecated private DataFlow::Configuration id(DataFlow::Configuration cfg) {
+private DataFlow::Configuration id(DataFlow::Configuration cfg) {
  result >= cfg and cfg >= result
 }

@@ -1665,7 +1665,7 @@ deprecated private DataFlow::Configuration id(DataFlow::Configuration cfg) {
 *    some source to the node with the given summary that can be extended to a path to some sink node,
 *    all under the configuration.
 */
-deprecated class PathNode extends TPathNode {
+class PathNode extends TPathNode {
  DataFlow::Node nd;
  Configuration cfg;

@@ -1721,7 +1721,7 @@ deprecated class PathNode extends TPathNode {
 }

 /** Gets the mid node corresponding to `src`. */
-deprecated private MidPathNode initialMidNode(SourcePathNode src) {
+private MidPathNode initialMidNode(SourcePathNode src) {
  exists(DataFlow::Node nd, Configuration cfg, PathSummary summary |
    result.wraps(nd, cfg, summary) and
    src = MkSourceNode(nd, cfg) and
@@ -1730,7 +1730,7 @@ deprecated private MidPathNode initialMidNode(SourcePathNode src) {
 }

 /** Gets the mid node corresponding to `snk`. */
-deprecated private MidPathNode finalMidNode(SinkPathNode snk) {
+private MidPathNode finalMidNode(SinkPathNode snk) {
  exists(DataFlow::Node nd, Configuration cfg, PathSummary summary |
    result.wraps(nd, cfg, summary) and
    snk = MkSinkNode(nd, cfg) and
@@ -1745,7 +1745,7 @@ deprecated private MidPathNode finalMidNode(SinkPathNode snk) {
 * This helper predicate exists to clarify the intended join order in `getASuccessor` below.
 */
 pragma[noinline]
-deprecated private predicate midNodeStep(
+private predicate midNodeStep(
  PathNode nd, DataFlow::Node predNd, Configuration cfg, PathSummary summary, DataFlow::Node succNd,
  PathSummary newSummary
 ) {
@@ -1756,7 +1756,7 @@ deprecated private predicate midNodeStep(
 /**
 * Gets a node to which data from `nd` may flow in one step.
 */
-deprecated private PathNode getASuccessor(PathNode nd) {
+private PathNode getASuccessor(PathNode nd) {
  // source node to mid node
  result = initialMidNode(nd)
  or
@@ -1770,7 +1770,7 @@ deprecated private PathNode getASuccessor(PathNode nd) {
  nd = finalMidNode(result)
 }

-deprecated private PathNode getASuccessorIfHidden(PathNode nd) {
+private PathNode getASuccessorIfHidden(PathNode nd) {
  nd.(MidPathNode).isHidden() and
  result = getASuccessor(nd)
 }
@@ -1782,7 +1782,7 @@ deprecated private PathNode getASuccessorIfHidden(PathNode nd) {
 * is a configuration such that `nd` is on a path from a source to a sink under `cfg`
 * summarized by `summary`.
 */
-deprecated class MidPathNode extends PathNode, MkMidNode {
+class MidPathNode extends PathNode, MkMidNode {
  PathSummary summary;

  MidPathNode() { this = MkMidNode(nd, cfg, summary) }
@@ -1802,21 +1802,21 @@ deprecated class MidPathNode extends PathNode, MkMidNode {
 /**
 * A path node corresponding to a flow source.
 */
-deprecated class SourcePathNode extends PathNode, MkSourceNode {
+class SourcePathNode extends PathNode, MkSourceNode {
  SourcePathNode() { this = MkSourceNode(nd, cfg) }
 }

 /**
 * A path node corresponding to a flow sink.
 */
-deprecated class SinkPathNode extends PathNode, MkSinkNode {
+class SinkPathNode extends PathNode, MkSinkNode {
  SinkPathNode() { this = MkSinkNode(nd, cfg) }
 }

 /**
 * Provides the query predicates needed to include a graph in a path-problem query.
 */
-deprecated module PathGraph {
+module PathGraph {
  /** Holds if `nd` is a node in the graph of data flow path explanations. */
  query predicate nodes(PathNode nd) { not nd.(MidPathNode).isHidden() }

@@ -1870,7 +1870,7 @@ deprecated module PathGraph {
 /**
 * Gets a logical `and` expression, or parenthesized expression, that contains `guard`.
 */
-deprecated private Expr getALogicalAndParent(BarrierGuardNodeInternal guard) {
+private Expr getALogicalAndParent(BarrierGuardNodeInternal guard) {
  barrierGuardIsRelevant(guard) and result = guard.asExpr()
  or
  result.(LogAndExpr).getAnOperand() = getALogicalAndParent(guard)
@@ -1881,7 +1881,7 @@ deprecated private Expr getALogicalAndParent(BarrierGuardNodeInternal guard) {
 /**
 * Gets a logical `or` expression, or parenthesized expression, that contains `guard`.
 */
-deprecated private Expr getALogicalOrParent(BarrierGuardNodeInternal guard) {
+private Expr getALogicalOrParent(BarrierGuardNodeInternal guard) {
  barrierGuardIsRelevant(guard) and result = guard.asExpr()
  or
  result.(LogOrExpr).getAnOperand() = getALogicalOrParent(guard)
@@ -1897,14 +1897,14 @@ deprecated private Expr getALogicalOrParent(BarrierGuardNodeInternal guard) {
 * of the standard library. Override `Configuration::isBarrierGuard`
 * for analysis-specific barrier guards.
 */
-abstract deprecated class AdditionalBarrierGuardNode extends BarrierGuardNode {
+abstract class AdditionalBarrierGuardNode extends BarrierGuardNode {
  abstract predicate appliesTo(Configuration cfg);
 }

 /**
 * A function that returns the result of a barrier guard.
 */
-deprecated private class BarrierGuardFunction extends Function {
+private class BarrierGuardFunction extends Function {
  DataFlow::ParameterNode sanitizedParameter;
  BarrierGuardNodeInternal guard;
  boolean guardOutcome;
@@ -1956,7 +1956,7 @@ deprecated private class BarrierGuardFunction extends Function {
 /**
 * A call that sanitizes an argument.
 */
-deprecated private class AdditionalBarrierGuardCall extends DerivedBarrierGuardNode,
+private class AdditionalBarrierGuardCall extends DerivedBarrierGuardNode,
  DataFlow::CallNode
 {
  BarrierGuardFunction f;
@@ -1979,7 +1979,7 @@ deprecated private class AdditionalBarrierGuardCall extends DerivedBarrierGuardN
 * }
 * ```
 */
-deprecated private class CallAgainstEqualityCheck extends DerivedBarrierGuardNode {
+private class CallAgainstEqualityCheck extends DerivedBarrierGuardNode {
  BarrierGuardNodeInternal prev;
  boolean polarity;

@@ -2005,7 +2005,7 @@ deprecated private class CallAgainstEqualityCheck extends DerivedBarrierGuardNod
 /**
 *  Holds if there is a path without unmatched return steps from `source` to `sink`.
 */
-deprecated predicate hasPathWithoutUnmatchedReturn(SourcePathNode source, SinkPathNode sink) {
+predicate hasPathWithoutUnmatchedReturn(SourcePathNode source, SinkPathNode sink) {
  exists(MidPathNode mid |
    source.getASuccessor*() = mid and
    sink = mid.getASuccessor() and
--- a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
@@ -1929,7 +1929,7 @@ module DataFlow {
  import Nodes
  import Sources
  import TypeInference
-  deprecated import Configuration
+  import Configuration
  import TypeTracking
  import AdditionalFlowSteps
  import internal.FunctionWrapperSteps
--- a/javascript/ql/lib/semmle/javascript/dataflow/ForwardExploration.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/ForwardExploration.qll
@@ -1,6 +1,6 @@
 /**
 * Alias for the library `semmle.javascript.explore.ForwardDataFlow`.
 */
-deprecated module;
+// deprecated module;

 import semmle.javascript.explore.ForwardDataFlow
--- a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
@@ -37,7 +37,7 @@ module TaintTracking {
   * If a different set of flow edges is desired, extend this class and override
   * `isAdditionalTaintStep`.
   */
-  abstract deprecated class Configuration extends DataFlow::Configuration {
+  abstract class Configuration extends DataFlow::Configuration {
    bindingset[this]
    Configuration() { any() }

@@ -210,16 +210,16 @@ module TaintTracking {
  abstract private class LegacyAdditionalBarrierGuard extends AdditionalBarrierGuard,
    AdditionalSanitizerGuardNodeDeprecated
  {
-    deprecated override predicate sanitizes(boolean outcome, Expr e) { this.blocksExpr(outcome, e) }
+    override predicate sanitizes(boolean outcome, Expr e) { this.blocksExpr(outcome, e) }

-    deprecated override predicate appliesTo(Configuration cfg) { any() }
+    override predicate appliesTo(Configuration cfg) { any() }
  }

  /**
   * DEPRECATED. This class was part of the old data flow library which is now deprecated.
   * Use `TaintTracking::AdditionalBarrierGuard` instead.
   */
-  deprecated class AdditionalSanitizerGuardNode = AdditionalSanitizerGuardNodeDeprecated;
+  class AdditionalSanitizerGuardNode = AdditionalSanitizerGuardNodeDeprecated;

  cached
  abstract private class AdditionalSanitizerGuardNodeDeprecated extends DataFlow::Node {
@@ -229,20 +229,20 @@ module TaintTracking {
     * Holds if this node blocks expression `e`, provided it evaluates to `outcome`.
     */
    cached
-    deprecated predicate blocks(boolean outcome, Expr e) { none() }
+    predicate blocks(boolean outcome, Expr e) { none() }

    /**
     * Holds if this node sanitizes expression `e`, provided it evaluates
     * to `outcome`.
     */
    cached
-    abstract deprecated predicate sanitizes(boolean outcome, Expr e);
+    abstract predicate sanitizes(boolean outcome, Expr e);

    /**
     * Holds if this node blocks expression `e` from flow of type `label`, provided it evaluates to `outcome`.
     */
    cached
-    deprecated predicate blocks(boolean outcome, Expr e, DataFlow::FlowLabel label) {
+    predicate blocks(boolean outcome, Expr e, DataFlow::FlowLabel label) {
      this.sanitizes(outcome, e) and label.isTaint()
      or
      this.sanitizes(outcome, e, label)
@@ -253,13 +253,13 @@ module TaintTracking {
     * to `outcome`.
     */
    cached
-    deprecated predicate sanitizes(boolean outcome, Expr e, DataFlow::FlowLabel label) { none() }
+    predicate sanitizes(boolean outcome, Expr e, DataFlow::FlowLabel label) { none() }

    /**
     * Holds if this guard applies to the flow in `cfg`.
     */
    cached
-    abstract deprecated predicate appliesTo(Configuration cfg);
+    abstract predicate appliesTo(Configuration cfg);
  }

  /**
@@ -274,7 +274,7 @@ module TaintTracking {
   * implementations of `sanitizes` will _both_ apply to any configuration that includes either of
   * them.
   */
-  abstract deprecated class SanitizerGuardNode extends DataFlow::BarrierGuardNode {
+  abstract class SanitizerGuardNode extends DataFlow::BarrierGuardNode {
    override predicate blocks(boolean outcome, Expr e) { none() }

    /**
@@ -299,7 +299,7 @@ module TaintTracking {
  /**
   * A sanitizer guard node that only blocks specific flow labels.
   */
-  abstract deprecated class LabeledSanitizerGuardNode extends SanitizerGuardNode,
+  abstract class LabeledSanitizerGuardNode extends SanitizerGuardNode,
    DataFlow::BarrierGuardNode
  {
    override predicate sanitizes(boolean outcome, Expr e) { none() }
@@ -902,7 +902,7 @@ module TaintTracking {
    }
  }

-  deprecated private class AdHocWhitelistCheckSanitizerAsSanitizerGuardNode extends SanitizerGuardNode instanceof AdHocWhitelistCheckSanitizer
+  private class AdHocWhitelistCheckSanitizerAsSanitizerGuardNode extends SanitizerGuardNode instanceof AdHocWhitelistCheckSanitizer
  {
    override predicate sanitizes(boolean outcome, Expr e) { super.blocksExpr(outcome, e) }
  }
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/BarrierGuards.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/BarrierGuards.qll
@@ -36,7 +36,7 @@ module MakeBarrierGuard<BarrierGuardSig BaseGuard> {
  }
 }

-deprecated private module DeprecationWrapper {
+private module DeprecationWrapper {
  signature class LabeledBarrierGuardSig extends DataFlow::Node {
    /**
     * Holds if this node acts as a barrier for `label`, blocking further flow from `e` if `this` evaluates to `outcome`.
@@ -48,7 +48,7 @@ deprecated private module DeprecationWrapper {
 /**
 * Converts a barrier guard class to a set of nodes to include in an implementation of `isBarrier(node, label)`.
 */
-deprecated module MakeLabeledBarrierGuard<DeprecationWrapper::LabeledBarrierGuardSig BaseGuard> {
+module MakeLabeledBarrierGuard<DeprecationWrapper::LabeledBarrierGuardSig BaseGuard> {
  final private class FinalBaseGuard = BaseGuard;

  private class Adapter extends FinalBaseGuard {
@@ -71,7 +71,7 @@ deprecated module MakeLabeledBarrierGuard<DeprecationWrapper::LabeledBarrierGuar
 * This module is a workaround for the fact that deprecated signatures can't refer to deprecated classes
 * without getting a deprecation warning
 */
-deprecated private module DeprecatedSigs {
+private module DeprecatedSigs {
  signature predicate isBarrierGuardSig(DataFlow::BarrierGuardNode node);
 }

@@ -79,7 +79,7 @@ deprecated private module DeprecatedSigs {
 * Converts a labeled barrier guard class to a set of nodes to include in an implementation of `isBarrier(node)` and `isBarrier(node, label)`
 * in a `DataFlow::StateConfigSig` implementation.
 */
-deprecated module MakeLegacyBarrierGuardLabeled<DeprecatedSigs::isBarrierGuardSig/1 isBarrierGuard> {
+module MakeLegacyBarrierGuardLabeled<DeprecatedSigs::isBarrierGuardSig/1 isBarrierGuard> {
  final private class FinalNode = DataFlow::Node;

  private class Adapter extends FinalNode instanceof DataFlow::BarrierGuardNode {
@@ -110,7 +110,7 @@ deprecated module MakeLegacyBarrierGuardLabeled<DeprecatedSigs::isBarrierGuardSi
 /**
 * Converts a barrier guard class to a set of nodes to include in an implementation of `isBarrier(node)` in a `DataFlow::ConfigSig` implementation.
 */
-deprecated module MakeLegacyBarrierGuard<DeprecatedSigs::isBarrierGuardSig/1 isBarrierGuard> {
+module MakeLegacyBarrierGuard<DeprecatedSigs::isBarrierGuardSig/1 isBarrierGuard> {
  final private class FinalNode = DataFlow::Node;

  private class Adapter extends FinalNode instanceof DataFlow::BarrierGuardNode {
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
@@ -1084,7 +1084,7 @@ abstract private class BarrierGuardAdapter extends DataFlow::Node {
  predicate blocksExpr(boolean outcome, Expr e) { none() }
 }

-deprecated private class BarrierGuardAdapterSubclass extends BarrierGuardAdapter instanceof DataFlow::AdditionalBarrierGuardNode
+private class BarrierGuardAdapterSubclass extends BarrierGuardAdapter instanceof DataFlow::AdditionalBarrierGuardNode
 {
  override predicate blocksExpr(boolean outcome, Expr e) { super.blocks(outcome, e) }
 }
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSteps.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSteps.qll
@@ -5,7 +5,7 @@
 */

 import javascript
-deprecated import semmle.javascript.dataflow.Configuration
+import semmle.javascript.dataflow.Configuration
 import semmle.javascript.dataflow.internal.CallGraphs
 private import semmle.javascript.internal.CachedStages

@@ -49,7 +49,7 @@ private predicate legacyPostUpdateStep(DataFlow::Node pred, DataFlow::Node succ)
 * additional steps from the configuration into account.
 */
 pragma[inline]
-deprecated predicate localFlowStep(
+predicate localFlowStep(
  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration configuration,
  FlowLabel predlbl, FlowLabel succlbl
 ) {
@@ -545,9 +545,9 @@ class Boolean extends boolean {
 /**
 * A summary of an inter-procedural data flow path.
 */
-deprecated newtype TPathSummary =
+newtype TPathSummary =
  /** A summary of an inter-procedural data flow path. */
-  deprecated MkPathSummary(Boolean hasReturn, Boolean hasCall, FlowLabel start, FlowLabel end)
+  MkPathSummary(Boolean hasReturn, Boolean hasCall, FlowLabel start, FlowLabel end)

 /**
 * A summary of an inter-procedural data flow path.
@@ -560,7 +560,7 @@ deprecated newtype TPathSummary =
 * We only want to build properly matched call/return sequences, so if a path has both
 * call steps and return steps, all return steps must precede all call steps.
 */
-deprecated class PathSummary extends TPathSummary {
+class PathSummary extends TPathSummary {
  Boolean hasReturn;
  Boolean hasCall;
  FlowLabel start;
@@ -634,7 +634,7 @@ deprecated class PathSummary extends TPathSummary {
  }
 }

-deprecated module PathSummary {
+module PathSummary {
  /**
   * Gets a summary describing a path without any calls or returns.
   */
--- a/javascript/ql/lib/semmle/javascript/explore/BackwardDataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/explore/BackwardDataFlow.qll
@@ -12,11 +12,11 @@
 * Backward exploration in particular does not scale on non-trivial code bases and hence is of limited
 * usefulness as it stands.
 */
-deprecated module;
+module;

 import javascript

-deprecated private class BackwardExploringConfiguration extends DataFlow::Configuration {
+private class BackwardExploringConfiguration extends DataFlow::Configuration {
  BackwardExploringConfiguration() { this = any(DataFlow::Configuration cfg) }

  override predicate isSource(DataFlow::Node node) { any() }
--- a/javascript/ql/lib/semmle/javascript/explore/ForwardDataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/explore/ForwardDataFlow.qll
@@ -10,11 +10,11 @@
 *
 * NOTE: This library should only be used for debugging and exploration, not in production code.
 */
-deprecated module;
+module;

 import javascript

-deprecated private class ForwardExploringConfiguration extends DataFlow::Configuration {
+private class ForwardExploringConfiguration extends DataFlow::Configuration {
  ForwardExploringConfiguration() { this = any(DataFlow::Configuration cfg) }

  override predicate isSink(DataFlow::Node node) { any() }
--- a/javascript/ql/lib/semmle/javascript/security/CommonFlowState.qll
+++ b/javascript/ql/lib/semmle/javascript/security/CommonFlowState.qll
@@ -50,7 +50,7 @@ class FlowState extends TFlowState {
  }

  /** DEPRECATED. Gets the corresponding flow label. */
-  deprecated DataFlow::FlowLabel toFlowLabel() {
+  DataFlow::FlowLabel toFlowLabel() {
    this.isTaint() and result.isTaint()
    or
    this.isTaintedUrlSuffix() and result = TaintedUrlSuffix::label()
@@ -86,5 +86,5 @@ module FlowState {
  FlowState taintedObject() { result.isTaintedObject() }

  /** DEPRECATED. Gets the flow state corresponding to `label`. */
-  deprecated FlowState fromFlowLabel(DataFlow::FlowLabel label) { result.toFlowLabel() = label }
+  FlowState fromFlowLabel(DataFlow::FlowLabel label) { result.toFlowLabel() = label }
 }
--- a/javascript/ql/lib/semmle/javascript/security/TaintedObject.qll
+++ b/javascript/ql/lib/semmle/javascript/security/TaintedObject.qll
@@ -22,14 +22,14 @@ module TaintedObject {
  import TaintedObjectCustomizations::TaintedObject

  // Materialize flow labels
-  deprecated private class ConcreteTaintedObjectLabel extends TaintedObjectLabel {
+  private class ConcreteTaintedObjectLabel extends TaintedObjectLabel {
    ConcreteTaintedObjectLabel() { this = this }
  }

  /**
   * DEPRECATED. Use `isAdditionalFlowStep(node1, state1, node2, state2)` instead.
   */
-  deprecated predicate step(Node src, Node trg, FlowLabel inlbl, FlowLabel outlbl) {
+  predicate step(Node src, Node trg, FlowLabel inlbl, FlowLabel outlbl) {
    isAdditionalFlowStep(src, FlowState::fromFlowLabel(inlbl), trg, FlowState::fromFlowLabel(outlbl))
  }

@@ -80,7 +80,7 @@ module TaintedObject {
   *
   * Holds if `node` is a source of JSON taint and label is the JSON taint label.
   */
-  deprecated predicate isSource(Node source, FlowLabel label) {
+  predicate isSource(Node source, FlowLabel label) {
    source instanceof Source and label = label()
  }

@@ -100,21 +100,21 @@ module TaintedObject {
    predicate blocksExpr(boolean outcome, Expr e, FlowState state) { none() }

    /** DEPRECATED. Use `blocksExpr` instead. */
-    deprecated predicate sanitizes(boolean outcome, Expr e, FlowLabel label) {
+    predicate sanitizes(boolean outcome, Expr e, FlowLabel label) {
      this.blocksExpr(outcome, e, FlowState::fromFlowLabel(label))
    }

    /** DEPRECATED. Use `blocksExpr` instead. */
-    deprecated predicate sanitizes(boolean outcome, Expr e) { this.blocksExpr(outcome, e) }
+    predicate sanitizes(boolean outcome, Expr e) { this.blocksExpr(outcome, e) }
  }

-  deprecated private class SanitizerGuardLegacy extends TaintTracking::LabeledSanitizerGuardNode instanceof SanitizerGuard
+  private class SanitizerGuardLegacy extends TaintTracking::LabeledSanitizerGuardNode instanceof SanitizerGuard
  {
-    deprecated override predicate sanitizes(boolean outcome, Expr e, FlowLabel label) {
+    override predicate sanitizes(boolean outcome, Expr e, FlowLabel label) {
      SanitizerGuard.super.sanitizes(outcome, e, label)
    }

-    deprecated override predicate sanitizes(boolean outcome, Expr e) {
+    override predicate sanitizes(boolean outcome, Expr e) {
      SanitizerGuard.super.sanitizes(outcome, e)
    }
  }
--- a/javascript/ql/lib/semmle/javascript/security/TaintedObjectCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/TaintedObjectCustomizations.qll
@@ -10,7 +10,7 @@ module TaintedObject {
  import CommonFlowState

  /** A flow label representing a deeply tainted object. */
-  abstract deprecated class TaintedObjectLabel extends DataFlow::FlowLabel {
+  abstract class TaintedObjectLabel extends DataFlow::FlowLabel {
    TaintedObjectLabel() { this = "tainted-object" }
  }

@@ -21,7 +21,7 @@ module TaintedObject {
   *
   * Note that the presence of the this label generally implies the presence of the `taint` label as well.
   */
-  deprecated DataFlow::FlowLabel label() { result instanceof TaintedObjectLabel }
+  DataFlow::FlowLabel label() { result instanceof TaintedObjectLabel }

  /**
   * A source of a user-controlled deep object.
--- a/javascript/ql/lib/semmle/javascript/security/TaintedUrlSuffix.qll
+++ b/javascript/ql/lib/semmle/javascript/security/TaintedUrlSuffix.qll
@@ -12,7 +12,7 @@ import javascript
 module TaintedUrlSuffix {
  import TaintedUrlSuffixCustomizations::TaintedUrlSuffix

-  deprecated private class ConcreteTaintedUrlSuffixLabel extends TaintedUrlSuffixLabel {
+  private class ConcreteTaintedUrlSuffixLabel extends TaintedUrlSuffixLabel {
    ConcreteTaintedUrlSuffixLabel() { this = this }
  }
 }
--- a/javascript/ql/lib/semmle/javascript/security/TaintedUrlSuffixCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/TaintedUrlSuffixCustomizations.qll
@@ -19,14 +19,14 @@ module TaintedUrlSuffix {
   *
   * Can also be accessed using `TaintedUrlSuffix::label()`.
   */
-  abstract deprecated class TaintedUrlSuffixLabel extends FlowLabel {
+  abstract class TaintedUrlSuffixLabel extends FlowLabel {
    TaintedUrlSuffixLabel() { this = "tainted-url-suffix" }
  }

  /**
   * Gets the flow label representing a URL with a tainted query and fragment part.
   */
-  deprecated FlowLabel label() { result instanceof TaintedUrlSuffixLabel }
+  FlowLabel label() { result instanceof TaintedUrlSuffixLabel }

  /** Gets a remote flow source that is a tainted URL query or fragment part from `window.location`. */
  ClientSideRemoteFlowSource source() {
@@ -45,7 +45,7 @@ module TaintedUrlSuffix {
   * This should be used in the `isBarrier` predicate of a configuration that uses the tainted-url-suffix
   * label.
   */
-  deprecated predicate isBarrier(Node node, FlowLabel label) {
+  predicate isBarrier(Node node, FlowLabel label) {
    isStateBarrier(node, FlowState::fromFlowLabel(label))
  }

@@ -60,7 +60,7 @@ module TaintedUrlSuffix {
  /**
   * DEPRECATED. Use `isAdditionalFlowStep` instead.
   */
-  deprecated predicate step(Node src, Node dst, FlowLabel srclbl, FlowLabel dstlbl) {
+  predicate step(Node src, Node dst, FlowLabel srclbl, FlowLabel dstlbl) {
    isAdditionalFlowStep(src, FlowState::fromFlowLabel(srclbl), dst,
      FlowState::fromFlowLabel(dstlbl))
  }
--- a/javascript/ql/lib/semmle/javascript/security/regexp/PolynomialReDoSCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/regexp/PolynomialReDoSCustomizations.qll
@@ -56,11 +56,11 @@ module PolynomialReDoS {
    predicate blocksExpr(boolean outcome, Expr e) { none() }

    /** DEPRECATED. Use `blocksExpr` instead. */
-    deprecated predicate sanitizes(boolean outcome, Expr e) { this.blocksExpr(outcome, e) }
+    predicate sanitizes(boolean outcome, Expr e) { this.blocksExpr(outcome, e) }
  }

  /** A subclass of `BarrierGuard` that is used for backward compatibility with the old data flow library. */
-  deprecated final private class BarrierGuardLegacy extends TaintTracking::SanitizerGuardNode instanceof BarrierGuard
+  final private class BarrierGuardLegacy extends TaintTracking::SanitizerGuardNode instanceof BarrierGuard
  {
    override predicate sanitizes(boolean outcome, Expr e) {
      BarrierGuard.super.sanitizes(outcome, e)
--- a/javascript/ql/lib/semmle/javascript/security/regexp/PolynomialReDoSQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/regexp/PolynomialReDoSQuery.qll
@@ -35,7 +35,7 @@ module PolynomialReDoSFlow = TaintTracking::Global<PolynomialReDoSConfig>;
 /**
 * DEPRECATED. Use the `PolynomialReDoSFlow` module instead.
 */
-deprecated class Configuration extends TaintTracking::Configuration {
+class Configuration extends TaintTracking::Configuration {
  Configuration() { this = "PolynomialReDoS" }

  override predicate isSource(DataFlow::Node source) { source instanceof Source }
--- a/javascript/ql/lib/utils/test/ConsistencyChecking.qll
+++ b/javascript/ql/lib/utils/test/ConsistencyChecking.qll
@@ -13,7 +13,7 @@ import javascript
 *
 * If no configuration is specified, then the default is that the all sinks from a `DataFlow::Configuration` are alerts, and all files are consistency-checked.
 */
-abstract deprecated class ConsistencyConfiguration extends string {
+abstract class ConsistencyConfiguration extends string {
  bindingset[this]
  ConsistencyConfiguration() { any() }

@@ -36,7 +36,7 @@ abstract deprecated class ConsistencyConfiguration extends string {
 *
 * Is used internally to match a configuration or lack thereof.
 */
-deprecated final private class Conf extends string {
+final private class Conf extends string {
  Conf() {
    this instanceof ConsistencyConfiguration
    or
@@ -71,14 +71,14 @@ private class AssertionComment extends Comment {
  predicate expectConsistencyError() { this.getText().matches("%[INCONSISTENCY]%") }
 }

-deprecated private DataFlow::Node getASink() {
+private DataFlow::Node getASink() {
  exists(DataFlow::Configuration cfg | cfg.hasFlow(_, result))
 }

 /**
 * Gets all the alerts for consistency consistency checking from a configuration `conf`.
 */
-deprecated private DataFlow::Node alerts(Conf conf) {
+private DataFlow::Node alerts(Conf conf) {
  result = conf.(ConsistencyConfiguration).getAnAlert()
  or
  not exists(ConsistencyConfiguration r) and
@@ -91,7 +91,7 @@ deprecated private DataFlow::Node alerts(Conf conf) {
 * The `line` can be either the first or the last line of the alert.
 * And if no expression exists at `line`, then an alert on the next line is used.
 */
-deprecated private DataFlow::Node getAlert(File file, int line, Conf conf) {
+private DataFlow::Node getAlert(File file, int line, Conf conf) {
  result = alerts(conf) and
  result.getFile() = file and
  (result.hasLocationInfo(_, _, _, line, _) or result.hasLocationInfo(_, line, _, _, _))
@@ -116,7 +116,7 @@ private AssertionComment getComment(File file, int line) {
 /**
 * Holds if there is a false positive in `file` at `line` for configuration `conf`.
 */
-deprecated private predicate falsePositive(File file, int line, AssertionComment comment, Conf conf) {
+private predicate falsePositive(File file, int line, AssertionComment comment, Conf conf) {
  exists(getAlert(file, line, conf)) and
  comment = getComment(file, line) and
  not comment.shouldHaveAlert()
@@ -125,7 +125,7 @@ deprecated private predicate falsePositive(File file, int line, AssertionComment
 /**
 * Holds if there is a false negative in `file` at `line` for configuration `conf`.
 */
-deprecated private predicate falseNegative(File file, int line, AssertionComment comment, Conf conf) {
+private predicate falseNegative(File file, int line, AssertionComment comment, Conf conf) {
  not exists(getAlert(file, line, conf)) and
  comment = getComment(file, line) and
  comment.shouldHaveAlert()
@@ -134,7 +134,7 @@ deprecated private predicate falseNegative(File file, int line, AssertionComment
 /**
 * Gets a file that should be included for consistency checking for configuration `conf`.
 */
-deprecated private File getATestFile(string conf) {
+private File getATestFile(string conf) {
  not exists(any(ConsistencyConfiguration res).getAFile()) and
  result = any(LineComment comment).getFile() and
  (conf = "" or conf instanceof ConsistencyConfiguration)
@@ -147,7 +147,7 @@ deprecated private File getATestFile(string conf) {
 * Or the empty string
 */
 bindingset[file, line]
-deprecated private string getSinkDescription(File file, int line, Conf conf) {
+private string getSinkDescription(File file, int line, Conf conf) {
  not exists(DataFlow::Configuration c | c.hasFlow(_, getAlert(file, line, conf))) and
  result = ""
  or
@@ -161,7 +161,7 @@ deprecated private string getSinkDescription(File file, int line, Conf conf) {
 * The consistency issue an unexpected false positive/negative.
 * Or that false positive/negative was expected, and none were found.
 */
-deprecated query predicate consistencyIssue(
+query predicate consistencyIssue(
  string location, string msg, string commentText, Conf conf
 ) {
  exists(File file, int line |