diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ClassTraits.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ClassTraits.h
index 261d0e65bf1196fd50d9e8221cf8754d67a023f4..d4e7ccce55a1ed7062147b157ec2466e2fc6bcbc 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ClassTraits.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ClassTraits.h
@@ -90,8 +90,8 @@ namespace TrigDec {
     DECLARE_ATTACHED_CONTAINER(TrigPhoton, TrigPhotonContainer)
     DECLARE_ATTACHED_CONTAINER(TrigElectron, TrigElectronContainer)
     DECLARE_ATTACHED_CONTAINER(TrigL2Bjet, TrigL2BjetContainer)
-    DECLARE_ATTACHED_CONTAINER(CosmicMuon, CosmicMuonCollection)
-    DECLARE_ATTACHED_CONTAINER(MdtTrackSegment, MdtTrackSegmentCollection)
+    //DECLARE_ATTACHED_CONTAINER(CosmicMuon, CosmicMuonCollection)
+    //DECLARE_ATTACHED_CONTAINER(MdtTrackSegment, MdtTrackSegmentCollection)
     DECLARE_ATTACHED_CONTAINER(TrigL2Bphys, TrigL2BphysContainer)
     DECLARE_ATTACHED_CONTAINER(TrigInDetTrack, TrigInDetTrackCollection)
     DECLARE_ATTACHED_CONTAINER(TrigVertex, TrigVertexCollection)
diff --git a/Trigger/TrigAnalysis/TrigObjectMatching/TrigObjectMatching/TraitDefs.h b/Trigger/TrigAnalysis/TrigObjectMatching/TrigObjectMatching/TraitDefs.h
index fbf195ddb78043fd8a387ea54d18554bad4e5196..5090a948609b828e33bf4574fb7e62d99e00bec8 100644
--- a/Trigger/TrigAnalysis/TrigObjectMatching/TrigObjectMatching/TraitDefs.h
+++ b/Trigger/TrigAnalysis/TrigObjectMatching/TrigObjectMatching/TraitDefs.h
@@ -94,8 +94,8 @@ namespace TrigMatch {
     DECLARE_ATTACHED_CONTAINER(TrigPhoton, TrigPhotonContainer)
     DECLARE_ATTACHED_CONTAINER(TrigElectron, TrigElectronContainer)
     DECLARE_ATTACHED_CONTAINER(TrigL2Bjet, TrigL2BjetContainer)
-    DECLARE_ATTACHED_CONTAINER(CosmicMuon, CosmicMuonCollection)
-    DECLARE_ATTACHED_CONTAINER(MdtTrackSegment, MdtTrackSegmentCollection)
+    //DECLARE_ATTACHED_CONTAINER(CosmicMuon, CosmicMuonCollection)
+    //DECLARE_ATTACHED_CONTAINER(MdtTrackSegment, MdtTrackSegmentCollection)
     DECLARE_ATTACHED_CONTAINER(TrigL2Bphys, TrigL2BphysContainer)
     DECLARE_ATTACHED_CONTAINER(TrigInDetTrack, TrigInDetTrackCollection)
     DECLARE_ATTACHED_CONTAINER(TrigVertex, TrigVertexCollection)
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun2.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun2.py
index 40d8cdc8a1842a26ea6794903800b881a16b09b7..a9ffa3c31ecd840195173f2db7b8e2b8a4082300 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun2.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun2.py
@@ -1108,8 +1108,8 @@ TriggerL2EvolutionList = [
 #('TrigTauCluster#HLT_TrigT2CaloTau',                                    ), # xAOD equivalent not found
 #('TrigTauClusterDetails#HLT_TrigT2CaloTauDetails',                      ), # xAOD equivalent not found
 #('TrigTauTracksInfo#HLT',                                               ), # xAOD equivalent not found
-#('CosmicMuonCollection#HLT_CosmicMuons',                                ), # xAOD equivalent not found
-#('MdtTrackSegmentCollection#HLT_MDTsegments',                           ), # xAOD equivalent not found
+#('CosmicMuonCollection#HLT_CosmicMuons',                                ), # xAOD equivalent not found, class removed from r22
+#('MdtTrackSegmentCollection#HLT_MDTsegments',                           ), # xAOD equivalent not found, class removed from r22
 ('TrigRNNOutput#HLT_TrigTRTHTCounts',                                    'xAOD::TrigRNNOutput#HLT_TrigTRTHTCounts'), # check converting tool
 #('TrigL2BphysContainer#HLT',                                            ), # xAOD equivalent not found
 ('TrigL2BphysContainer#HLT_L2BMuMuFex',                                  'xAOD::TrigBphysContainer#HLT_L2BMuMuFex'),
@@ -1307,9 +1307,9 @@ EDMDetails[ "TrigT2MbtsBits" ]            = {'persistent':"TrigT2MbtsBitsContain
 EDMDetails[ "TrigSpacePointCounts" ]      = {'persistent':"TrigSpacePointCountsCollection_p4",  'typealias':'AOD', 'collection':'TrigSpacePointCountsCollection'}
 #EDMDetails[ "TrigTrtHitCounts" ]          = {'persistent':"TrigTrtHitCountsCollection_tlp1",      'typealias':'', 'collection':'TrigTrtHitCountsCollection'}
 EDMDetails[ "TrigTrtHitCounts" ]          = {'persistent':"TrigTrtHitCountsCollection_p2",      'typealias':'AOD', 'collection':'TrigTrtHitCountsCollection'}
-EDMDetails[ "CosmicMuonCollection" ]      = {'persistent':"CosmicMuonCollection_tlp1",            'typealias':'', 'collection': 'CosmicMuonCollection'}
+#EDMDetails[ "CosmicMuonCollection" ]      = {'persistent':"CosmicMuonCollection_tlp1",            'typealias':'', 'collection': 'CosmicMuonCollection'}
 #EDMDetails[ "MdtTrackSegmentCollection" ] = {'persistent':"MdtTrackSegmentCollection_tlp1",       'typealias':'', 'collection': 'MdtTrackSegmentCollection'}
-EDMDetails[ "MdtTrackSegmentCollection" ] = {'persistent':"MdtTrackSegmentCollection_p2",         'typealias':'', 'collection': 'MdtTrackSegmentCollection'}
+#EDMDetails[ "MdtTrackSegmentCollection" ] = {'persistent':"MdtTrackSegmentCollection_p2",         'typealias':'', 'collection': 'MdtTrackSegmentCollection'}
 EDMDetails[ "TrigVertexCollection" ]      = {'persistent':"TrigVertexCollection_tlp1",            'typealias':'AOD'}
 EDMDetails[ "TrigL2BphysContainer" ]      = {'persistent':"TrigL2BphysContainer_tlp1",            'typealias':'L2Bphys', 'collection':'TrigL2BphysContainer'}
 EDMDetails[ "TrigEFBphysContainer" ]      = {'persistent':"TrigEFBphysContainer_tlp1",            'typealias':'AOD', 'collection':'TrigEFBphysContainer'}