diff --git a/Event/xAOD/xAODEgammaCnv/CMakeLists.txt b/Event/xAOD/xAODEgammaCnv/CMakeLists.txt
index 4f240116163a5f96c6001e8f7fb386db744e1360..ac2d551a5e057a663fdfc42e7a7519c7ded35946 100644
--- a/Event/xAOD/xAODEgammaCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODEgammaCnv/CMakeLists.txt
@@ -16,6 +16,6 @@ atlas_add_component( xAODEgammaCnv
                      LINK_LIBRARIES AthContainers AthenaBaseComps AthenaKernel FourMom GaudiKernel Particle ParticleEvent egammaEvent xAODEgamma xAODTracking xAODTruth )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Event/xAOD/xAODEgammaCnv/python/xAODEgammaCnvFactories.py b/Event/xAOD/xAODEgammaCnv/python/xAODEgammaCnvFactories.py
index d64395e77288d8444376343d878cb5d94b180ea0..c29631d94cae2e43eeac10e8537be47cedbb176c 100644
--- a/Event/xAOD/xAODEgammaCnv/python/xAODEgammaCnvFactories.py
+++ b/Event/xAOD/xAODEgammaCnv/python/xAODEgammaCnvFactories.py
@@ -1,11 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import *
-from AthenaCommon.Constants import *
-import traceback
-
-from AthenaCommon.AppMgr import ToolSvc
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/Event/xAOD/xAODForwardCnv/CMakeLists.txt b/Event/xAOD/xAODForwardCnv/CMakeLists.txt
index 1fe8dff71a3adb85f4ce985fd778546cbf0aad78..a62cf0e569611a0e6511dce18ddf9442cca49266 100644
--- a/Event/xAOD/xAODForwardCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODForwardCnv/CMakeLists.txt
@@ -16,6 +16,6 @@ atlas_add_component( xAODForwardCnv
                      LINK_LIBRARIES xAODForward GaudiKernel TileEvent TileIdentifier AthenaBaseComps AthenaKernel xAODForwardCnvLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Event/xAOD/xAODForwardCnv/python/xAODForwardEventInfoCreator.py b/Event/xAOD/xAODForwardCnv/python/xAODForwardEventInfoCreator.py
index 03063209c07afde1fc40b50ac8953caefc8e6904..3120f0e3895830980b21b31eeb275fca8b9c4893 100644
--- a/Event/xAOD/xAODForwardCnv/python/xAODForwardEventInfoCreator.py
+++ b/Event/xAOD/xAODForwardCnv/python/xAODForwardEventInfoCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODForwardEventInfoCreator.py 578517 2014-01-15 13:48:04Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODForwardCnv.xAODForwardCnvConf import *
+from xAODForwardCnv.xAODForwardCnvConf import xAODMaker__ForwardEventInfoCnvAlg
 
 ## Helper function for creating xAOD ForwardEventInfo objects
 def xAODForwardEventInfoCreator( sequence = None, stream = None,
@@ -22,7 +20,6 @@ def xAODForwardEventInfoCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODForwardEventInfoCreator" )
 
@@ -30,13 +27,13 @@ def xAODForwardEventInfoCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::ForwardEventInfo from MBTSCollisionTime" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODForwardEventInfoCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::MBTSForwardEventInfo_v1#%s" % key )
     stream.AddItem( "xAOD::MBTSForwardEventInfoAuxInfo_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODForwardCnv/python/xAODMBTSModuleCreator.py b/Event/xAOD/xAODForwardCnv/python/xAODMBTSModuleCreator.py
index 33519929eaf871f513cc89964c924ec85cf489e3..d56e9492510bab719d3e3af67f54bc136ca1994d 100644
--- a/Event/xAOD/xAODForwardCnv/python/xAODMBTSModuleCreator.py
+++ b/Event/xAOD/xAODForwardCnv/python/xAODMBTSModuleCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODMBTSModuleCreator.py 578517 2014-01-15 13:48:04Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODForwardCnv.xAODForwardCnvConf import *
+from xAODForwardCnv.xAODForwardCnvConf import xAODMaker__MBTSModuleCnvAlg
 
 ## Helper function for creating xAOD MBTSModule objects
 def xAODMBTSModuleCreator( sequence = None, stream = None,
@@ -22,7 +20,6 @@ def xAODMBTSModuleCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODMBTSModuleCreator" )
 
@@ -30,13 +27,13 @@ def xAODMBTSModuleCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::MBTSModule from TrigDec::MBTSModule" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODMBTSModuleCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::MBTSModule_v1#%s" % key )
     stream.AddItem( "xAOD::MBTSModuleAuxInfo_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTauCnv/CMakeLists.txt b/Event/xAOD/xAODTauCnv/CMakeLists.txt
index 370af6d8d802f48af3e99b5a539dc6ec8ff00c9e..fa0f04ca4ef38044e886f224c15745729e06926f 100644
--- a/Event/xAOD/xAODTauCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTauCnv/CMakeLists.txt
@@ -16,6 +16,6 @@ atlas_add_component( xAODTauCnv
                      LINK_LIBRARIES xAODTauCnvLib xAODTau tauEvent AthenaBaseComps AthenaKernel GaudiKernel )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Event/xAOD/xAODTauCnv/python/xAODTauConverter.py b/Event/xAOD/xAODTauCnv/python/xAODTauConverter.py
index 0d47a08a72a2ba37c6a85301e9a49e5ddf3462c3..b888da45472f512b8bf691f10b84c50c69f3aa66 100644
--- a/Event/xAOD/xAODTauCnv/python/xAODTauConverter.py
+++ b/Event/xAOD/xAODTauCnv/python/xAODTauConverter.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTauConverter.py 579184 2014-01-20 13:25:06Z janus $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTauCnv.xAODTauCnvConf import *
+from xAODTauCnv.xAODTauCnvConf import xAODMaker__TauJetCnvAlg
 
 ## Helper function for creating xAOD RoI objects/containers
 def xAODTauConverter( sequence = None, stream = None, key = "TauRecContainer" ):
@@ -21,7 +19,6 @@ def xAODTauConverter( sequence = None, stream = None, key = "TauRecContainer" ):
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTauConverter" )
 
@@ -29,13 +26,13 @@ def xAODTauConverter( sequence = None, stream = None, key = "TauRecContainer" ):
     logger.info( "Creating xAOD TauJets from AOD objects" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         try:
             stream = MSMgr.GetStream( "StreamAOD" )
@@ -46,17 +43,13 @@ def xAODTauConverter( sequence = None, stream = None, key = "TauRecContainer" ):
 
     # Add the tau converter algorithm:
     outkey = "TauRecContainer"
-    from xAODTauCnv.xAODTauCnvConf import xAODMaker__TauJetCnvAlg
     tauAlg = xAODMaker__TauJetCnvAlg()
     #tauAlg.OutputLevel = VERBOSE
     tauAlg.OutputLevel = 1
     sequence += tauAlg
     # Add the tau objects to the output:
-    if stream != None:
+    if stream is not None:
         stream.AddItem( "xAOD::TauJetContainer_v1#%s" % outkey )
         stream.AddItem( "xAOD::TauJetAuxContainer_v1#%sAux." % outkey )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt b/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
index 40221bee08af176568ea7ebe10f716fb93306f84..7022ee13570477bafddd9d06e1d6846e3e0ccd1f 100644
--- a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
@@ -16,6 +16,6 @@ atlas_add_component( xAODTrigCaloCnv
                      LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigCaloEvent xAODTrigCaloCnvLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Event/xAOD/xAODTrigCaloCnv/python/xAODTrigCaloClusterCreator.py b/Event/xAOD/xAODTrigCaloCnv/python/xAODTrigCaloClusterCreator.py
index 167730f5c7d08bfced77b63927ac1311d920d109..06800bebb439b7bdb872e9a3fa1120f49fedd8b1 100644
--- a/Event/xAOD/xAODTrigCaloCnv/python/xAODTrigCaloClusterCreator.py
+++ b/Event/xAOD/xAODTrigCaloCnv/python/xAODTrigCaloClusterCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigCaloClusterCreator.py 592334 2014-04-10 11:01:56Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTrigCaloCnv.xAODTrigCaloCnvConf import *
+from xAODTrigCaloCnv.xAODTrigCaloCnvConf import xAODMaker__TrigCaloClusterCnvAlg
 
 ## Helper function for creating xAOD TrigCaloCluster objects
 def xAODTrigCaloClusterCreator( sequence = None, stream = None,
@@ -22,7 +20,6 @@ def xAODTrigCaloClusterCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigCaloClusterCreator" )
 
@@ -30,13 +27,13 @@ def xAODTrigCaloClusterCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::TrigCaloClusterContainer from TrigCaloClusterContainer" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODTrigCaloClusterCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::TrigCaloClusterContainer_v1#%s" % key )
     stream.AddItem( "xAOD::TrigCaloClusterAuxContainer_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigCaloCnv/python/xAODTrigEMClusterCreator.py b/Event/xAOD/xAODTrigCaloCnv/python/xAODTrigEMClusterCreator.py
index 87455343c51e5643a8d04a40880822984820dad5..2939c44c3e6f6b5bb5414d3b8cbe7bb963a5b9e8 100644
--- a/Event/xAOD/xAODTrigCaloCnv/python/xAODTrigEMClusterCreator.py
+++ b/Event/xAOD/xAODTrigCaloCnv/python/xAODTrigEMClusterCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigEMClusterCreator.py 592334 2014-04-10 11:01:56Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTrigCaloCnv.xAODTrigCaloCnvConf import *
+from xAODTrigCaloCnv.xAODTrigCaloCnvConf import xAODMaker__TrigEMClusterCnvAlg
 
 ## Helper function for creating xAOD TrigEMCluster objects
 def xAODTrigEMClusterCreator( sequence = None, stream = None,
@@ -22,7 +20,6 @@ def xAODTrigEMClusterCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigEMClusterCreator" )
 
@@ -30,13 +27,13 @@ def xAODTrigEMClusterCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::TrigEMClusterContainer from TrigEMClusterContainer" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODTrigEMClusterCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::TrigEMClusterContainer_v1#%s" % key )
     stream.AddItem( "xAOD::TrigEMClusterAuxContainer_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt b/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt
index 10a5ded9a648415f0eae2afeed44bdb9080b9d97..b103636f63d29b9e264d99fb6ffe03a80e03b495 100644
--- a/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt
@@ -16,6 +16,6 @@ atlas_add_component( xAODTrigL1CaloCnv
                      LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigT1CaloEventLib xAODTrigL1CaloCnvLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Event/xAOD/xAODTrigL1CaloCnv/python/xAODTrigL1CaloCreator.py b/Event/xAOD/xAODTrigL1CaloCnv/python/xAODTrigL1CaloCreator.py
index 849e281d02a89c32bc44c97f88c66bcf99f05c75..e7a30c89541e6e052925528d15856a768d2d3bf4 100644
--- a/Event/xAOD/xAODTrigL1CaloCnv/python/xAODTrigL1CaloCreator.py
+++ b/Event/xAOD/xAODTrigL1CaloCnv/python/xAODTrigL1CaloCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigL1CaloCreator.py 576327 2013-12-19 16:08:56Z morrisj $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTrigL1CaloCnv.xAODTrigL1CaloCnvConf import *
+import xAODTrigL1CaloCnv.xAODTrigL1CaloCnvConf as conf
 
 ## Helper function for creating xAODTrigL1Calo objects/containers
 def xAODTrigL1CaloCreator( sequence = None, stream = None ):
@@ -19,7 +17,6 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigL1CaloCreator" )
 
@@ -27,13 +24,13 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     logger.info( "Creating xAOD L1Calo objects from ESD L1Calo objects" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamXAOD" )
         pass
@@ -41,7 +38,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     ### CMM Section    
     # Add the CMMCPHits converter algorithm:
     SGkey = "CMMCPHits"
-    alg = xAODMaker__CMMCPHitsCnvAlg()
+    alg = conf.xAODMaker__CMMCPHitsCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -51,7 +48,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the CMMEtSums converter algorithm:
     SGkey = "CMMEtSums"
-    alg = xAODMaker__CMMEtSumsCnvAlg()
+    alg = conf.xAODMaker__CMMEtSumsCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -61,7 +58,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the CMMJetHits converter algorithm:
     SGkey = "CMMJetHits"
-    alg = xAODMaker__CMMJetHitsCnvAlg()
+    alg = conf.xAODMaker__CMMJetHitsCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -71,7 +68,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the CMMRoIs converter algorithm:
     SGkey = "CMMRoIs"
-    alg = xAODMaker__CMMRoICnvAlg()
+    alg = conf.xAODMaker__CMMRoICnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -83,7 +80,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     ### CPM Section    
     # Add the CPMHits converter algorithm:
     SGkey = "CPMHits"
-    alg = xAODMaker__CPMHitsCnvAlg()
+    alg = conf.xAODMaker__CPMHitsCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -93,7 +90,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the CPMTower converter algorithm:
     SGkey = "CPMTowers"
-    alg = xAODMaker__CPMTowerCnvAlg()
+    alg = conf.xAODMaker__CPMTowerCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -103,7 +100,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the CPMRoI converter algorithm:
     SGkey = "CPMRoIs"
-    alg = xAODMaker__CPMRoICnvAlg()
+    alg = conf.xAODMaker__CPMRoICnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -115,7 +112,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     ### JEM Section    
     # Add the JEMHits converter algorithm:
     SGkey = "JEMHits"
-    alg = xAODMaker__JEMHitsCnvAlg()
+    alg = conf.xAODMaker__JEMHitsCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -125,7 +122,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the JEMEtSums converter algorithm:
     SGkey = "JEMEtSums"
-    alg = xAODMaker__JEMEtSumsCnvAlg()
+    alg = conf.xAODMaker__JEMEtSumsCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -135,7 +132,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the JEMRoI converter algorithm:
     SGkey = "JEMRoIs"
-    alg = xAODMaker__JEMRoICnvAlg()
+    alg = conf.xAODMaker__JEMRoICnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -148,7 +145,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the JetElement converter algorithm:
     SGkey = "JetElements"
-    alg = xAODMaker__JetElementCnvAlg()
+    alg = conf.xAODMaker__JetElementCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -158,7 +155,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the RODHeaders converter algorithm:
     SGkey = "RODHeaders"
-    alg = xAODMaker__RODHeaderCnvAlg()
+    alg = conf.xAODMaker__RODHeaderCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -168,7 +165,7 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     
     # Add the TriggerTower converter algorithm:
     SGkey = "TriggerTowers"
-    alg = xAODMaker__TriggerTowerCnvAlg()
+    alg = conf.xAODMaker__TriggerTowerCnvAlg()
     alg.ESDKey = SGkey
     alg.xAODKey = SGkey
     sequence += alg
@@ -176,7 +173,4 @@ def xAODTrigL1CaloCreator( sequence = None, stream = None ):
     stream.AddItem( "xAOD::TriggerTowerContainer_v1#%s" % SGkey )
     stream.AddItem( "xAOD::TriggerTowerAuxContainer_v1#%sAux." % SGkey )  
     
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
index 1c68a2ad46ed51ca83109e60dbae69958fa544ec..27a92ddd793a61da710fd74c5e33a93ee002f78c 100644
--- a/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
@@ -16,6 +16,6 @@ atlas_add_component( xAODTrigMinBiasCnv
                      LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigCaloEvent TrigInDetEvent xAODTrigMinBiasCnvLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigHist2DCreator.py b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigHist2DCreator.py
index 7aea93d3fd0e847e6fdae4c37140e93e132ad3da..5bf32852a878d7351ec8b365ad5e275e141ac92c 100644
--- a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigHist2DCreator.py
+++ b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigHist2DCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigT2MbtsBitsCreator.py 600496 2014-06-05 15:45:08Z azemla $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import *
+from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import xAODMaker__TrigT2MbtsBitsCnvAlg
 
 ## Helper function for creating xAOD TrigSpacePointCounts objects
 def xAODTrigT2MbtsBitsCreator( sequence = None, stream = None,
@@ -22,7 +20,6 @@ def xAODTrigT2MbtsBitsCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigT2MbtsBitsCreator" )
 
@@ -30,13 +27,13 @@ def xAODTrigT2MbtsBitsCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::TrigT2MbtsBits from TrigDec::TrigT2MbtsBits" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODTrigT2MbtsBitsCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::TrigT2MbtsBits_v1#%s" % key )
     stream.AddItem( "xAOD::TrigT2MbtsBitsAuxContainer_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigSpacePointCountsCreator.py b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigSpacePointCountsCreator.py
index a133676bd2896e45b153cbd3e73c288247368b32..a2b3474e04d1bef3d7cf671d36f3f44369f2cdca 100644
--- a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigSpacePointCountsCreator.py
+++ b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigSpacePointCountsCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigSpacePointCountsCreator.py 578517 2014-01-15 13:48:04Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import *
+from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import xAODMaker__TrigSpacePointCountsCnvAlg
 
 ## Helper function for creating xAOD TrigSpacePointCounts objects
 def xAODTrigSpacePointCountsCreator( sequence = None, stream = None,
@@ -22,7 +20,6 @@ def xAODTrigSpacePointCountsCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigSpacePointCountsCreator" )
 
@@ -30,13 +27,13 @@ def xAODTrigSpacePointCountsCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::TrigSpacePointCounts from TrigDec::TrigSpacePointCounts" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODTrigSpacePointCountsCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::TrigSpacePointCountsContainer_v1#%s" % key )
     stream.AddItem( "xAOD::TrigSpacePointCountsAuxContainer_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigT2MbtsBitsCreator.py b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigT2MbtsBitsCreator.py
index 5c0402a281c9e480109b5430670469dcce378076..a5d47b5bb54e2fc0489a39a1ca1294fdf94e078c 100644
--- a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigT2MbtsBitsCreator.py
+++ b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigT2MbtsBitsCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigT2MbtsBitsCreator.py 608462 2014-07-24 16:15:08Z azemla $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import *
+from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import xAODMaker__TrigT2MbtsBitsCnvAlg
 
 ## Helper function for creating xAOD TrigSpacePointCounts objects
 def xAODTrigT2MbtsBitsCreator( sequence = None, stream = None,
@@ -22,7 +20,6 @@ def xAODTrigT2MbtsBitsCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigT2MbtsBitsCreator" )
 
@@ -30,13 +27,13 @@ def xAODTrigT2MbtsBitsCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::TrigT2MbtsBits from TrigDec::TrigT2MbtsBits" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODTrigT2MbtsBitsCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::TrigT2MbtsBitsContainer_v1#%s" % key )
     stream.AddItem( "xAOD::TrigT2MbtsBitsAuxContainer_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigTrackCountsCreator.py b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigTrackCountsCreator.py
index 555df801440160786dab39ceceecdd76e2601cf2..249ccaf9f93ae87ac6b806432a05b355ace8ad67 100755
--- a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigTrackCountsCreator.py
+++ b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigTrackCountsCreator.py
@@ -1,13 +1,11 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigTrackCountsCreator.py 600496 2014-06-05 15:45:08Z azemla $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import *
+from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import xAODMaker__TrigTrackCountsCnvAlg
 
 ## Helper function for creating xAOD TrigSpacePointCounts objects
 def xAODTrigTrackCountsCreator( sequence = None, stream = None,
-                             key = "HLT_trackcounts" ):
+                                key = "HLT_trackcounts" ):
     """
     Helper function that schedules all the components that create xAOD
     TrigSpacePointCounts objects out of existing AOD objects.
@@ -22,7 +20,6 @@ def xAODTrigTrackCountsCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigTrackCountsCreator" )
 
@@ -30,13 +27,13 @@ def xAODTrigTrackCountsCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::TrigTrackCounts from TrigDec::TrigTrackCounts" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODTrigTrackCountsCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::TrigTrackCountsContainer_v1#%s" % key )
     stream.AddItem( "xAOD::TrigTrackCountsAuxContainer_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigVertexCountsCreator.py b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigVertexCountsCreator.py
index 830b8c437b3ee5c4142de420adcdd82dff8c108b..4156c157ed35209ee31262639dda7865c4922523 100755
--- a/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigVertexCountsCreator.py
+++ b/Event/xAOD/xAODTrigMinBiasCnv/python/xAODTrigVertexCountsCreator.py
@@ -1,13 +1,11 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigVertexCountsCreator.py 600496 2014-06-05 15:45:08Z azemla $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import *
+from xAODTrigMinBiasCnv.xAODTrigMinBiasCnvConf import xAODMaker__TrigVertexCountsCnvAlg
 
 ## Helper function for creating xAOD TrigSpacePointCounts objects
 def xAODTrigVertexCountsCreator( sequence = None, stream = None,
-                             key = "HLT_vertexcounts" ):
+                                 key = "HLT_vertexcounts" ):
     """
     Helper function that schedules all the components that create xAOD
     TrigSpacePointCounts objects out of existing AOD objects.
@@ -22,7 +20,6 @@ def xAODTrigVertexCountsCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigVertexCountsCreator" )
 
@@ -30,13 +27,13 @@ def xAODTrigVertexCountsCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::TrigVertexCounts from TrigDec::TrigVertexCounts" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODTrigVertexCountsCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::TrigVertexCountsContainer_v1#%s" % key )
     stream.AddItem( "xAOD::TrigVertexCountsAuxContainer_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
index d2ec3e0748cb6c35f728becf62006bcf0361f587..d0ddf4145a5bc90321c2c0b7bf9538e319967e84 100644
--- a/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
@@ -16,6 +16,6 @@ atlas_add_component( xAODTrigMissingETCnv
                      LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigMissingEtEvent xAODTrigMissingETCnvLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Event/xAOD/xAODTrigMissingETCnv/python/xAODTrigMissingETCreator.py b/Event/xAOD/xAODTrigMissingETCnv/python/xAODTrigMissingETCreator.py
index e93c7d185c6e24842c342a02866b089beddd77cc..5b58104735bb085917136b09f1c00021821bfc8b 100644
--- a/Event/xAOD/xAODTrigMissingETCnv/python/xAODTrigMissingETCreator.py
+++ b/Event/xAOD/xAODTrigMissingETCnv/python/xAODTrigMissingETCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigMissingETCreator.py 592539 2014-04-11 10:17:29Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTrigMissingETCnv.xAODTrigMissingETCnvConf import *
+from xAODTrigMissingETCnv.xAODTrigMissingETCnvConf import xAODMaker__TrigMissingETCnvAlg
 
 ## Helper function for creating xAOD TrigMissingET objects
 def xAODTrigMissingETCreator( sequence = None, stream = None,
@@ -22,7 +20,6 @@ def xAODTrigMissingETCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigMissingETCreator" )
 
@@ -30,13 +27,13 @@ def xAODTrigMissingETCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::TrigMissingET from TrigDec::TrigMissingET" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODTrigMissingETCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::TrigMissingETContainer_v1#%s" % key )
     stream.AddItem( "xAOD::TrigMissingETAuxContainer_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
index b9a603df5ea5d7a5bc07433b7541891498db23d5..955bc32224e9a0de4d8f16d2c12d8d95f86dbf04 100644
--- a/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
@@ -16,6 +16,6 @@ atlas_add_component( xAODTrigMuonCnv
                      LINK_LIBRARIES AthLinks AthenaBaseComps AthenaKernel FourMomUtils TrigMuonEvent xAODTrigMuonCnvLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/xAODTrigMuonCnvConfig.py python/xAODTrigMuonCnvConfigDb.py )
+atlas_install_python_modules( python/xAODTrigMuonCnvConfig.py python/xAODTrigMuonCnvConfigDb.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/addEFMuonxAODCnv_jobOptions.py share/runEFMuonAODCnvAlg_topOptions.py )
 
diff --git a/Event/xAOD/xAODTrigMuonCnv/python/xAODTrigMuonCnvConfig.py b/Event/xAOD/xAODTrigMuonCnv/python/xAODTrigMuonCnvConfig.py
index 2633c7fba3986833776ca3dd9b4229a5acc45bb2..7566f71d21a28cdf219d32bb3d0a5611a7e5fa70 100644
--- a/Event/xAOD/xAODTrigMuonCnv/python/xAODTrigMuonCnvConfig.py
+++ b/Event/xAOD/xAODTrigMuonCnv/python/xAODTrigMuonCnvConfig.py
@@ -1,8 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-from xAODTrigMuonCnv.xAODTrigMuonCnvConf import TrigMuonEFInfoToMuonCnvTool, TrigMuonEFInfoCnvTestAlg, xAODMaker__TrigMuonEFInfoToMuonCnvAlg, MuonFeatureCnvTool, MuonFeatureCnvTestAlg, xAODMaker__MuonFeatureCnvAlg
-
-from AthenaCommon import CfgMgr
+from xAODTrigMuonCnv.xAODTrigMuonCnvConf import TrigMuonEFInfoToMuonCnvTool, TrigMuonEFInfoCnvTestAlg, xAODMaker__TrigMuonEFInfoToMuonCnvAlg, MuonFeatureCnvTestAlg, xAODMaker__MuonFeatureCnvAlg
 
 # Version of the converter tool that does not
 # make links to xAOD ID tracks (needed until EF ID is converted)
diff --git a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt b/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
index 0f63e9c71a9c0e01d936f9af8430efab84100869..9551fc79b5ab00012e6d4b8bb0f98cf73d072794 100644
--- a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
@@ -65,5 +65,5 @@ else()
 endif()
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
diff --git a/Event/xAOD/xAODTriggerCnv/python/xAODBunchConfCreator.py b/Event/xAOD/xAODTriggerCnv/python/xAODBunchConfCreator.py
index 88f23153fe6ec94b8296fbf6a777f891bf093b2a..7f64b069ddf13a4d725d3f8ade68063aad0d4c95 100644
--- a/Event/xAOD/xAODTriggerCnv/python/xAODBunchConfCreator.py
+++ b/Event/xAOD/xAODTriggerCnv/python/xAODBunchConfCreator.py
@@ -1,11 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODBunchConfCreator.py 583381 2014-02-14 15:58:20Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the needed configurables:
 from xAODTriggerCnv.xAODTriggerCnvConf import xAODMaker__BunchConfCnvAlg
-from TrigBunchCrossingTool.BunchCrossingConfProvider import \
-    BunchCrossingConfProvider
+from TrigBunchCrossingTool.BunchCrossingConfProvider import BunchCrossingConfProvider
 
 ## Helper function for creating xAOD bunch configuration metadata
 def xAODBunchConfCreator( sequence = None, stream = None, source = "" ):
@@ -23,7 +20,6 @@ def xAODBunchConfCreator( sequence = None, stream = None, source = "" ):
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODBunchConfCreator" )
 
@@ -31,13 +27,13 @@ def xAODBunchConfCreator( sequence = None, stream = None, source = "" ):
     logger.info( "Creating xAOD bunch configuration metadata" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -53,7 +49,4 @@ def xAODBunchConfCreator( sequence = None, stream = None, source = "" ):
     stream.AddMetaDataItem(
         "xAOD::BunchConfAuxContainer_v1#BunchConfigurationAux." )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTriggerCnv/python/xAODRoICreator.py b/Event/xAOD/xAODTriggerCnv/python/xAODRoICreator.py
index ad1c78a1fc6750d83221730fed954cdad6eec9ce..88b1f749258a6078bdd209fb4281e1f47d662706 100644
--- a/Event/xAOD/xAODTriggerCnv/python/xAODRoICreator.py
+++ b/Event/xAOD/xAODTriggerCnv/python/xAODRoICreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODRoICreator.py 578784 2014-01-16 16:56:39Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTriggerCnv.xAODTriggerCnvConf import *
+import xAODTriggerCnv.xAODTriggerCnvConf as conf
 
 ## Helper function for creating xAOD RoI objects/containers
 def xAODRoICreator( sequence = None, stream = None, key = "LVL1_ROI" ):
@@ -21,7 +19,6 @@ def xAODRoICreator( sequence = None, stream = None, key = "LVL1_ROI" ):
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODRoICreator" )
 
@@ -29,13 +26,13 @@ def xAODRoICreator( sequence = None, stream = None, key = "LVL1_ROI" ):
     logger.info( "Creating xAOD LVL1 RoIs from AOD objects" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary (and possible):
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         try:
             stream = MSMgr.GetStream( "StreamAOD" )
@@ -46,65 +43,62 @@ def xAODRoICreator( sequence = None, stream = None, key = "LVL1_ROI" ):
 
     # Add the muon RoI converter algorithm:
     outkey = "LVL1MuonRoIs"
-    alg = xAODMaker__MuonRoICnvAlg()
+    alg = conf.xAODMaker__MuonRoICnvAlg()
     alg.AODKey = key
     alg.xAODKey = outkey
     sequence += alg
     # Add the muon RoI objects to the output:
-    if stream != None:
+    if stream is not None:
         stream.AddItem( "xAOD::MuonRoIContainer_v1#%s" % outkey )
         stream.AddItem( "xAOD::MuonRoIAuxContainer_v1#%sAux." % outkey )
         pass
 
     # Add the jet RoI converter algorithm:
     outkey = "LVL1JetRoIs"
-    alg = xAODMaker__JetRoICnvAlg()
+    alg = conf.xAODMaker__JetRoICnvAlg()
     alg.AODKey = key
     alg.xAODKey = outkey
     sequence += alg
     # Add the jet RoI objects to the output:
-    if stream != None:
+    if stream is not None:
         stream.AddItem( "xAOD::JetRoIContainer_v1#%s" % outkey )
         stream.AddItem( "xAOD::JetRoIAuxContainer_v1#%sAux." % outkey )
         pass
 
     # Add the em/tau RoI converter algorithm:
     outkey = "LVL1EmTauRoIs"
-    alg = xAODMaker__EmTauRoICnvAlg()
+    alg = conf.xAODMaker__EmTauRoICnvAlg()
     alg.AODKey = key
     alg.xAODKey = outkey
     sequence += alg
     # Add the em/tau RoI objects to the output:
-    if stream != None:
+    if stream is not None:
         stream.AddItem( "xAOD::EmTauRoIContainer_v1#%s" % outkey )
         stream.AddItem( "xAOD::EmTauRoIAuxContainer_v1#%sAux." % outkey )
         pass
 
     # Add the energy-sum RoI converter algorithm:
     outkey = "LVL1EnergySumRoI"
-    alg = xAODMaker__EnergySumRoICnvAlg()
+    alg = conf.xAODMaker__EnergySumRoICnvAlg()
     alg.AODKey = key
     alg.xAODKey = outkey
     sequence += alg
     # Add the energy-sum RoI objects to the output:
-    if stream != None:
+    if stream is not None:
         stream.AddItem( "xAOD::EnergySumRoI_v1#%s" % outkey )
         stream.AddItem( "xAOD::EnergySumRoIAuxInfo_v1#%sAux." % outkey )
         pass
 
     # Add the jet-Et RoI converter algorithm:
     outkey = "LVL1JetEtRoI"
-    alg = xAODMaker__JetEtRoICnvAlg()
+    alg = conf.xAODMaker__JetEtRoICnvAlg()
     alg.AODKey = key
     alg.xAODKey = outkey
     sequence += alg
     # Add the jet-Et RoI objects to the output:
-    if stream != None:
+    if stream is not None:
         stream.AddItem( "xAOD::JetEtRoI_v1#%s" % outkey )
         stream.AddItem( "xAOD::JetEtRoIAuxInfo_v1#%sAux." % outkey )
         pass
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTriggerCnv/python/xAODTrigDecisionCreator.py b/Event/xAOD/xAODTriggerCnv/python/xAODTrigDecisionCreator.py
index a0ab17169a012d38ee4299298a01bb694340660b..faad5d357ad1e7c3c0ee720112540488122cd34c 100644
--- a/Event/xAOD/xAODTriggerCnv/python/xAODTrigDecisionCreator.py
+++ b/Event/xAOD/xAODTriggerCnv/python/xAODTrigDecisionCreator.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: xAODTrigDecisionCreator.py 578517 2014-01-15 13:48:04Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Import the package's configurables:
-from xAODTriggerCnv.xAODTriggerCnvConf import *
+from xAODTriggerCnv.xAODTriggerCnvConf import xAODMaker__TrigDecisionCnvAlg
 
 ## Helper function for creating xAOD TrigDecision objects
 def xAODTrigDecisionCreator( sequence = None, stream = None,
@@ -22,7 +20,6 @@ def xAODTrigDecisionCreator( sequence = None, stream = None,
     """
 
     # Create a logger for the function:
-    if "logger" in dir(): orig_logger = logger
     from AthenaCommon.Logging import logging
     logger = logging.getLogger( "xAODTrigDecisionCreator" )
 
@@ -30,13 +27,13 @@ def xAODTrigDecisionCreator( sequence = None, stream = None,
     logger.info( "Creating xAOD::TrigDecision from TrigDec::TrigDecision" )
 
     # Get the main sequence if necessary:
-    if sequence == None:
+    if sequence is None:
         from AthenaCommon.AlgSequence import AlgSequence
         sequence = AlgSequence()
         pass
 
     # Access the stream if necessary:
-    if stream == None:
+    if stream is None:
         from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
         stream = MSMgr.GetStream( "StreamAOD" )
         pass
@@ -51,7 +48,4 @@ def xAODTrigDecisionCreator( sequence = None, stream = None,
     stream.AddItem( "xAOD::TrigDecision_v1#%s" % key )
     stream.AddItem( "xAOD::TrigDecisionAuxInfo_v1#%sAux." % key )
 
-    # Reinstate the old logger if it existed:
-    if "orig_logger" in dir(): logger = orig_logger
-
     pass
diff --git a/Event/xAOD/xAODTruthCnv/CMakeLists.txt b/Event/xAOD/xAODTruthCnv/CMakeLists.txt
index 023f8a01d15bcc50af6ecb584a5c3804cdd0265d..162833fcb332f3a83dd610fc4490091b5ac49d84 100644
--- a/Event/xAOD/xAODTruthCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTruthCnv/CMakeLists.txt
@@ -26,4 +26,4 @@ atlas_add_dictionary( xAODTruthCnvDict
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Event/xAOD/xAODTruthCnv/python/xAODTruthCnvConfig.py b/Event/xAOD/xAODTruthCnv/python/xAODTruthCnvConfig.py
index 4f7ad5404a2f159f5906ac7d17b762c5731ebf22..e3bb84d4a3da96fb06c4e7c746a5b91ad82414ac 100644
--- a/Event/xAOD/xAODTruthCnv/python/xAODTruthCnvConfig.py
+++ b/Event/xAOD/xAODTruthCnv/python/xAODTruthCnvConfig.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 from AthenaCommon import CfgMgr
 
 def getGEN_AOD2xAOD(name="GEN_AOD2xAOD", **kwargs):
@@ -6,7 +8,7 @@ def getGEN_AOD2xAOD(name="GEN_AOD2xAOD", **kwargs):
         from PyUtils.MetaReaderPeekerFull import metadata
         if metadata['/Digitization/Parameters']['digiSteeringConf'] == 'StandardInTimeOnlyGeantinoTruthPileUpToolsAlg':
             writeInTimePileUpTruth = True
-    except:
+    except Exception:
         pass
     kwargs.setdefault('WriteInTimePileUpTruth',  writeInTimePileUpTruth)
     return CfgMgr.xAODMaker__xAODTruthCnvAlg(name, **kwargs)
diff --git a/Event/xAOD/xAODTruthCnv/python/xAODTruthCnvConfigDb.py b/Event/xAOD/xAODTruthCnv/python/xAODTruthCnvConfigDb.py
index 98b7f886be938d42dc6f8105e3f61e75cf19c2a9..ce9a2277c766ea90b9ddb45880701e8b141dfcb0 100644
--- a/Event/xAOD/xAODTruthCnv/python/xAODTruthCnvConfigDb.py
+++ b/Event/xAOD/xAODTruthCnv/python/xAODTruthCnvConfigDb.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 from AthenaCommon.CfgGetter import addAlgorithm
 
 addAlgorithm("xAODTruthCnv.xAODTruthCnvConfig.getGEN_AOD2xAOD", "GEN_AOD2xAOD")