diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_14.5.0_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_14.5.0_test.py
index 371f95d28afb221e25837f35c015eb354d84100d..4af6a820a431a283f30928ded0ed940ffd876ee8 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_14.5.0_test.py
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_14.5.0_test.py
@@ -1,10 +1,3 @@
-# Needed to work around some cling bugs seen in root 6.20.02.
-# Spurious error message like
-#  fatal error: cannot open file 'input_line_538': No such file or directory
-import ROOT
-getattr(ROOT,'SG::BaseInfo<DataVector<Trk::Track> >')
-getattr(ROOT,'ElementLink<Muon::MuonPrepDataContainer<Muon::MuonPrepDataCollection<Muon::MdtPrepData> >')
-
 infile = 'aod/AOD-14.5.0/AOD-14.5.0-full.pool.root'
 keys = [
     #Trk::VxContainer_tlp1
@@ -26,4 +19,3 @@ keys = [
          ]
 
 include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_15.6.7_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_15.6.7_test.py
index aaaadd6343cce04e01663b8e09f59d8e560f8451..d5812c136f5ed5718dac7ffe81dcf4fd4d600e22 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_15.6.7_test.py
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_15.6.7_test.py
@@ -1,10 +1,3 @@
-# Needed to work around some cling bugs seen in root 6.20.02.
-# Spurious error message like
-#  fatal error: cannot open file 'input_line_538': No such file or directory
-import ROOT
-getattr(ROOT,'SG::BaseInfo<DataVector<Trk::Track> >')
-getattr(ROOT,'ElementLink<Muon::MuonPrepDataContainer<Muon::MuonPrepDataCollection<Muon::MdtPrepData> >')
-
 infile = 'aod/AOD-15.6.7/AOD-15.6.7-full.pool.root'
 keys = [
     #MVFVxContainer_tlp1
@@ -33,4 +26,3 @@ keys = [
          ]
 
 include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_16.6.2.1_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_16.6.2.1_test.py
index a8a63fe2527881e2f5d23bb5d554dc514c9fb685..a3b58c7f67ce849c18184ce82585d40d97f6b572 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_16.6.2.1_test.py
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_16.6.2.1_test.py
@@ -1,10 +1,3 @@
-# Needed to work around some cling bugs seen in root 6.20.02.
-# Spurious error message like
-#  fatal error: cannot open file 'input_line_538': No such file or directory
-import ROOT
-getattr(ROOT,'SG::BaseInfo<DataVector<Trk::Track> >')
-getattr(ROOT,'ElementLink<Muon::MuonPrepDataContainer<Muon::MuonPrepDataCollection<Muon::MdtPrepData> >')
-
 infile = 'aod/AOD-16.6.2.1/AOD-16.6.2.1-full.pool.root'
 keys = [
     #MVFVxContainer_tlp1
@@ -32,4 +25,3 @@ keys = [
          ]
 
 include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_17.2.8_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_17.2.8_test.py
index 4757770cef28a1a2ed81c37d0eace3a472822930..c5201e707bea07daea4df1473bb91d45e1a769f6 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_17.2.8_test.py
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_17.2.8_test.py
@@ -1,10 +1,3 @@
-# Needed to work around some cling bugs seen in root 6.20.02.
-# Spurious error message like
-#  fatal error: cannot open file 'input_line_538': No such file or directory
-import ROOT
-getattr(ROOT,'SG::BaseInfo<DataVector<Trk::Track> >')
-getattr(ROOT,'ElementLink<Muon::MuonPrepDataContainer<Muon::MuonPrepDataCollection<Muon::MdtPrepData> >')
-
 infile = 'aod/AOD-17.2.8/AOD-17.2.8-full.pool.root'
 keys = [
     #Trk::VxContainer_tlp2
@@ -28,4 +21,3 @@ keys = [
          ]
 
 include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
index 5010d0ddad1cbaabd26465dc247687177cd408d0..20898f1e0e3b28a76201cd01b43b609eb46ab36f 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
@@ -1,10 +1,3 @@
-# Needed to work around some cling bugs seen in root 6.20.02.
-# Spurious error message like
-#  fatal error: cannot open file 'input_line_538': No such file or directory
-import ROOT
-getattr(ROOT,'SG::BaseInfo<DataVector<Trk::Track> >')
-getattr(ROOT,'ElementLink<Muon::MuonPrepDataContainer<Muon::MuonPrepDataCollection<Muon::MdtPrepData> >')
-
 infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
 keys = [
     #Trk::VxContainer_tlp2