diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfigMT.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfigMT.py
index afa5c893c46e5506bdddc42d5ed919f289c12c2e..7d795f1f54ca7b9e8525c7346774d290034641c2 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfigMT.py
+++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfigMT.py
@@ -138,7 +138,6 @@ class TrigTauRecMerged_TauPreselection (TrigTauRecMergedMT) :
                 
             from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
             time = TrigTimeHistToolConfig("Time")
-            #self.AthenaMonTools = [ time, validation, online ]
 
             import TrigTauRec.TrigTauAlgorithmsHolder as taualgs
             tools = []
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/ITrigTrackPreSelHypoTool.h b/Trigger/TrigHypothesis/TrigTauHypo/src/ITrigTrackPreSelHypoTool.h
index 4f7aedf4facc8be670e4eb28b1b4cfa8791cf7b8..bc32a06d03d7c8b9225d4705f68b22a431908229 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/ITrigTrackPreSelHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/ITrigTrackPreSelHypoTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 #ifndef TRIGTAUHYPO_ITrigTrackPreSelHypoTool_H
 #define TRIGTAUHYPO_ITrigTrackPreSelHypoTool_H 1
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.cxx
index de3d037b73d069784da952c9cdf81696f8b1a592..75bb9d62586403b453368f496566f2236c76ea1a 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.cxx
@@ -58,10 +58,10 @@ StatusCode TrigTauTrackRoiUpdaterMT::execute(const EventContext& ctx) const
 
 
   ATH_MSG_DEBUG( "Running "<< name() <<" ... " );
-  //const EventContext& ctx = getContext();
 
   // Prepare Outputs
-  std::unique_ptr< TrigRoiDescriptorCollection > roICollection( new TrigRoiDescriptorCollection() );
+  auto roICollection = std::make_unique<TrigRoiDescriptorCollection>();
+  //std::unique_ptr< TrigRoiDescriptorCollection > roICollection( new TrigRoiDescriptorCollection() );
 
   // Retrieve Input TrackCollection
   SG::ReadHandle< TrackCollection > TrackCollectionHandle = SG::makeHandle( m_tracksKey,ctx );
@@ -69,7 +69,7 @@ StatusCode TrigTauTrackRoiUpdaterMT::execute(const EventContext& ctx) const
   const TrackCollection *foundTracks = TrackCollectionHandle.get();
   ATH_MSG_DEBUG( "Found " << foundTracks->size() << " fast Tracks found, updating the corresponding RoI ... " );
 
-  if(foundTracks != NULL) {
+  if(foundTracks) {
     ATH_MSG_DEBUG( "REGTEST: Size of vector CaloCluster container is " << foundTracks->size());
     if(foundTracks->size()==0) {
       ATH_MSG_DEBUG( "Cannot proceed, size of vector CaloCluster container is " << foundTracks->size());
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.h
index f878f250f6b1d9a6f01acea1c5b745e46e44dc54..ff92961412fc62279a5b4f49b980debf53742a9d 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGTAUHYPO_TrigTauTrackRoiUpdaterMT_H
@@ -21,8 +21,7 @@ class TrigTauTrackRoiUpdaterMT : public AthReentrantAlgorithm {
   ~TrigTauTrackRoiUpdaterMT();
   
   virtual StatusCode initialize() override;
-  //StatusCode finalize();
-  StatusCode execute(const EventContext&) const;
+  virtual StatusCode execute(const EventContext&) const override;
 
  private:
 
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx
index e35ee8a50f841a0e687631e6ece9e511b5852f63..726a6afa943c2f5595ae76ad11b8070af453a2a0 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx
@@ -25,7 +25,8 @@ StatusCode TrigTrackPreSelHypoAlgMT::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode TrigTrackPreSelHypoAlgMT::finalize() {   
+
+StatusCode TrigTrackPreSelHypoAlgMT::finalize() {
   return StatusCode::SUCCESS;
 }
 
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
index 16412e6babea54e1b6ac279546863f8776f272ab..ed081dc0815d48c1f51d6c266e63e6acacf0b484 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
@@ -41,10 +41,6 @@ class TrigTrackPreSelHypoTool : public extends<AthAlgTool, ITrigTrackPreSelHypoT
 
   HLT::Identifier m_decisionId;
 
-  //Gaudi::Property<bool>  m_decisionPerCluster{ this, "DecisionPerCluster", true, "Is multiplicity requirement refering to taus ( false ) or RoIs/clusters with taus ( false ), relevant only in when multiplicity > 1" };
-  //Gaudi::Property<bool>  m_respectPreviousDecision{ this, "RespectPreviousDecision", false, "If false, ( do not even check ), the decision made for the cluster" };
-  //Gaudi::Property<bool>  m_acceptAll{ this, "AcceptAll", false, "Ignore selection" };
-
   Gaudi::Property<float>  m_lowerPtCut{ this, "lowerPtCut", 20000.0, "" };
   Gaudi::Property<float>  m_lowerTrackPtCut{ this, "lowerTrackPtCut", 0.0, "" };
   Gaudi::Property<float>  m_clusterCone{ this, "clusterCone", 0.2, "" };
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/tauDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/tauDefs.py
index 813b499190e0693ee01de32ac8acb130c0607be7..acb2a29d8fb7cd04def81debcf2bd8c0860bd8fe 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/tauDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/tauDefs.py
@@ -1,3 +1,7 @@
+#
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
 from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 from AthenaCommon.Constants import VERBOSE,DEBUG,INFO, ERROR
 from AthenaCommon.CFElements import parOR, seqAND, seqOR, stepSeq
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py
index 93da06dfd8b817606599d2528729d83365eda991..72672e53f381d71438d2cf1dabe863b69f1d0da5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaCommon.Include import include
@@ -84,11 +84,6 @@ def tauCoreTrackSequence():
     ViewVerify.OutputLevel = DEBUG
     viewAlgs.append(ViewVerify)
 
-    #TrackParticlesName = ""
-    #for viewAlg in viewAlgs:
-    #   if viewAlg.name() == "InDetTrigTrackParticleCreatorAlg":
-    #     TrackParticlesName = viewAlg.TrackParticlesName
-
 
     from TrigTauHypo.TrigTauHypoConf import TrigTauTrackRoiUpdaterMT
     TrackRoiUpdater = TrigTauTrackRoiUpdaterMT("TrackRoiUpdater")