diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
index 85e4a83d1b0780838ff9c42a7eb71b50bdec46a3..481b41b04e888752bab0702d2e7ecefec6aa25fd 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
@@ -144,16 +144,6 @@ class printSummary(JobProperty):
     allowedTypes=['bool']
     StoredValue=False
 
-class createTagAndProbeInput(JobProperty):
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=False
-
-class createScaleCalibrationInput(JobProperty):
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=False
-
 ## Decide whether to wrap the new configuration in the old.
 class useNewConfig(JobProperty):
     statusOn=True
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py
deleted file mode 100644
index aaa2cea36959d63e17cc2a2da25b46ebfb3dc272..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.AlgSequence import AlgSequence
-from AthenaCommon.Constants import INFO
-from AthenaCommon import CfgMgr
-import os
-
-def setupScaleCalibrationInput():
-    from AthenaCommon.AppMgr import ServiceMgr, ToolSvc
-    print("Setting up setupScaleCalibrationInput")
-
-    topSequence = AlgSequence()
-    # THistSvc configuration
-    from GaudiSvc.GaudiSvcConf import THistSvc
-    ServiceMgr += THistSvc()
-    ServiceMgr.THistSvc.Output += [ "MCPCALIB DATAFILE='MCPCalibNtuple_xAOD.root' OPT='RECREATE'" ]
-    
-    # Setup GRL
-    GRL = os.path.expandvars( '$TestArea/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/grl/data12_8TeV.periodAllYear_HEAD_DQDefects-00-01-02_PHYS_CombinedPerf_Muon_Muon_calo.xml' )
-    ToolSvc += CfgMgr.GoodRunsListSelectionTool( 'GRLTool' , GoodRunsListVec = [ GRL ] )
-
-    # Setup MST
-    ToolSvc += CfgMgr.CP__MuonSelectionTool( 'MuonSelectorTool', OutputLevel = INFO )
-    ToolSvc += CfgMgr.CalibMuonsSelectorTool( 'CalibMuonsSelectorTool', MuonSelectorTool = ToolSvc.MuonSelectorTool, OutputLevel = INFO )
-    
-    # Setup algorithm
-    topSequence += CfgMgr.CalibMuonsNtupleMaker( 'CalibMuonsNtupleMaker', OutputLevel = INFO, SelectorTool = SelectorTool, ExtendedVersion = False )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py
deleted file mode 100644
index e9d657bea796dc3632aaa2c8b7bf2ef4b6f844b8..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.Include import include
-
-
-def setupTagAndProbeInput():
-    print("Setting up setupTagAndProbeInput")
-
-    #from MuonPerformanceAlgs.ZmumuTPAnalysis import *
-    #from MuonPerformanceAlgs.ZmumuTPIsolationAnalysis import *
-    #from MuonPerformanceAlgs.ZmumuTPTrigAnalysis import *
-    include('MuonPerformanceAlgs/ZmumuTPAnalysis.py')
-    include('MuonPerformanceAlgs/ZmumuTPIsolationAnalysis.py')
-    include('MuonPerformanceAlgs/ZmumuTPTrigAnalysis.py')
- 
-     # now we can add the TP analysis/es itself/themselves :)
- 
-    ############## Zmumu T&P Configuration ########################
-    do_Zmumu_RecoEff_TagProbe      = True # this is for Z->mumu, reco eff. You can add your own analysis in a similar way.
-    do_Zmumu_IsolationEff_TagProbe = True # this is for Z->mumu, isolation eff. You can add your own analysis in a similar way.
-    do_Zmumu_Trigger_TagProbe      = True  # this is for Z->mumu, Trigger eff.
-    
-    ##### General analysis options
-    writeNtuple = True                     # Write an ntuple on top of the histos - for detailed studies, but increases output file size
-    doEtaSlices = False
-    doClosure   = False
-    doDRSys     = False
-    doValid     = False
-    
-    
-    # Add utilities (tool, upstream algorithms) we need
-    AddIsolationTools()
-    AddTrigDecisionTool()
-    AddTrigMatchingTool()
-    AddMuonSelectionTool()
-    
-    
-    ##### Reco eff analysis options
-    if do_Zmumu_RecoEff_TagProbe:
-        writeNtuple = True                   
-        doEtaSlices = False
-        doClosure   = False
-        doDRSys     = True
-        doValid     = True
-        AddZmumuTPAnalysis(doEtaSlices,writeNtuple,doClosure,doDRSys,doValid)     
-    ###############################################################
-    
-    
-    ##### Isolation eff analysis options
-    if do_Zmumu_IsolationEff_TagProbe:
-        doEtaSlices = False
-        doClosure   = False
-        doDRSys     = True
-        doValid     = True
-        AddZmumuTPIsolationAnalysis(doEtaSlices,writeNtuple,doClosure,doDRSys)
-        pass
-    ###############################################################
-    
-    
-    ##### Trigger analysis options
-    if do_Zmumu_Trigger_TagProbe:
-        doTriggerL1  = True
-        doTriggerL2  = False
-        doTriggerEF  = False
-        doTriggerHLT = True
-        doEtaSlices  = True
-        doDRSys      = False
-        AddTriggerTPAnalysis(doEtaSlices,writeNtuple,doClosure,doDRSys,doL1=doTriggerL1,doL2=doTriggerL2,doEF=doTriggerEF,doHLT=doTriggerHLT)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_postprocessing.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_postprocessing.py
index a662293fd218755b5168d5aca597f632b5b20e58..4f735164d3aaed0c757484894525e3aad0180941 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_postprocessing.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_postprocessing.py
@@ -52,14 +52,6 @@ if rec.doTruth() and muonCombinedRecFlags.doxAOD() and rec.doMuonCombined():
 if muonCombinedRecFlags.doTrackPerformance:
     include("MuonCombinedRecExample/MuonCombinedTrackPerformance_jobOptions.py")
 
-if( muonCombinedRecFlags.createTagAndProbeInput() ):
-    from MuonCombinedRecExample.TagAndProbeInputSetup import setupTagAndProbeInput
-    setupTagAndProbeInput()
-
-if( muonCombinedRecFlags.createScaleCalibrationInput() ):
-    from MuonCombinedRecExample.ScaleCalibrationInputSetup import setupScaleCalibrationInput
-    setupScaleCalibrationInput()
-    
 if rec.doMuonCombined() and rec.doJetMissingETTag() and muonCombinedRecFlags.doxAOD():
     muonTCLinkAlg = CfgMgr.ClusterMatching__CaloClusterMatchLinkAlg("MuonTCLinks",ClustersToDecorate="MuonClusterCollection")
     topSequence += muonTCLinkAlg