diff --git a/Control/AthenaMonitoring/python/BadLBFilterToolConfig.py b/Control/AthenaMonitoring/python/BadLBFilterToolConfig.py
index 40cc526db224b3bb57be378e36fa7731ad682f9c..40d6a40ef6058a722311ddd2c242657745915206 100644
--- a/Control/AthenaMonitoring/python/BadLBFilterToolConfig.py
+++ b/Control/AthenaMonitoring/python/BadLBFilterToolConfig.py
@@ -12,8 +12,6 @@ def BadLBFilterAlgCfg(inputFlags,name, defects, writekey, ignoreRecoverable=Fals
     log = logging.getLogger('BadLBFilterAlgCfg')
     result=ComponentAccumulator()
 
-    DQBadLBFilterAlg=CompFactory.DQBadLBFilterAlg
-
     from DQDefects import DefectsDB
     ddb = DefectsDB('COOLOFL_GLOBAL/' + inputFlags.IOVDb.DatabaseInstance, 
                     tag=origDbTag or inputFlags.IOVDb.GlobalTag)
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py b/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py
index 10ee0958c7eb71358741c2619780e9a60b028820..6dd9cc826d0ce51e32e345fcae4b2941dcc71517 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py
@@ -42,7 +42,7 @@ class GroomingDefinition(object):
         return self.__hash__() == rhs.__hash__()
 
     def __ne__(self,rhs):
-        return (not __eq__(self,rhs))
+        return (not self.__eq__(rhs))
 
     # Define core attributes as properties, with
     # custom setter/getter such that if changed, these
@@ -63,7 +63,7 @@ class GroomingDefinition(object):
             jetlog.error("Unsupported grooming algorithm specification \"{}\"! Allowable options:")
             for groomalg in supportedGrooming:
                 jetlog.error(groomalg)
-            raise KeyError("Invalid grooming algorithm choice: {0}".format(groomtype))
+            raise KeyError("Invalid grooming algorithm choice: {0}".format(groomalg))
 
     @property
     def groomspec(self):
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
index 1bf8eafba59ca00959fdf7bda01dbaff6f814d93..ef2e9f16a4ca88849636c9df8c1137e90ea8aa2c 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
@@ -21,7 +21,8 @@ def propertiesOf(comp):
     try:
         propNames = comp._descriptors
         return propNames
-    except: pass
+    except Exception: 
+        pass
     return comp.properties()
 
 
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index 5a2716eeafec71db52e1252b751d484b60b8e335..d5bc46743160245dc4ee5aaf2dbb648e9bb89ea6 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -393,13 +393,19 @@ def MuidCaloTrackStateOnSurfaceCfg(flags, name='MuidCaloTrackStateOnSurface', **
     result.setPrivateTools(tool)
     return result
 
+
 def MuidCaloTrackStateOnSurfaceParamCfg(flags, name='MuidCaloTrackStateOnSurfaceParam', **kwargs ):
-    result = MuidCaloEnergyToolParamCfg(flags)
-    kwargs.setdefault("CaloEnergyDeposit"  ,  tmpAcc.popPrivateTools())
-    tmpAcc = MuidCaloTrackStateOnSurfaceCfg(flags, name, **kwargs)
-    result.merge(tmpAcc)
+    result=ComponentAccumulator()
+    kwargs.setdefault("Propagator", CompFactory.Trk.RungeKuttaPropagator(name = 'AtlasRungeKuttaPropagator'))# FIXME - there should be a CA for this!
+    kwargs.setdefault("MinRemainingEnergy" , 0.2*GeV )
+    kwargs.setdefault("ParamPtCut"         , 3.0*GeV )
+    kwargs.setdefault("CaloEnergyDeposit"  , MuidCaloEnergyParam(flags) )
+    kwargs.setdefault("CaloEnergyParam"  ,   MuidCaloEnergyParam(flags) )
+    tool = CompFactory.Rec.MuidCaloTrackStateOnSurface(name,**kwargs)
+    result.setPrivateTools(tool)
     return result
 
+
 def MuidMaterialEffectsOnTrackProviderCfg(flags, name='MuidMaterialEffectsOnTrackProvider', **kwargs ):
     result = MuidCaloTrackStateOnSurfaceCfg(flags)
     kwargs.setdefault("TSOSTool",      result.popPrivateTools() )
diff --git a/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py b/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py
index c70a87631def90eb757433569689586df3d036f0..1fbe67d0c0af9d95e1135cf16b3c501a20833f90 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py
+++ b/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py
@@ -144,7 +144,6 @@ def StreamTagMakerToolCfg(name="StreamTagMakerTool"):
 
 
 def TriggerBitsMakerToolCfg(name="TriggerBitsMakerTool"):
-   from TriggerJobOpts.TriggerFlags import TriggerFlags
 
    bitsmaker = CompFactory.TriggerBitsMakerTool(name)
    # Extra configuration may come here
diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/python/EgammaCalibrationConfig.py b/Trigger/TrigTools/TrigT2CaloCalibration/python/EgammaCalibrationConfig.py
index ce285ce687b82d8e713a9c970093a52ca930fcaa..c94ee3bd353aa2bb04c68c53bd9cf10b46c6c334 100644
--- a/Trigger/TrigTools/TrigT2CaloCalibration/python/EgammaCalibrationConfig.py
+++ b/Trigger/TrigTools/TrigT2CaloCalibration/python/EgammaCalibrationConfig.py
@@ -1,5 +1,8 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
+# flake8: noqa
+# ... because this file is hopeless ...
+
 #############################
 # EgammaLWCalibration
 #############################