diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt
index ef96d698a84f0e848c053d5aea466699845be281..06c97ab7da03320343029f7a7e6d9e102d3a9947 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt
@@ -38,6 +38,5 @@ endfunction( _add_test )
_add_test( TestService test/test_dataaccess.sh )
_add_test( TestServiceNewJO test/test_dataaccessNewJO.sh )
-_add_test( caloCf test/test_t2calo_cf_build.sh )
_add_test( caloOnly test/test_t2calo_only_build.sh )
_add_test( caloRinger test/test_t2calo_ringer_only_build.sh )
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_cf_build.sh b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_cf_build.sh
deleted file mode 100755
index 235141b868488c828298931b855afd7c20ad179a..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_cf_build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using IDCalo job options with doID=False
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/IDCalo.py"
-export EXTRA="doID=False"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
deleted file mode 100644
index 55540059ec5ab585a325a341882af25f263534bd..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#
-
-doWriteRDOTrigger = False
-doWriteBS = False
-include("TriggerJobOpts/runHLT_standalone.py")
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# ----------------------------------------------------------------
-# Setup Views
-# ----------------------------------------------------------------
-from AthenaCommon.AlgSequence import AthSequencer
-viewSeq = AthSequencer("AthViewSeq", Sequential=True, ModeOR=False, StopOverride=False)
-topSequence += viewSeq
-
-from L1Decoder.L1DecoderConfig import mapThresholdToL1RoICollection, mapThresholdToL1DecisionCollection
-roiCollectionName = mapThresholdToL1RoICollection("EM")
-
-# View maker alg
-viewNodeName = "allViewAlgorithms"
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
-from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
-
-inputMakerAlg = EventViewCreatorAlgorithm("viewMaker")
-inputMakerAlg.ViewFallThrough = True
-inputMakerAlg.RoIsLink = roiCollectionName
-inputMakerAlg.InViewRoIs = "EMViewRoIs"
-inputMakerAlg.Views = "testView"
-inputMakerAlg.RoITool = ViewCreatorInitialROITool()
-inputMakerAlg.InputMakerInputDecisions = [ mapThresholdToL1DecisionCollection("EM") ]
-inputMakerAlg.ViewNodeName = viewNodeName
-inputMakerAlg.InputMakerOutputDecisions = 'DUMMYOUTDEC'
-viewSeq += inputMakerAlg
-
-# Set of view algs
-allViewAlgorithms = AthSequencer(viewNodeName, Sequential=False, ModeOR=False, StopOverride=False)
-
-
-if TriggerFlags.doID:
-
- from TrigInDetConfig.InDetSetup import makeInDetAlgs
-
- viewAlgs = makeInDetAlgs("FS", rois= roiCollectionName)
-
- for viewAlg in viewAlgs:
- allViewAlgorithms += viewAlg
-
-
- #Adding vertexing
- from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
- # TODO need to change the name of the output vertex collection to something recordable
- # what is this actually testing ? why do we have FS tracks with egamma and aprimary vertex ???
- vtxAlgs = makeVertices( "bjet", "HLT_IDTrack_FS_FTF", "HLT_IDVertex_FS" )
- allViewAlgorithms += vtxAlgs
-
-
- from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking
- #Adding precision tracking
- PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "bjet", inputFTFtracks="TrigFastTrackFinder_Tracks_Bjet" )
-
- allViewAlgorithms += PTAlgs
-
- #Testing BeamSpotAlg in Run3 configuration
- prefixName = "InDetTrigMT"
- from TrigVertexFitter.TrigVertexFitterConf import TrigPrimaryVertexFitter
- primaryVertexFitter = TrigPrimaryVertexFitter( name = prefixName + "VertexFitter",
- zVariance=3.0,
- CreateTrackLists=True )
-
- #Can it be added to the service when we need to make it private?
- ToolSvc += primaryVertexFitter
-
- from TrigT2BeamSpot.T2VertexBeamSpotMonitoring import T2VertexBeamSpotAlgMonitoring, T2VertexBeamSpotToolMonitoring
- alg = T2VertexBeamSpotAlgMonitoring()
- toolMon = T2VertexBeamSpotToolMonitoring()
-
- from TrigT2BeamSpot.TrigT2BeamSpotConf import PESA__T2VertexBeamSpotTool
- InDetTrigMTBeamSpotTool = PESA__T2VertexBeamSpotTool( name = "TestBeamSpotTool",
- OutputLevel = INFO,
- MonTool = toolMon,
- nSplitVertices = 1, # Turn on (>1) or off vertex splitting
- ReclusterSplit = False, # Recluster split track collections before vertex fitting
- WeightClusterZ = True, # Use the track Z0 weighted cluster Z position as seed
-
- TotalNTrackMin = 4, # Minimum number of tracks required in an event
- TrackMinPt = 0.5, # Minimum track pT to be considered for vertexing
- TrackSeedPt = 0.7, # Minimum track pT to be considered for seeding a vertex fit
- TrackClusterDZ = 0.35, # Maximum distance between tracks considered as a cluster
- TrackMaxZ0 = 200.0, # Maximum track Z0 to be considered for vertexing
- TrackMaxD0 = 10.0, # Maximum track d0 to be considered for vertexing
- TrackMaxZ0err = 5.0, # Maximum track Z0 error to be considered for vertexing
- TrackMaxD0err = 5.0, # Maximum track d0 error to be considered for vertexing
- TrackMinNDF = 2.0, # Minimum track NDF to be considered for vertexing
- TrackMinQual = 0.0, # Minimum track chi^2/NDF to be considered for vertexing
- TrackMaxQual = 10.0, # Maximum track chi^2/NDF to be considered for vertexing
- TrackMinChi2Prob = -10.0, # Minimum track cumulative chi2 probability, from CLHEP/GenericFunctions/CumulativeChiSquare.hh
- TrackMinSiHits = 7, # Minimum # track silicon (PIX + SCT) hits to be considered for vertexing
- TrackMinPIXHits = 0, # Minimum # track silicon (PIX + SCT) hits to be considered for vertexing
- TrackMinSCTHits = 0, # Minimum # track silicon (PIX + SCT) hits to be considered for vertexing
- TrackMinTRTHits = -10, # Minimum # track TRT hits to be considered for vertexing
-
- VertexMinNTrk = 2, # Minimum # tracks in a cluster to be considered for vertexing
- VertexMaxNTrk = 100, # Maximum # tracks in a cluster to be considered for vertexing (saves on time!)
- VertexMaxXerr = 1., # Maximum resulting X error on vertex fit for "good" vertices
- VertexMaxYerr = 1., # Maximum resulting Y error on vertex fit for "good" vertices
- VertexMaxZerr = 10., # Maximum resulting Z error on vertex fit for "good" vertices
- VertexMinQual = 0.0, # Minimum resulting chi^2/NDF on vertex fit for "good" vertices
- VertexMaxQual = 100.0, # Maximum resulting chi^2/NDF on vertex fit for "good" vertices
- VertexMinChi2Prob = -10.0, # Minimum cumulative chi2 probability, from CLHEP/GenericFunctions/CumulativeChiSquare.hh
- VertexBCIDMinNTrk = 10, # Minimum # tracks in a vertex to be used for per-BCID monitoring
- PrimaryVertexFitter = primaryVertexFitter )
-
- ToolSvc += InDetTrigMTBeamSpotTool
-
-
-
-#Testing base default class
- from TrigT2BeamSpot.TrigT2BeamSpotConf import PESA__T2VertexBeamSpot
- InDetTrigMTBeamSpotAlg = PESA__T2VertexBeamSpot( name = "TestBeamSpotAlg",
- OutputLevel =INFO,
- MonTool = alg,
- vertexCollName = "TrigBeamSpotVertex", # Output vertex collection Name
- TrackCollections = [ PTTracks[-1] ], #For now using PT tracks as a test but FTF should be enough
- BeamSpotTool = InDetTrigMTBeamSpotTool )
-
-
-
- allViewAlgorithms += InDetTrigMTBeamSpotAlg
-
- from TrigT2MinBias.TrigT2MinBiasConf import MbtsFexMT
- alg=MbtsFexMT()
- allViewAlgorithms += alg
-
-
- if TriggerFlags.doCalo:
- from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_ReFastAlgo
- algo=T2CaloEgamma_ReFastAlgo("testFastAlgo")
- algo.RoIs="EMViewRoIs"
- allViewAlgorithms += algo
- viewSeq += allViewAlgorithms
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
deleted file mode 100755
index bd31c3e5778f151568a7e60bc0ffa90a70724197..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using IDCalo job options
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/IDCalo.py"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
deleted file mode 100755
index 1f5a29c977e585fbf04d5b0abd5d690866a37970..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using IDCalo job options with doCalo=False
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/IDCalo.py"
-export EXTRA="doCalo=False"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
deleted file mode 100755
index 989f8c1638a0e0b7c5fe1d6f9f2a85ac8e3322d6..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test on MC using IDCalo job options with doCalo=False
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export INPUT="ttbar"
-export JOBOPTION="TrigUpgradeTest/IDCalo.py"
-export EXTRA="doCalo=False"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh