diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py
index f306d65abdf0d54b415c57ca3ff113dc0ee134d2..201efc414639048ee694d81f4936dad7cb8156ea 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py
@@ -4,7 +4,9 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 
 from BTagging.BTagTrackAugmenterAlgConfig import BTagTrackAugmenterAlgCfg
-from BTagging.BTagHighLevelAugmenterAlgConfig import BTagHighLevelAugmenterAlgCfg
+from FlavorTagDiscriminants.BTagJetAugmenterAlgConfig import (
+    BTagJetAugmenterAlgCfg)
+
 from BTagging.HighLevelBTagAlgConfig import HighLevelBTagAlgCfg
 
 def RenameInputContainerCfg(suffix):
@@ -73,7 +75,7 @@ def RunHighLevelTaggersCfg(inputFlags, jet, tracks, Associator, taggers):
     result = ComponentAccumulator()
 
     BTagCollection = inputFlags.BTagging.OutputFiles.Prefix+JetCollection
-    result.merge(BTagHighLevelAugmenterAlgCfg(inputFlags, JetCollection=jet, BTagCollection=BTagCollection, Associator=Associator, TrackCollection=tracks) )
+    result.merge(BTagJetAugmenterAlgCfg(inputFlags, JetCollection=jet, BTagCollection=BTagCollection, Associator=Associator, TrackCollection=tracks) )
     for dl2 in taggers:
         result.merge(HighLevelBTagAlgCfg(inputFlags, BTagCollection, TrackCollection=tracks, NNFile=dl2) )
 
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_TOPSLMU.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_TOPSLMU.py
index 5267cd40352ce6e581c4f5f04fdab2b9f104e73b..73386c9b6a895dd44e9a6d3e2254b716e9b283dd 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_TOPSLMU.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_TOPSLMU.py
@@ -21,7 +21,7 @@ DRAW_TOPSLMU_Seq = CfgMgr.AthSequencer("DRAW_TOPSLMU_Seq")
 # FixedCutBEff_77 for btag
 sel_muon = 'Muons.pt > 30.0*GeV && abs(Muons.eta) < 2.5 && (Muons.quality == 0)'
 sel_jet  = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5'
-sel_bjet  = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5 && BTagging_AntiKt4EMTopo.MV2c10_discriminant>0.645925'
+sel_bjet  = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5'
 sel_el  = 'Electrons.pt > 20*GeV && ( Electrons.Loose || Electrons.LHLoose ) && abs( Electrons.eta) < 2.47'
 
 #met = 'MET_Reference_AntiKt4EMTopo["FinalClus"].met > 55*GeV'
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py
index f61cf6ccf3affbf4b7f0ff62b50fc5a17dd019b6..ae6da2e2aeeb069c77ee93818214ca79a2a11bd6 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py
@@ -26,7 +26,7 @@ sel_muon  = 'Muons.pt > 24*GeV && Muons.ptcone20/Muons.pt < 0.2'
 from AthenaCommon.BFieldFlags import jobproperties
 if jobproperties.BField.solenoidOn():
     PerfDPD_TtbarMuon_log.info( "Configuring b-tagging selection with solenoid on" )
-    sel_bjet  = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5 && BTagging_AntiKt4EMTopo.MV2c10_discriminant>0.0314'
+    sel_bjet  = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5'
 else:
     PerfDPD_TtbarMuon_log.info( "Configuring b-tagging selection with solenoid off" )
     sel_bjet  = 'AntiKt4EMTopoJets.pt > 25*GeV && abs(AntiKt4EMTopoJets.eta) < 2.5'
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetMonitoringConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetMonitoringConfig.py
index 121828fc2b7212f9183f5e25e6e029127fce7b13..746c65ac453ba26de40d1c2aaa877834ad5eb5cf 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetMonitoringConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetMonitoringConfig.py
@@ -67,8 +67,6 @@ def TrigBjetOnlineMonitoring(name="TrigBjetOnlineMonitoring"):
     # B-Tagging Histograms
     for tagger in ['IP2D', 'IP3D', 'DL1r', 'rnnip']: make_flavor_hists(montool, tagger)
 
-    montool.defineHistogram('MV2c10_discriminant', title="MV2c10 Score", xbins = default_bin_count, xmin=-1, xmax=1, path='EXPERT', type='TH1F')
-
 
     montool.defineHistogram('JetFitter_N2Tpair',
         title='JetFitter: Number of 2-Track Pairs',
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlg.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlg.cxx
index 2243a34d35d92b3e90112d8aa605c202982ecc9c..784419ea883207c74eaf771a6ca8e944679c38d5 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlg.cxx
@@ -486,16 +486,12 @@ StatusCode TrigBjetBtagHypoAlg::monitor_btagging( const ElementLinkVector< xAOD:
     monitor_for_JetFitterSecondaryVertex_averageAllJetTrackRelativeEta
   );
 
-  // Monitor MV2c10
-  MONITOR_BTAG_AUX_VAR(MV2c10_discriminant, float, bTaggingEL);
-
   auto monitor_group_for_btagging = Monitored::Group( m_monTool, 
     monitor_for_JetFitter_isDefaults,
     monitor_for_SV1_isDefaults,
     monitor_for_IP2D_isDefaults,
     monitor_for_IP3D_isDefaults,
-    monitor_for_JetFitterSecondaryVertex_isDefaults,
-    monitor_for_MV2c10_discriminant
+    monitor_for_JetFitterSecondaryVertex_isDefaults
   );
 
   return StatusCode::SUCCESS;
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index abe3de31034cd80ffd1e04a109c0258c65fdbb12..f99cd4fa9580ae94b3a64d774fa840373c4db1a0 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -181,10 +181,6 @@ ConfigFlags.Trigger.EDMVersion = 3
 # Some legacy b-tagging configuration is trigger specific
 ConfigFlags.BTagging.databaseScheme = 'Trig'
 ConfigFlags.BTagging.forcedCalibrationChannel = 'AntiKt4EMTopo'
-# something is asking for MV2 :'(
-# TODO: remove whatever it is, see ATR-25239
-# Note: for some reason append(...) doesn't work here, but += [...] does
-ConfigFlags.BTagging.taggerList += ['MV2c10']
 
 # Set final Cond/Geo tag based on input file, command line or default
 globalflags.DetDescrVersion = opt.setDetDescr or ConfigFlags.Trigger.OnlineGeoTag