diff --git a/Simulation/FastShower/FastCaloSim/CMakeLists.txt b/Simulation/FastShower/FastCaloSim/CMakeLists.txt
index f11b4f864f8efc5a79fef1f49f3e0f671ab92138..ef97bdd2e0bd1ebe6228b6bbf687f1eb6cb358ec 100644
--- a/Simulation/FastShower/FastCaloSim/CMakeLists.txt
+++ b/Simulation/FastShower/FastCaloSim/CMakeLists.txt
@@ -54,7 +54,7 @@ atlas_add_component( FastCaloSim
                      LINK_LIBRARIES FastCaloSimLib )
 
 # 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 )
 
 atlas_add_test( FastShowerCellBuilderTool_test
diff --git a/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactory.py b/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactory.py
index f6b8a8a5332e741afa1c86bdea21bd8f38901783..f4151b25110dbf2e9eadb87680e9b23d2f422ef5 100644
--- a/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactory.py
+++ b/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactory.py
@@ -1,14 +1,10 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-from AthenaCommon.Constants import *
-from RecExConfig.Configured import Configured
-
 def FastCaloSimFactory(name="FastCaloSimFactory", **kwargs):
 
     from AthenaCommon.Logging import logging
     mlog = logging.getLogger( 'FastCaloSimFactory::configure:' )
 
-    from CaloRec.CaloCellFlags import jobproperties
     from AthenaCommon.AppMgr import ToolSvc
 
     #########################################################################################################
@@ -45,11 +41,10 @@ def FastCaloSimFactory(name="FastCaloSimFactory", **kwargs):
     #theFastShowerCellBuilderTool.Invisibles=[12, 14, 16, 1000022]
     
     #########################################################################################################
-    import os
 
     try:
         ParticleParametrizationFileName=theFastShowerCellBuilderTool.ParticleParametrizationFileName
-    except:
+    except Exception:
         ParticleParametrizationFileName=""
     
     if ParticleParametrizationFileName=="" and len(theFastShowerCellBuilderTool.AdditionalParticleParametrizationFileNames)==0:
@@ -66,8 +61,3 @@ def FastCaloSimFactory(name="FastCaloSimFactory", **kwargs):
     mlog.info (theFastShowerCellBuilderTool)
 
     return theFastShowerCellBuilderTool
-
-def getFastShowerCellBuilderTool(name="FastShowerCellBuilderTool", **kwargs):
-
-    return FastShowerCellBuilderTool()
-
diff --git a/Simulation/FastShower/FastCaloSim/python/JetRec_FastCaloSim.py b/Simulation/FastShower/FastCaloSim/python/JetRec_FastCaloSim.py
index 1237d101518ee6884e42a61d259f2ca1e149c54b..ea35841d45dd6c5055d205137ba71e3d20f2db36 100755
--- a/Simulation/FastShower/FastCaloSim/python/JetRec_FastCaloSim.py
+++ b/Simulation/FastShower/FastCaloSim/python/JetRec_FastCaloSim.py
@@ -1,8 +1,6 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-    
-
-from JetRec.JetGetters import *
+from JetRec.JetGetters import make_StandardJetGetter
 from JetRec.JetRecFlags import jetFlags
 
 def make_FastCaloSimJets(doTowerJet = True, doTopoJet = True, doTruthJet = True, doLocalCalib = False ,
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
index 1853b41a02f7ad644467b40741891f3a9ec188eb..4ec076a55f929800e4d12274f7cf7904af2358bf 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
@@ -19,5 +19,5 @@ atlas_add_component( ISF_FastCaloSimSD
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CaloDetDescrLib CaloIdentifier GeneratorObjects LArG4Code ISF_FastCaloSimEvent Identifier TileG4InterfacesLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
index 38f60d7b5de766c8abba229b1f5349655a26983e..f0e196d732163a517514e30aba88b3021caa42fd 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_add_component( ISF_FastCaloSimServices
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${LWTNN_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel IdDictParser ISF_InterfacesLib TrkEventPrimitives TrkExInterfaces CaloEvent StoreGateLib SGtests NavFourMom GeneratorObjects FastCaloSimLib ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces ISF_FastCaloSimParametrizationLib PathResolver)
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 
 atlas_add_test( ISF_FastCaloSimServices_Config_test
                 SCRIPT test/FastCaloSimServices_test.py)
\ No newline at end of file
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
index b3377782370c9d963c60001b53ebbdf96b8dc58b..e28f360523a822b06f5ee6ec00350c1a22206763 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
@@ -5,17 +5,10 @@ Tools configurations for ISF_FastCaloSimServices
 KG Tan, 04/12/2012
 """
 
-from AthenaCommon.CfgGetter import getPrivateTool,getPrivateToolClone,getPublicTool,getPublicToolClone,\
-        getService,getServiceClone,getAlgorithm,getAlgorithmClone
-
+from AthenaCommon.CfgGetter import getService
 from AthenaCommon import CfgMgr
-from AthenaCommon.Constants import *  # FATAL,ERROR etc.
-from AthenaCommon.SystemOfUnits import *
-from AthenaCommon.DetFlags import DetFlags
 
-from ISF_Config.ISF_jobProperties import ISF_Flags # IMPORTANT: Flags must be set before tools are retrieved
 from ISF_FastCaloSimServices.ISF_FastCaloSimJobProperties import ISF_FastCaloSimFlags
-
 from ISF_Algorithms.collection_merger_helpers import generate_mergeable_collection_name