diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
index 50104514763ef43c422f70f1262348e7352f7b3e..f27f7ab4eb2bd904a4c647fa1f1f86ebc56a1248 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
@@ -51,12 +51,17 @@ atlas_add_component( TrigBjetHypo
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps xAODBase xAODTracking GaudiKernel Particle VxSecVertex TrigInDetEvent TrigInterfacesLib AthContainers GeoPrimitives EventInfo EventPrimitives FourMomUtils xAODBTagging xAODCore xAODJet xAODMuon BTaggingLib JetEvent VxVertex TrigCaloEvent TrigMuonEvent TrigNavigationLib TrigParticle TrigSteeringEvent DecisionHandlingLib AthViews )
-atlas_add_test( TrigBjetHypoTool SCRIPT python -m  	TrigBjetHypo.TrigBjetHypoTool	
-                        PROPERTIES TIMEOUT 300
-			POST_EXEC_SCRIPT nopost.sh )
-
 
 # Install files from the package:
 atlas_install_headers( TrigBjetHypo )
 atlas_install_python_modules( python/*.py )
 
+# Unit tests:
+atlas_add_test( TrigBjetHypoTool SCRIPT python -m TrigBjetHypo.TrigBjetHypoTool
+   PROPERTIES TIMEOUT 300
+   POST_EXEC_SCRIPT nopost.sh )
+
+# Check Python syntax:
+atlas_add_test( flake8
+   SCRIPT flake8 --select=ATL,F,E7,E9,W6 --enable-extension=ATL900,ATL901 --exclude='TrigBjetFexTuningGrade*' ${CMAKE_CURRENT_SOURCE_DIR}/python
+   POST_EXEC_SCRIPT nopost.sh )
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py
index 3f849855c65d286a471e1f99c21169e9b38795cc..551d4e137b4e4c54d71c953cc2b83b4372b99daf 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py
@@ -1,17 +1,17 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 import re
 re_Bjet = re.compile(r'^HLT_(?P<multiplicity>\d+)?j(?P<threshold>\d+)(?:_gsc(?P<gscThreshold>\d+))?(?:_b(?P<bTag>[^_]+)(?:_(?P<bConfig>split))?(?:_(?P<minEta>\d+)eta(?P<maxEta>\d+))?)?(?:_L1(?P<L1>.*))?$')
 
 from AthenaCommon.Logging import logging
 from AthenaCommon.SystemOfUnits import GeV
-from AthenaCommon.Constants import VERBOSE,DEBUG
+
+log = logging.getLogger('TrigBjetEtHypoTool')
 
 ####################################################################################################
 
 def TrigBjetEtHypoToolFromDict_j( chainDict ):
 
-    from AthenaCommon.Constants import DEBUG
     """ set the name of the EtHypoTool (name=chain) and figure out the threshold and selection from conf """
     name    = chainDict['chainName']
     chainPart = chainDict['chainParts'][0]
@@ -35,13 +35,12 @@ def TrigBjetEtHypoToolFromDict_j( chainDict ):
 
     from TrigBjetHypo.TrigBjetHypoConf import TrigBjetEtHypoTool        
     tool = TrigBjetEtHypoTool( name )
-    tool.OutputLevel = DEBUG
     tool.AcceptAll   = False
     tool.EtThreshold  = float(conf_dict['threshold']) * GeV
     tool.MinEtaThreshold = float(conf_dict['minEta']) / 100
     tool.MaxEtaThreshold = float(conf_dict['maxEta']) / 100
 
-    print "TrigBjetEtHypoToolFromName_j: name = %s, cut_j = %s "%(name,tool.EtThreshold)
+    log.debug("name = %s, cut_j = %s ", name, tool.EtThreshold)
     return tool
 
 def TrigBjetEtHypoToolFromName_j( name, conf ):
@@ -50,12 +49,11 @@ def TrigBjetEtHypoToolFromName_j( name, conf ):
     decoder = DictFromChainName()        
     decodedDict = decoder.analyseShortName(conf, [], "") # no L1 info        
     decodedDict['chainName'] = name # override
-	
+
     return TrigBjetEtHypoToolFromDict_j( decodedDict )
     
 
 def TrigBjetEtHypoToolFromDict_gsc( chainDict ):
-    from AthenaCommon.Constants import DEBUG
     """ set the name of the EtHypoTool (name=chain) and figure out the threshold and selection from conf """
 
     name    = chainDict['chainName']
@@ -81,13 +79,12 @@ def TrigBjetEtHypoToolFromDict_gsc( chainDict ):
 
     from TrigBjetHypo.TrigBjetHypoConf import TrigBjetEtHypoTool        
     tool = TrigBjetEtHypoTool( name )
-    tool.OutputLevel = DEBUG
     tool.AcceptAll   = False
     tool.EtThreshold  = float(conf_dict['gscThreshold']) * GeV
     tool.MinEtaThreshold = float(conf_dict['minEta']) / 100
     tool.MaxEtaThreshold = float(conf_dict['maxEta']) / 100
 
-    print "TrigBjetEtHypoToolFromName_gsc: name = %s, cut_j = %s "%(name,tool.EtThreshold)
+    log.debug("gsc: name = %s, cut_j = %s ", name, tool.EtThreshold)
     return tool
 
 def TrigBjetEtHypoToolFromName_gsc( name, conf ):
@@ -106,17 +103,16 @@ if __name__ == "__main__":
     from TriggerJobOpts.TriggerFlags import TriggerFlags
     TriggerFlags.enableMonitoring=['Validation']
 
-    t = TrigBjetEtHypoToolFromName( "HLT_j35_gsc45_boffperf_split","HLT_j35_gsc45_boffperf_split" )
+    t = TrigBjetEtHypoToolFromName_gsc( "HLT_j35_gsc45_boffperf_split","HLT_j35_gsc45_boffperf_split" )
     assert t, "can't configure gsc boffperf split"
 
-    t = TrigBjetEtHypoToolFromName( "HLT_j35_gsc45_boffperf","HLT_j35_gsc45_boffperf" )
+    t = TrigBjetEtHypoToolFromName_gsc( "HLT_j35_gsc45_boffperf","HLT_j35_gsc45_boffperf" )
     assert t, "can't configure gsc boffperf"
 
-    t = TrigBjetEtHypoToolFromName( "HLT_j35_boffperf_split","HLT_j35_boffperf_split" )
+    t = TrigBjetEtHypoToolFromName_j( "HLT_j35_boffperf_split","HLT_j35_boffperf_split" )
     assert t, "can't configure boffperf split"
 
-    t = TrigBjetEtHypoToolFromName( "HLT_j35_boffperf","HLT_j35_boffperf" )
+    t = TrigBjetEtHypoToolFromName_j( "HLT_j35_boffperf","HLT_j35_boffperf" )
     assert t, "can't configure boffperf"
 
-    print ( "\n\n TrigBjetEtHypoToolFromName ALL OK\n\n" )
-
+    log.info( "\n\n TrigBjetEtHypoToolFromName ALL OK\n\n" )
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetFexConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetFexConfig.py
index feea1ad59ab4b19fc15f5925f356fc5c19b801cf..58d081fc07b782ccfd21439738332acf539783f7 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetFexConfig.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+# flake8: noqa  (legacy trigger)
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigBjetFex
 from TrigBjetHypo.TrigBjetFexTuning import *
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoConfig.py
index 8f82dfa5e4144ef40bc2f5e8251b929f74a972cc..3bcd92712f94cb1cac28c48353a8d47572dda194 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoConfig.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigBjetHypo
 from TrigBjetHypo.TrigBjetHypoConf import TrigBjetHypoAllTE
 
 from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import GeV
 
 def getBjetHypoInstance( instance, version, cut ):
     return BjetHypo( instance=instance, cut=cut, version=version, name=instance+"BjetHypo"+"_"+cut+"_"+version )
@@ -495,7 +494,8 @@ class BjetHypoAllTE (TrigBjetHypoAllTE):
         #  eg: b150_b50  gives two requirements 150b  and 2b50
         for jetDef in fullTrigReqAND:
             for otherJetDefs in fullTrigReqAND:
-                if jetDef == otherJetDefs: continue
+                if jetDef == otherJetDefs:
+                    continue
                 if jetDef[0] > otherJetDefs[0] and jetDef[1] == otherJetDefs[1] :
                     fullTrigReqAND[otherJetDefs] += fullTrigReqAND[jetDef]
                 
@@ -547,7 +547,8 @@ class BjetHypoAllTE (TrigBjetHypoAllTE):
         # Loop on unique pairs
         for jetDef in fullTrigReqAND:
             for otherJetDefs in fullTrigReqAND:
-                if jetDef == otherJetDefs: continue
+                if jetDef == otherJetDefs:
+                    continue
 
                 # check if pt is harder
                 jetDef_ptBigger = jetDef[0] > otherJetDefs[0] 
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py
index 8c71191131f6088c489452da2fd09e9e9810b98f..e30482336fd48f274b144d03713ac2763a59062c 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py
@@ -1,11 +1,13 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 import re
 re_Bjet = re.compile(r'^HLT_(?P<multiplicity>\d+)?j(?P<threshold>\d+)(?:_gsc(?P<gscThreshold>\d+))?(?:_b(?P<bTag>[^_]+)(?:_(?P<bConfig>split))?(?:_(?P<minEta>\d+)eta(?P<maxEta>\d+))?)?(?:_L1(?P<L1>.*))?$')
 
 from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import GeV
-from AthenaCommon.Constants import VERBOSE,DEBUG
+
+from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName
+
+log = logging.getLogger('TrigBjetHypoTool')
 
 ####################################################################################################
 
@@ -35,7 +37,7 @@ bTaggingWP = {
 
 ####################################################################################################  
 def TrigBjetHypoToolFromDict( chainDict ):
-    print chainDict
+
     chainPart = chainDict['chainParts'][0]
     conf_dict = { 'threshold'    : chainPart['threshold'],
                   'multiplicity' : '1' if len(chainPart['multiplicity']) == 0 else chainPart['multiplicity'],
@@ -48,18 +50,14 @@ def TrigBjetHypoToolFromDict( chainDict ):
     # TODO the chain dict can be probably passed over down the line here
     tool = getBjetHypoConfiguration( name,conf_dict )
     
-    print "TrigBjetHypoToolFromName: name = %s, tagger = %s "%(name,tool.MethodTag)
-    print "TrigBjetHypoToolFromName: tagger %s and threshold %s "%(tool.MethodTag,tool.BTaggingCut)
+    log.debug("name = %s, tagger = %s, threshold = %s ", name, tool.MethodTag, tool.BTaggingCut)
 
     return tool
 
 def TrigBjetHypoToolFromName( name, conf ):
-    from AthenaCommon.Constants import DEBUG
     """ Configure a b-jet hypo tool from chain name. """
     
-    from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName   
-    
-    decoder = DictFromChainName()        
+    decoder = DictFromChainName()
     decodedDict = decoder.getChainDict( conf )
     decodedDict['chainName'] = name # override
     
@@ -70,7 +68,8 @@ def TrigBjetHypoToolFromName( name, conf ):
 
 def decodeThreshold( threshold_btag ):
     """ decodes the b-tagging thresholds """
-    print "TrigBjetHypoToolFromName: decoding threshold b" + threshold_btag
+
+    log.debug("TrigBjetHypoToolFromName: decoding threshold b%s", threshold_btag)
 
     tagger = "MV2c10"
     if "mv2c20" in threshold_btag :
@@ -88,7 +87,6 @@ def getBjetHypoConfiguration( name,conf_dict ):
     from TrigBjetHypo.TrigBjetHypoConf import TrigBjetHypoTool
 
     tool = TrigBjetHypoTool( name )
-    tool.OutputLevel     = DEBUG
     tool.AcceptAll       = False
     tool.UseBeamSpotFlag = False
 
@@ -134,5 +132,4 @@ if __name__ == "__main__":
     t = TrigBjetHypoToolFromName( "HLT_j35_boffperf_L1J20","HLT_j35_boffperf_L1J20" )
     assert t, "can't configure boffperf"
 
-    print ( "\n\n TrigBjetHypoToolFromName ALL OK\n\n" )
-
+    log.info( "\n\n TrigBjetHypoToolFromName ALL OK\n\n" )
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexConfig.py
index 82544eb559c7ab9b68eb8944f8f195d1641d1ac7..f3d815829c5d94fc8515e98dc985430335cd56fa 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexConfig.py
@@ -1,10 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigBtagFex
-#from TrigBjetHypo.TrigBtagFexTuning import *
 
 from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import mm, GeV
 
 from AthenaCommon.AppMgr import ToolSvc
 from BTagging.BTaggingFlags import BTaggingFlags
@@ -60,7 +58,7 @@ class BtagFex (TrigBtagFex):
         # IMPORT OFFLINE TOOLS
         self.setupOfflineTools = True
         if self.setupOfflineTools :
-            if BTagConfigSetupStatus == None :
+            if BTagConfigSetupStatus is None :
                 self.setupOfflineTools = False
             else :
                 self.BTagTrackAssocTool = BTagConfig.getJetCollectionMainAssociatorTool("AntiKt4EMTopo")
@@ -118,7 +116,7 @@ class BtagFexSplit (TrigBtagFex):
         # IMPORT OFFLINE TOOLS
         self.setupOfflineTools = True
         if self.setupOfflineTools :
-            if BTagConfigSetupStatus == None :
+            if BTagConfigSetupStatus is None :
                 self.setupOfflineTools = False
             else :
                 self.BTagTrackAssocTool = BTagConfig.getJetCollectionMainAssociatorTool("AntiKt4EMTopo")
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexMTConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexMTConfig.py
index e505f22758052fc7e72fd2d2da1c7019242748c3..901a68d9cb034bd232b6fd489cf5141c3859d64b 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexMTConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexMTConfig.py
@@ -1,14 +1,13 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigBtagFexMT
-#from TrigBjetHypo.TrigBtagFexTuning import *
 
 from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import mm, GeV
 
 from AthenaCommon.AppMgr import ToolSvc
 from BTagging.BTaggingFlags import BTaggingFlags
 from BTagging.BTaggingConfiguration import getConfiguration
+
 BTagConfig = getConfiguration("Trig")
 BTagConfig.PrefixxAODBaseName(False)
 BTagConfig.PrefixVertexFinderxAODBaseName(False)
@@ -35,8 +34,7 @@ class BtagFex (TrigBtagFexMT):
         
         AllowedInstances = ["EF"]
         AllowedVersions  = ["2012"]
-        AllowedAlgos     = ["EFID"]
-        
+
         if instance not in AllowedInstances :
             mlog.error("Instance "+instance+" is not supported!")
             return None
@@ -52,7 +50,7 @@ class BtagFex (TrigBtagFexMT):
         # IMPORT OFFLINE TOOLS
         self.setupOfflineTools = True
         if self.setupOfflineTools :
-            if BTagConfigSetupStatus == None :
+            if BTagConfigSetupStatus is None :
                 self.setupOfflineTools = False
             else :
                 self.BTagTrackAssocTool = BTagConfig.getJetCollectionMainAssociatorTool("AntiKt4EMTopo")
@@ -75,8 +73,7 @@ class BtagFexSplit (TrigBtagFexMT):
         
         AllowedInstances = ["EF", "MuJetChain"]
         AllowedVersions  = ["2012"]
-        AllowedAlgos     = ["EFID"]
-        
+
         if instance not in AllowedInstances :
             mlog.error("Instance "+instance+" is not supported!")
             return None
@@ -98,7 +95,7 @@ class BtagFexSplit (TrigBtagFexMT):
         # IMPORT OFFLINE TOOLS
         self.setupOfflineTools = True
         if self.setupOfflineTools :
-            if BTagConfigSetupStatus == None :
+            if BTagConfigSetupStatus is None :
                 self.setupOfflineTools = False
             else :
                 self.BTagTrackAssocTool = BTagConfig.getJetCollectionMainAssociatorTool("AntiKt4EMTopo")
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigEFBjetSequenceAllTEConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigEFBjetSequenceAllTEConfig.py
index 1e6059b48c7e42e5d4c5456090aeee4f2fcb4912..463c0bcec4e07591fb32e78822da9d7a213f1fcb 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigEFBjetSequenceAllTEConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigEFBjetSequenceAllTEConfig.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigEFBjetSequenceAllTE
 
-from AthenaCommon.SystemOfUnits import GeV
-
 
 def getEFBjetAllTEInstance( ):
     return EFBjetSequenceAllTE( name="EFBjetSequenceAllTE" )
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigFarawayJetFinderAllTEConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigFarawayJetFinderAllTEConfig.py
index c7a38df1d0797e65d7bafc514bd23754d8331259..5b326564109942f7fedf3483e4763bf54d0575e9 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigFarawayJetFinderAllTEConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigFarawayJetFinderAllTEConfig.py
@@ -1,11 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigFarawayJetFinderAllTE
 
-from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import GeV
-
-
 def getFarawayJetFinderAllTEInstance( cut ):
     return FarawayJetFinderAllTE( cut=cut, name="FarawayJetFinderAllTE_"+cut+"dR" )
 
@@ -17,8 +13,6 @@ class FarawayJetFinderAllTE (TrigFarawayJetFinderAllTE):
     def __init__(self, cut, name):
         super( FarawayJetFinderAllTE, self ).__init__( name )
         
-        mlog = logging.getLogger('BjetHypoConfig.py')
-
         self.MinDeltaRCut = float(cut)/10.0
         self.JetInputKey  = "SplitJet"
         self.JetOutputKey = "FarawayJet"
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigGSCFexConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigGSCFexConfig.py
index 29bdf8af5c7983f401b038d64c1a2a155d3b044b..5a25c262812af775fc973d1e24fbe63622964188 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigGSCFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigGSCFexConfig.py
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+# flake8: noqa  (legacy trigger)
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigGSCFex
-#from TrigBjetHypo.TrigGSCFexTuning import *   
 
 from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import mm, GeV   #commented here
 
 from AthenaCommon.AppMgr import ToolSvc
 from BTagging.BTaggingFlags import BTaggingFlags #commented here
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigGSCFexMTConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigGSCFexMTConfig.py
index c573e6bd5b9dc5e81716356263a5b0a54ba3e2f5..2481cdb6bda91efdb37d028ba9021a84100be3d4 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigGSCFexMTConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigGSCFexMTConfig.py
@@ -1,18 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigGSCFexMT
-#from TrigBjetHypo.TrigGSCFexTuning import *   
 
 from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import mm, GeV   #commented here
 
-from AthenaCommon.AppMgr import ToolSvc
-#from BTagging.BTaggingFlags import BTaggingFlags #commented here
-#from BTagging.BTaggingConfiguration import getConfiguration #commented here
-#BTagConfig = getConfiguration("Trig")   #commented here
-#BTagConfig.PrefixxAODBaseName(False)   #commented here
-#BTagConfig.PrefixVertexFinderxAODBaseName(False)   #commented here
-#BTagConfigSetupStatus = BTagConfig.setupJetBTaggerTool(ToolSvc, "AntiKt4EMTopo", SetupScheme="Trig", TaggerList=BTaggingFlags.TriggerTaggers)   #commented here
 from JetRec.JetRecCalibrationFinder import jrcf
 JetConfigSetupStatus = True
 
@@ -50,11 +41,10 @@ class GSCFex (TrigGSCFexMT):
         # IMPORT OFFLINE TOOLS
         self.setupOfflineTools = True
         if self.setupOfflineTools :
-            if JetConfigSetupStatus == None :
+            if JetConfigSetupStatus is None :
                 self.setupOfflineTools = False
             else :
                 self.JetGSCCalibrationTool = jrcf.find("AntiKt", 0.4, "EMTopo", "ajg", "reco", "Kt4")
-                print self.JetGSCCalibrationTool
 
 
 #############################################################
@@ -85,7 +75,7 @@ class GSCFexSplit (TrigGSCFexMT):
         # IMPORT OFFLINE TOOLS
         self.setupOfflineTools = True
         if self.setupOfflineTools :
-            if JetConfigSetupStatus == None :
+            if JetConfigSetupStatus is None :
                 self.setupOfflineTools = False
             else :
                 #self.GSCCalibrationTool = jrcf.find("AntiKt", 0.4, "EMTopo", "ajg", "reco", "Kt4")
@@ -101,7 +91,6 @@ class GSCFexSplit (TrigGSCFexMT):
                 from AthenaCommon.AppMgr import ToolSvc
                 ToolSvc += myGSCTool
                 self.JetGSCCalibrationTool = myGSCTool
-                print self.JetGSCCalibrationTool
                 #JetCalibrationTool("myJCTool_trigger",
                 #   IsData=True,
                 #   ConfigFile="JES_2015dataset_recommendation_Feb2016.config",
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigJetSplitterAllTEConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigJetSplitterAllTEConfig.py
index 694878993a0c43d120158d0bec65245da1912156..9f2723bd8a8b74177e0558b32e8f9c3265cbd27a 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigJetSplitterAllTEConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigJetSplitterAllTEConfig.py
@@ -1,10 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigJetSplitterAllTE
 
-from AthenaCommon.SystemOfUnits import GeV
-
-
 def getJetSplitterAllTEInstance( ):
     return JetSplitterAllTE( name="JetSplitterAllTE" )
 
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigSuperRoiBuilderAllTEConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigSuperRoiBuilderAllTEConfig.py
index 4a58f90087d9d07cf3f583f08df2c182a5bb8c02..9c936c5c3fc7a57db7831f5bc851e4a2576941cb 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigSuperRoiBuilderAllTEConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigSuperRoiBuilderAllTEConfig.py
@@ -1,9 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from TrigBjetHypo.TrigBjetHypoConf import TrigSuperRoiBuilderAllTE
 
-from AthenaCommon.SystemOfUnits import GeV
-
 
 def getSuperRoiBuilderAllTEInstance( ):
     return SuperRoiBuilderAllTE( name="SuperRoiBuilderAllTE" )