diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.cxx
index 573fee4b9c084bfecf2e9ac2052eb04dd88ce94f..931263fb47de037451d9cbf2baff7fb8e1c0c8b1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.cxx
@@ -33,13 +33,6 @@ SCT_ConditionsSummaryTool::initialize() {
   return sc;
 }
 
-//Finalize
-StatusCode
-SCT_ConditionsSummaryTool::finalize() {
-  ATH_MSG_INFO("Thank-you for using the SCT_ConditionsSummaryTool, version " << PACKAGE_VERSION);
-  return StatusCode::SUCCESS;
-}
-
 bool
 SCT_ConditionsSummaryTool::isActive(const Identifier& elementId, const InDetConditions::Hierarchy h) const {
   return isGood(elementId, h);
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.h
index e22a2630e6d2d5448d9d621231bc8e0cd62f95c0..c6baa8060ae892dfba3f36f469610a29c89f5731 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.h
@@ -36,7 +36,6 @@ public:
   //@name Gaudi STool Implementation
   //@{
   virtual StatusCode initialize() override;          //!< Tool init
-  virtual StatusCode finalize() override;            //!< Tool finalize
   //@}
   
   //@name reimplemented from IInDetConditionsTool
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx
index 01cb66d16d8cc6aafe95b64062d823ca5222a772..b5640e503f447e369f134ae75390c67820b246b4 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx
@@ -17,7 +17,7 @@ SCT_ConfigurationConditionsTool::SCT_ConfigurationConditionsTool(const std::stri
 
 // Initialize
 StatusCode SCT_ConfigurationConditionsTool::initialize() {
-  ATH_MSG_INFO("Initializing configuration");
+  ATH_MSG_DEBUG("Initializing configuration");
 
   ATH_CHECK(detStore()->retrieve(m_pHelper, "SCT_ID"));
 
@@ -28,13 +28,6 @@ StatusCode SCT_ConfigurationConditionsTool::initialize() {
   return StatusCode::SUCCESS;
 }
 
-// Finalize
-StatusCode SCT_ConfigurationConditionsTool::finalize() {
-  ATH_MSG_INFO("Configuration finalize");
-
-  return StatusCode::SUCCESS;
-}
-
 // What level of element can this service report about
 bool SCT_ConfigurationConditionsTool::canReportAbout(InDetConditions::Hierarchy h) const {
   return (h == InDetConditions::SCT_STRIP or
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h
index 9f99fd80841066ba2999a72978875712b51639cf..41125f081c17a87f1a4f614636b106728e651daa 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h
@@ -1,12 +1,12 @@
 // -*- C++ -*-
 
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
  * @file SCT_ConfigurationConditionsTool.h
- * header file for service which reads SCT configuration from database
+ * header file for tool which reads SCT configuration from database
  * @author shaun.roe@cern.ch, gwilliam@mail.cern.ch
 **/
 
@@ -41,15 +41,14 @@ class SCT_ID;
 class SCT_ConfigurationConditionsTool: public extends<AthAlgTool, ISCT_ConfigurationConditionsTool> {
  public:
 
-  //@name Service methods
+  //@name Tool methods
   //@{
   SCT_ConfigurationConditionsTool(const std::string& type, const std::string& name, const IInterface* parent);
   virtual ~SCT_ConfigurationConditionsTool() = default;
   virtual StatusCode initialize() override;
-  virtual StatusCode finalize() override;
   //@}
   
-  /**Can the service report about the given component? (chip, module...)*/
+  /**Can the tool report about the given component? (chip, module...)*/
   virtual bool                          canReportAbout(InDetConditions::Hierarchy h) const override;
   
   /**Is the detector element good?*/
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
index 3f9b5493b2c165cd2f9cfc56af1696d5beb4248b..79eeb5244ef9b5050835d400c32142ea40e7d446 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
@@ -15,7 +15,7 @@ SCT_LinkMaskingTool::SCT_LinkMaskingTool(const std::string& type, const std::str
 
 // Initialize
 StatusCode SCT_LinkMaskingTool::initialize() {
-  ATH_MSG_INFO("Initializing configuration");
+  ATH_MSG_DEBUG("Initializing configuration");
 
   // Retrieve SCT ID helper
   if (detStore()->retrieve(m_sctHelper, "SCT_ID").isFailure()) {
@@ -29,12 +29,6 @@ StatusCode SCT_LinkMaskingTool::initialize() {
   return StatusCode::SUCCESS;
 }
 
-// Finalize
-StatusCode SCT_LinkMaskingTool::finalize() {
-  ATH_MSG_INFO("Configuration finalize");
-  return StatusCode::SUCCESS;
-}
-
 // What level of element can this service report about
 bool SCT_LinkMaskingTool::canReportAbout(InDetConditions::Hierarchy h) const {
   return (h==InDetConditions::SCT_SIDE or h==InDetConditions::DEFAULT); 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.h
index b5ad7ff6f4c6a121af70a9d3d9a213377394307e..a0c825173fe873a29142a4d3ed82dd3bce84dae4 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -38,7 +38,6 @@ public:
   SCT_LinkMaskingTool(const std::string& type, const std::string& name, const IInterface* parent);
   virtual ~SCT_LinkMaskingTool() = default;
   virtual StatusCode initialize() override;
-  virtual StatusCode finalize() override;
   //@}
   
   /**Can the service report about the given component? (chip, module...)*/
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.cxx
index 7832fc63c83d9badde54e6b93690a5bc7c7d4754..48aece39e277a9bcab83041967ee681cb27a0a0b 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -49,7 +49,7 @@ SCT_CablingTool::SCT_CablingTool(const std::string& type, const std::string& nam
 //
 StatusCode
 SCT_CablingTool::initialize() {
-  ATH_MSG_INFO("Initialize SCT cabling");
+  ATH_MSG_DEBUG("Initialize SCT cabling");
   const std::string cablingDataSource = m_cablingDataSource.value();
   m_usingDatabase=(cablingDataSource == coracool) or (cablingDataSource == coolVectorPayload) or (cablingDataSource == file);
   ATH_CHECK(detStore()->retrieve(m_idHelper, "SCT_ID"));
@@ -57,13 +57,6 @@ SCT_CablingTool::initialize() {
   return StatusCode::SUCCESS;
 }
 
-// 
-StatusCode
-SCT_CablingTool::finalize() {
-  ATH_MSG_INFO("Thank-you for using the SCT_CablingTool");
-  return StatusCode::SUCCESS;
-}
-
 //
 unsigned int
 SCT_CablingTool::size(const EventContext& ctx) const {
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.h b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.h
index 904c37f0a09d65c52d2b2ad40b855f089ff4f8b5..ea820fc607a4a2866a4e1f0976b87a26ebb5deda 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.h
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.h
@@ -44,7 +44,6 @@ class SCT_CablingTool: public extends<AthAlgTool, ISCT_CablingTool> {
   SCT_CablingTool(const std::string& type, const std::string& name, const IInterface* parent);
   virtual ~SCT_CablingTool() = default;
   virtual StatusCode initialize() override;
-  virtual StatusCode finalize() override;
   //@}
   
   //@name ISCT_CablingTool methods implemented, these are visible to clients
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
index 0409f5acca3962696bfa95a631f92e627ef54d42..95e28a0906eb6a45ee1816f875181e69cee9c7d6 100755
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
@@ -113,8 +113,6 @@ StatusCode SiTrackerSpacePointFinder::initialize()
 
   if (!m_monTool.empty()) CHECK(m_monTool.retrieve());
 
-  ATH_MSG_INFO( "SiTrackerSpacePointFinder::initialized for package version " << PACKAGE_VERSION );
-  
   return StatusCode::SUCCESS;
 }
 
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h
index fa5d4b163133258a3f8a9be98866743e205d51fd..7d11fb5e92aed41ac1db46604966b4d3b8c6a8bb 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef InDetMultipleVertexSeedFinder_DivisiveMultiSeedFinder_H
@@ -29,9 +29,7 @@ namespace InDet
  
   public:
    
-   StatusCode initialize();
- 
-   StatusCode finalize();
+   virtual StatusCode initialize() override;
 
 /**
  * Constructor and destructor
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h
index 0f4a651e8a15395a11db8f974304a86d2c2f4580..2ccf1445c2f98f168126c0cc403a59541d5e18e4 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef InDetMultipleVertexSeedFinder_HistogrammingMultiSeedFinder_H
@@ -42,9 +42,7 @@ namespace InDet
  {
   public:
    
-   StatusCode initialize();
- 
-   StatusCode finalize();
+   virtual StatusCode initialize() override;
 
 /**
  * Constructor and destructor
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h
index ce611cefbadfee492b9671c213a444318f3d2049..fbbf71e2a2343608e715312e69359f0788742d00 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h
@@ -29,9 +29,7 @@ namespace InDet
  {
   public:
   
-   StatusCode initialize();
- 
-   StatusCode finalize();
+   virtual StatusCode initialize() override;
 
 /**
  * Constructor and destructor
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx
index eb229f8d590bc6bcee8367561b31ffcba9c7eb12..dbec9d17a39232f6136f555bf042caf3ad5f58bc 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h"
@@ -60,12 +60,7 @@ namespace InDet
    
   return StatusCode::SUCCESS;
  }//end of initialize mtehod
- 
- StatusCode DivisiveMultiSeedFinder::finalize()
- {
-  msg(MSG::INFO)  << "Finalize successful" << endmsg;
-  return StatusCode::SUCCESS;
- }
+
  
  DivisiveMultiSeedFinder::DivisiveMultiSeedFinder(const std::string& t, const std::string& n, const
  IInterface*p):AthAlgTool(t,n,p), 
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx
index e94910a76cb907d4044aac2a137fa70879869f57..fc7c3bd7441b62cae33a76829bce221efefc0ffd 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h"
@@ -51,12 +51,7 @@ namespace InDet
                 
   return StatusCode::SUCCESS;
  }//end of initialize mtehod
- 
- StatusCode HistogrammingMultiSeedFinder::finalize()
- {
-  msg(MSG::INFO)  << "Finalize successful" << endmsg;
-  return StatusCode::SUCCESS;
- }
+
 
  HistogrammingMultiSeedFinder::HistogrammingMultiSeedFinder(const std::string& t, const std::string& n, const IInterface*p):
          AthAlgTool(t,n,p), 
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx
index a2e3114483555c5f2e61eef79c662f90798f33f8..20e5ecc6f9045d80abdeedfb2f31c96117e0a43d 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx
@@ -55,12 +55,7 @@ namespace InDet
   return StatusCode::SUCCESS;
  }//end of initialize mtehod
  
- StatusCode SlidingWindowMultiSeedFinder::finalize()
- {
-  msg(MSG::INFO)  << "Finalize successful" << endmsg;
-  return StatusCode::SUCCESS;
- }
- 
+
  SlidingWindowMultiSeedFinder::SlidingWindowMultiSeedFinder(const std::string& t, const std::string& n, const
                                                             IInterface*p):AthAlgTool(t,n,p), 
                                                                           m_clusterLength(5.),
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h
index a2dea76b6db801804c581a024a78dd0b7a0f9693..2ea663f5559a7d906cf39c57c616b18c5d5de802 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef InDetMultipleVertexSeedFinderUtils_InDetTrackClusterCleaningTool_H
@@ -40,11 +40,9 @@ namespace InDet
  {
   public:
    
-   StatusCode initialize();
+   virtual StatusCode initialize() override;
     
-   StatusCode finalize();
-  
-   InDetTrackClusterCleaningTool(const std::string& t, const std::string& n, const IInterface*  p); 
+   InDetTrackClusterCleaningTool(const std::string& t, const std::string& n, const IInterface*  p);
     
    static const InterfaceID& interfaceID() {return IID_InDetTrackClusterCleaningTool;}
  
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h
index 7e95de1293c1ea8aeb760172abb4135e5d0dc1d4..beae551f65a3d3d29d5386499a28e1c1ccd9a712 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef InDetMultipleVertexSeedFinderUtils_InDetTrackZ0SortingTool_H
@@ -41,11 +41,9 @@ namespace InDet
  
   public:
    
-   StatusCode initialize();
+   virtual StatusCode initialize() override;
     
-   StatusCode finalize();
-  
-   InDetTrackZ0SortingTool(const std::string& t, const std::string& n, const IInterface*  p); 
+   InDetTrackZ0SortingTool(const std::string& t, const std::string& n, const IInterface*  p);
     
    static const InterfaceID& interfaceID() {return IID_InDetTrackZ0SortingTool;}
  
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx
index e9ff208c4833ca03740a095493377f3977713f5b..45a8c646f6d5bfe68b10718bd88bbd8dce57fefa 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h"
@@ -26,12 +26,7 @@ namespace InDet
   return StatusCode::SUCCESS;
  }//end of initialize method
     
- StatusCode InDetTrackClusterCleaningTool::finalize()
- {
-  msg(MSG::INFO)  << "Finalize successful" << endmsg;
-  return StatusCode::SUCCESS;
- }//end of finalize method
-  
+
  InDetTrackClusterCleaningTool::InDetTrackClusterCleaningTool(const std::string& t, const std::string& n, const IInterface*  p):
  AthAlgTool(t,n,p), m_extrapolator("Trk::Extrapolator") ,m_zOffset(3.)
  {
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx
index 286beb825edd626b4f3d196d93b13e44a28993fa..a6af97148efb922c2320cc16e4142b3fb56e1f2a 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h"
@@ -26,13 +26,6 @@ namespace InDet
  }//end of initialize method
     
 
- StatusCode InDetTrackZ0SortingTool::finalize()
- {
-  msg(MSG::INFO)  << "Finalize successful" << endmsg;
-  return StatusCode::SUCCESS;
- }//end of finalize method
-  
-
  InDetTrackZ0SortingTool::InDetTrackZ0SortingTool(const std::string& t, const std::string& n, const IInterface*  p):
  AthAlgTool(t,n,p), m_extrapolator("Trk::Extrapolator")
  {
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
index ecc984ff3cc74672a0e04ccbb3afaa66204c1e69..ed687a57f512d38b2e7f5cfff37e3b2b9fbce182 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
@@ -65,8 +65,7 @@ namespace InDet {
   public:
     
 
-    StatusCode initialize();
-    StatusCode finalize();
+    virtual StatusCode initialize() override;
 
     InDetImprovedJetFitterVxFinder(const std::string& t, const std::string& n, const IInterface*  p);
 
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h
index 5079e999341f034f4ac44bcb828ea57bf3ce5d48..451ccd0e3e639c72ad9e29ccde1ae509e63e8f3b 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h
@@ -62,8 +62,7 @@ namespace InDet {
     }
  
 
-    StatusCode initialize();
-    StatusCode finalize();
+    virtual StatusCode initialize() override;
 
     InDetJetFitterUtils(const std::string& t, const std::string& n, const IInterface*  p);
 
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
index c35aea272bb75610fe1f6438d0b95a8d34b9afef..13cd285d3563d02e6a5e86843399cf797ee36837 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
@@ -56,8 +56,7 @@ namespace InDet {
   public:
  
 
-    StatusCode initialize();
-    StatusCode finalize();
+    virtual StatusCode initialize() override;
 
     InDetJetFitterVxFinder(const std::string& t, const std::string& n, const IInterface*  p);
 
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h
index f5308e779b83e947d7a5101b87053893359fe4e7..abca69872426df583b3cb22a19113e42ccd75500 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h
@@ -36,9 +36,7 @@ public:
         return IID_JetFitterMultiStageFit;
     }
 
-    StatusCode initialize();
-
-    StatusCode finalize();
+    virtual StatusCode initialize() override;
 
     JetFitterMultiStageFit(const std::string &t, const std::string &n, const IInterface *p);
 
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h
index e8d4d1a1eaa101ecddb5c6554fe2f5740fdb1e29..7ab33e6a68e704985f9e22fc066a937ba1129d23 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h
@@ -39,8 +39,7 @@ namespace InDet {
             return IID_JetFitterTrackSelectorTool;
         }
 
-        StatusCode initialize();
-        StatusCode finalize();
+        virtual StatusCode initialize() override;
 
         JetFitterTrackSelectorTool(const std::string &t, const std::string &n, const IInterface *p);
         ~JetFitterTrackSelectorTool();
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx
index 6c1a49d750a893da03a28bfd11dc4c9326118dd9..94277862eb42bdfe77e7f3b08eb1151d62286cdb 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx
@@ -96,12 +96,6 @@ namespace InDet
 
   StatusCode InDetImprovedJetFitterVxFinder::initialize() {
     
-    StatusCode sc = AlgTool::initialize();
-    if(sc.isFailure()) {
-      msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
-      return sc;
-    }
-    
     if (m_theTrackSelector.retrieve().isFailure()) {
       msg(MSG::ERROR) << "Could not find TrackSelector tool." << endmsg;
       return StatusCode::FAILURE;
@@ -122,18 +116,10 @@ namespace InDet
       return StatusCode::FAILURE;
     } else msg(MSG::INFO) << " JetFitterMultiStageFit retrieved" << endmsg;
 
-    msg(MSG::INFO) << "Initialize successful" << endmsg;
     return StatusCode::SUCCESS;
   }
   
 
-   StatusCode InDetImprovedJetFitterVxFinder::finalize() {
-
-     msg(MSG::INFO)  << "Finalize successful" << endmsg;
-    return StatusCode::SUCCESS;
-
-  } 
-
   Trk::VxSecVertexInfo* InDetImprovedJetFitterVxFinder::findSecVertex(const xAOD::Vertex & primaryVertex,
 								      const TLorentzVector & jetMomentum,
 								      const std::vector<const xAOD::IParticle*> & inputTracks) const
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx
index 8e0704beb5a2c1c08af6eac2141b08ef8b761e14..199f1d3c598dc26aa6d63f035da0a776ea0c9f21 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx
@@ -82,17 +82,9 @@ namespace InDet
 
   StatusCode InDetJetFitterUtils::initialize() {
     
-    
-    StatusCode sc = AlgTool::initialize();
-    if(sc.isFailure())
-      {
-	msg(MSG::ERROR) <<" Unable to initialize the AlgTool"<<endmsg;
-	return sc;
-      }
-
     if (!m_LinearizedTrackFactory.empty())
     {
-      sc=m_LinearizedTrackFactory.retrieve();
+      StatusCode sc=m_LinearizedTrackFactory.retrieve();
       if (sc.isFailure()) {
         msg(MSG::FATAL) << "Could not find TrackLinearizer tool." << endmsg;
         return StatusCode::FAILURE;
@@ -106,7 +98,7 @@ namespace InDet
     
     if (!m_extrapolator.empty())
     {
-      sc=m_extrapolator.retrieve();
+      StatusCode sc=m_extrapolator.retrieve();
       if (sc.isFailure()) {
         msg(MSG::FATAL) << "Could not find Extrapolator tool." << endmsg;
         return StatusCode::FAILURE;
@@ -117,18 +109,10 @@ namespace InDet
       }
     }
     
-    msg(MSG::INFO)  << "Initialize successful" << endmsg;
     return StatusCode::SUCCESS;
   }
   
 
-  StatusCode InDetJetFitterUtils::finalize() {
-    
-    msg(MSG::INFO)  << "Finalize successful" << endmsg;
-    return StatusCode::SUCCESS;
-    
-  } 
- 
   std::pair<AmgMatrix(3,3),AmgSymMatrix(3)>  InDetJetFitterUtils::getPosMomentumAndMomentumCovMatrix(const Trk::LinearizedTrack* linTrack,
 												   const AmgSymMatrix(3) & vrt_cov,
 												   const AmgSymMatrix(3) & vrt_weight) const
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx
index d9c0440d058030846b819648752d4a84ebc79c8d..c6b4d29acbdd4b2ea6389041bdb2e91b4f2f35fc 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx
@@ -71,52 +71,17 @@ namespace InDet
   
 
   StatusCode InDetJetFitterVxFinder::initialize() {
-    
-    
-    StatusCode sc = AthAlgTool::initialize();
-    if(sc.isFailure())
-      {
-	msg(MSG::ERROR) << " Unable to initialize the AlgTool" << endmsg;
-	return sc;
-      }
-    
+
     //retrieving the udator itself 	 
-    sc =  m_helper.retrieve();
-    if(sc.isFailure()) 	  { 	 
-      msg(MSG::ERROR) << " Unable to retrieve "<<m_helper<<endmsg; 	 
-      return StatusCode::FAILURE; 	 
-    }else msg(MSG::INFO) << "JetFitter Helper retrieved"<<endmsg; 
-    
-    
-    sc = m_initializationHelper.retrieve();
-    if(sc.isFailure()) 	  { 	 
-      msg(MSG::ERROR) << " Unable to retrieve "<<m_initializationHelper<<endmsg; 	 
-      return StatusCode::FAILURE; 	 
-    }else msg(MSG::INFO) << "JetFitter Initialization Helper retrieved"<<endmsg; 
-    
-    sc = m_routines.retrieve();
-    if(sc.isFailure()) 	  { 	 
-      msg(MSG::ERROR) << " Unable to retrieve the JetFitter routines"<<m_routines<<endmsg; 	 
-      return StatusCode::FAILURE; 	 
-    }else msg(MSG::INFO) << "JetFitter Routines class retrieved"<<endmsg; 
-
-    if(m_trkFilter.retrieve().isFailure()) {
-      msg(MSG::ERROR) << " Unable to retrieve "<<m_trkFilter<<endmsg;
-      return StatusCode::FAILURE;
-    } else msg(MSG::INFO) << "Track filter retrieved"<<endmsg; 
-    
-    msg(MSG::INFO) << "Initialize successful" << endmsg;
+    ATH_CHECK( m_helper.retrieve() );
+    ATH_CHECK( m_initializationHelper.retrieve() );
+    ATH_CHECK( m_routines.retrieve() );
+    ATH_CHECK( m_trkFilter.retrieve() );
+
     return StatusCode::SUCCESS;
   }
   
 
-   StatusCode InDetJetFitterVxFinder::finalize() {
-
-    msg(MSG::INFO) <<  "Finalize successful" << endmsg;
-    return StatusCode::SUCCESS;
-
-  } 
-
   const Trk::VxSecVertexInfo* InDetJetFitterVxFinder::findSecVertex(const Trk::RecVertex & primaryVertex,
 							      const TLorentzVector & jetMomentum,
 							      const std::vector<const Trk::TrackParticleBase*> & myTracks) const {
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx
index 5a100fc739f8b185f0b454c013ed45a61dd4aa71..975ca8b0ec7b654d67fbf8b1d7bbf720b6388d01 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx
@@ -30,46 +30,14 @@ JetFitterMultiStageFit::~JetFitterMultiStageFit() {}
 
 StatusCode JetFitterMultiStageFit::initialize() {
 
-    StatusCode sc = AlgTool::initialize();
-    if (sc.isFailure()) {
-        msg(MSG::ERROR) << " Unable to initialize the AlgTool" << endmsg;
-        return sc;
-    }
-
-    sc =  m_helper.retrieve();
-    if(sc.isFailure()) 	  {
-        msg(MSG::ERROR) << " Unable to retrieve "<<m_helper<<endmsg;
-        return StatusCode::FAILURE;
-    }else msg(MSG::INFO) << "JetFitter Helper retrieved"<<endmsg;
-
-    sc = m_initializationHelper.retrieve();
-    if(sc.isFailure()) 	  {
-        msg(MSG::ERROR) << " Unable to retrieve "<<m_initializationHelper<<endmsg;
-        return StatusCode::FAILURE;
-    }else msg(MSG::INFO) << "JetFitter Initialization Helper retrieved"<<endmsg;
-
-    sc = m_routines.retrieve();
-    if(sc.isFailure())
-    {
-        msg(MSG::ERROR) << " Unable to retrieve the JetFitter routines"<<m_routines<<endmsg;
-        return StatusCode::FAILURE;
-    }
-    else msg(MSG::INFO) << "JetFitter Routines class retrieved"<<endmsg;
-
-    if (m_jetFitterUtils.retrieve().isFailure())
-    {
-        msg(MSG::ERROR) << "Could not find JetFitterUtils tool." << endmsg;
-        return StatusCode::FAILURE;
-    }
-    else msg(MSG::INFO) << " JetFitterUtils retrieved" << endmsg;
+    ATH_CHECK( m_helper.retrieve() );
+    ATH_CHECK( m_initializationHelper.retrieve() );
+    ATH_CHECK( m_routines.retrieve() );
+    ATH_CHECK( m_jetFitterUtils.retrieve() );
 
     return StatusCode::SUCCESS;
 }
 
-StatusCode JetFitterMultiStageFit::finalize() {
-    msg(MSG::INFO) << "Finalize successful" << endmsg;
-    return StatusCode::SUCCESS;
-}
 
 Trk::VxJetCandidate* JetFitterMultiStageFit::doTwoStageFit(const Trk::RecVertex & primaryVertex,
                                                         const TLorentzVector & jetMomentum,
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
index 5625ed49e86f6ce89d7d1242e89016199bb9858e..6c122a0daa160d5626c135a68977a26f6a3e1263 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
@@ -16,11 +16,6 @@ using namespace InDet;
 
     StatusCode JetFitterTrackSelectorTool::initialize() {
 
-        if ( AlgTool::initialize().isFailure() ) {
-            msg(MSG::ERROR) << " Unable to initialize the AlgTool" << endmsg;
-            return StatusCode::FAILURE;
-        }
-
 	if ( m_trkFilter.retrieve().isFailure() ) {
 	  msg(MSG::ERROR) << " Unable to retrieve InDet::InDetDetailedTrackSelectorTool" << endmsg;
 	  return StatusCode::FAILURE;
@@ -39,10 +34,6 @@ using namespace InDet;
         return StatusCode::SUCCESS;
     }
 
-    StatusCode JetFitterTrackSelectorTool::finalize() {
-        msg(MSG::INFO) << "Finalize successful" << endmsg;
-        return StatusCode::SUCCESS;
-    }
 
     const Trk::SelectedTracksInJet* JetFitterTrackSelectorTool::doTrackSelection( const xAOD::Vertex &primaryVertex,
 										  const TLorentzVector &jetMomentum,
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
index cca93adf1f110f164b432826d8d8cdb29de05fae..007d78cf7437a948f374de5cd211580a701ed37b 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef InDetTrackSelectorTool_InDetCosmicTrackSelectorTool_H
@@ -32,9 +32,7 @@ namespace InDet
 
   public:
 
-    StatusCode initialize();
-
-    StatusCode finalize();
+    virtual StatusCode initialize() override;
 
     InDetCosmicTrackSelectorTool(const std::string& t, const std::string& n, const IInterface*  p);
 
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
index b282fadd429777f8c51562d40018cbc639a25122..b121018457f559283025a69c2dca42abaeabef66 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef InDetIsoTrackSelectorTool_InDetIsoTrackSelectorTool_H
@@ -35,8 +35,7 @@ namespace InDet
 
     public:
       /** Athena AlgTool methods */
-      StatusCode initialize();
-      StatusCode finalize();
+      virtual StatusCode initialize() override;
 
       /** Constructor / Destructor */
       InDetIsoTrackSelectorTool(const std::string& t, const std::string& n, const IInterface*  p);
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
index 61e6889b7d20da524b90c7f60a7ea323e2bf1c8b..386090734df037bd17f149c6eec1dfa17b665f8b 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef InDetTrackSelectorTool_InDetTrackSelectorTool_H
@@ -44,9 +44,7 @@ namespace InDet
 
     public:
 
-      StatusCode initialize();
-
-      StatusCode finalize();
+      virtual StatusCode initialize() override;
 
       InDetTrackSelectorTool(const std::string& t, const std::string& n, const IInterface*  p);
 
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
index a81a1e9e2e5dbf21adf45435406f734f865f7dd6..e399c8e5fc548e6cd596cdd9338c5b8eeba16a77 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef InDetTrackSelectorTool_InDetTrtDriftCircleCutTool_H
@@ -26,11 +26,9 @@ namespace InDet{
       
     public:
   
-      StatusCode initialize();
+      virtual StatusCode initialize() override;
       
-      StatusCode finalize();
-      
-      InDetTrtDriftCircleCutTool(const std::string& t, const std::string& n, const IInterface*  p); 
+      InDetTrtDriftCircleCutTool(const std::string& t, const std::string& n, const IInterface*  p);
       
       ~InDetTrtDriftCircleCutTool();
       
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx
index 4bc59141999383fdb055c0ba5693c7aa2cc4504e..4be1d24aa4ff7aca73485460b91f57ba95bdcb74 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h"
@@ -45,11 +45,6 @@ namespace InDet
   //----------------------------------------------------------------------------
   StatusCode  InDetCosmicTrackSelectorTool::initialize()
   {
-    if(AthAlgTool::initialize().isFailure()) {
-      msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
-      return StatusCode::FAILURE;
-    }
-
      m_trackSumToolAvailable = false;
      if (!m_trackSumTool.empty()) {
        if(m_trackSumTool.retrieve().isFailure())
@@ -67,13 +62,6 @@ namespace InDet
      return StatusCode::SUCCESS;
   }
 
-  //----------------------------------------------------------------------------
-  StatusCode InDetCosmicTrackSelectorTool::finalize()
-  {
-    ATH_MSG_INFO("Finalize successful");
-    return StatusCode::SUCCESS;
-  }
-
   //----------------------------------------------------------------------------
   bool InDetCosmicTrackSelectorTool::decision(const Trk::Track & track, const Trk::Vertex * vertex) const
   {
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetIsoTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetIsoTrackSelectorTool.cxx
index 41ca00683acdc83d87ceccfa97b3a4ea3082eab0..a89d0425286bb9d79839419b5537baf050a6a400 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetIsoTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetIsoTrackSelectorTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h"
@@ -62,12 +62,6 @@ StatusCode InDet::InDetIsoTrackSelectorTool::initialize()
   return StatusCode::SUCCESS;
 }
 
-//_______________________________________________________________________________
-StatusCode InDet::InDetIsoTrackSelectorTool::finalize()
-{
-  ATH_MSG_INFO("Finalize successful");
-  return StatusCode::SUCCESS;
-}
 
 //_______________________________________________________________________________
 bool InDet::InDetIsoTrackSelectorTool::decision(const Trk::AtaStraightLine& atl, const Trk::Track& track) const
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx
index 6e45d318c9503a963ec60e1e533ad10d36c4b7b5..9d54d1e48ea816050663774b57a3bb9e313ca8af 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "InDetTrackSelectorTool/InDetTrackSelectorTool.h"
@@ -51,12 +51,6 @@ InDetTrackSelectorTool::~InDetTrackSelectorTool()
 //_______________________________________________________________________________
 StatusCode InDetTrackSelectorTool::initialize()
 {
-  StatusCode sc = AthAlgTool::initialize();
-  if(sc.isFailure()) {
-    msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
-    return StatusCode::FAILURE;
-  }
-
   m_trackSumToolAvailable = false;
   if (!m_trackSumTool.empty())
   {
@@ -79,12 +73,6 @@ StatusCode InDetTrackSelectorTool::initialize()
   return StatusCode::SUCCESS;
 }
 
-//_______________________________________________________________________________
-StatusCode InDetTrackSelectorTool::finalize()
-{
-  ATH_MSG_INFO("Finalize successful");
-  return StatusCode::SUCCESS;
-}
 
 //_______________________________________________________________________________
 bool InDetTrackSelectorTool::decision(const Trk::Track & track, const Trk::Vertex * vertex) const
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx
index d46a2587db7dcda0eec247e2f059ff127582a73f..0df692d48f84379598c6c5cfa8f6ecab085c876e 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h"
@@ -7,26 +7,12 @@
 
 StatusCode  InDet::InDetTrtDriftCircleCutTool::initialize()
 {
-  StatusCode sc = AthAlgTool::initialize();
-
-
-  if(sc.isFailure()){
-    msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
-    return StatusCode::FAILURE;
-  }
-
-    // Read key
-   ATH_CHECK( m_strawReadKey.initialize() );
+  // Read key
+  ATH_CHECK( m_strawReadKey.initialize() );
  
   return StatusCode::SUCCESS;
 }
     
-StatusCode InDet::InDetTrtDriftCircleCutTool::finalize()
-{
-  msg(MSG::INFO)  << "Finalize successful" << endmsg;
-  return StatusCode::SUCCESS;
-}
-    
 InDet::InDetTrtDriftCircleCutTool::InDetTrtDriftCircleCutTool(const std::string& t, const std::string& n, const IInterface*  p)
   :AthAlgTool(t,n,p),
    m_minOffset(0),
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
index 8b3d9b2588351098284025f3f2cc908ed6e54c9b..5d5841a7b8ce57d947785c86ce9f70f12bb7bd42 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
@@ -55,7 +55,7 @@ ClusterMakerTool::ClusterMakerTool(const std::string& t,
 StatusCode  ClusterMakerTool::initialize(){
   // Code entered here will be executed once at program start.
 
-   ATH_MSG_INFO ( name() << " initialize()" );
+   ATH_MSG_DEBUG ( name() << " initialize()" );
 
    if (not m_pixelCabling.empty()) {
      ATH_CHECK(m_pixelCabling.retrieve());
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx
index 3d03b69aaf4fe0adc7fb1afdb8d609ec66fbdc7e..022ab47d4f78c696c5bcea1bb49da0a7e2148fdf 100755
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx
@@ -81,7 +81,7 @@ RungeKuttaIntersector::RungeKuttaIntersector (const std::string&	type,
 StatusCode
 RungeKuttaIntersector::initialize(){
     // print name and package version
-    ATH_MSG_DEBUG( "RungeKuttaIntersector::initialize()" << " - package version " << PACKAGE_VERSION );
+    ATH_MSG_DEBUG( "RungeKuttaIntersector::initialize()" );
 
     // initialize base class
     if (StatusCode::SUCCESS != AlgTool::initialize()) return StatusCode::FAILURE;
@@ -107,9 +107,9 @@ RungeKuttaIntersector::initialize(){
 StatusCode
 RungeKuttaIntersector::finalize()
 {
-    msg(MSG::INFO)  << "finalized after " << m_countExtrapolations << " extrapolations,";
     if (m_countExtrapolations)
     {
+    msg(MSG::INFO)  << "finalized after " << m_countExtrapolations << " extrapolations,";
 	double norm = 1./static_cast<double>(m_countExtrapolations);
 	msg(MSG::INFO)   << std::setiosflags(std::ios::fixed)
 			 << " taking an average" << std::setw(7) << std::setprecision(1)
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx
index a16fc7b52090d259df8392983554f3c9b3d37c99..ed142d802a30dd85766154904e61cf288b8bb1b0 100755
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx
+++ b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx
@@ -53,8 +53,6 @@ SolenoidalIntersector::SolenoidalIntersector (const std::string&	type,
 StatusCode
 SolenoidalIntersector::initialize()
 {
-    // print name and package version
-    ATH_MSG_INFO( "SolenoidalIntersector::initialize() - package version " << PACKAGE_VERSION );
     ATH_CHECK( m_solenoidParametrizationKey.initialize() );
     ATH_CHECK(m_rungeKuttaIntersector.retrieve());
     return StatusCode::SUCCESS;
@@ -63,7 +61,7 @@ SolenoidalIntersector::initialize()
 StatusCode
 SolenoidalIntersector::finalize()
 {
-    ATH_MSG_INFO( "finalized after " << m_countExtrapolations << " extrapolations with "
+    ATH_MSG_DEBUG( "finalized after " << m_countExtrapolations << " extrapolations with "
 		  << m_countRKSwitches << " switches to RK integration");
 
     return StatusCode::SUCCESS;
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h
index 37ca2bfa21be21cb5b78ac78e162a2794ac8912a..4e589d59d2a5788a117580e40c606f7bfcb41e5e 100755
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019, 2020 CERN for the benefit of the ATLAS collaboration
 */
 
 //////////////////////////////////////////////////////////////////////
@@ -26,9 +26,7 @@ public:
     StraightLineIntersector	(const std::string& type, 
 				 const std::string& name,
 				 const IInterface* parent);
-    virtual ~StraightLineIntersector	(void); 	// destructor
 
-    virtual StatusCode			initialize() override;
     virtual StatusCode			finalize() override;
 
     /**IIntersector interface method for general Surface type */
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx
index a0865085d256749f50aed63efc064b7f80a4cdd7..4018678046a16aca24a12714ac5f56df71df3c75 100755
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019, 2020 CERN for the benefit of the ATLAS collaboration
 */
 
 //////////////////////////////////////////////////////////////////////
@@ -32,26 +32,10 @@ StraightLineIntersector::StraightLineIntersector (const std::string&	type,
 {
 }
 
-StraightLineIntersector::~StraightLineIntersector (void)
-{}
- 
-StatusCode
-StraightLineIntersector::initialize()
-{
-    // print name and package version
-    ATH_MSG_INFO( "StraightLineIntersector::initialize()"
-		  << " - package version " << PACKAGE_VERSION );
-
-    // initialize base class
-    if (StatusCode::SUCCESS != AlgTool::initialize()) return StatusCode::FAILURE;
-
-    return StatusCode::SUCCESS;
-}
-
 StatusCode
 StraightLineIntersector::finalize()
 {
-    ATH_MSG_INFO( "finalized after " << m_countExtrapolations << " extrapolations" );
+    ATH_MSG_DEBUG( "finalized after " << m_countExtrapolations << " extrapolations" );
 
     return StatusCode::SUCCESS;
 }
diff --git a/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx b/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx
index 427273883f54cd27f2a952a6f8460676374c8caa..ce3c21a6eed06743426943cd89bb29e6b01152a9 100755
--- a/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx
@@ -82,8 +82,6 @@ namespace Trk
 
   StatusCode
   MaterialAllocator::initialize() {
-    // print name and package version
-    ATH_MSG_INFO("MaterialAllocator::initialize() - package version " << PACKAGE_VERSION);
 
     // fill WARNING messages
     m_messageHelper->setMaxNumberOfMessagesPrinted(m_maxWarnings);
@@ -99,45 +97,30 @@ namespace Trk
     m_messageHelper->setMessage(5, "spectrometerMaterial: extrapolateM finds no material on track");
 
     // retrieve the necessary Extrapolators (muon tracking geometry is very picky!)
-    if (m_extrapolator.retrieve().isFailure()) {
-      ATH_MSG_FATAL("Failed to retrieve tool " << m_extrapolator);
-      return StatusCode::FAILURE;
-    } 
-      ATH_MSG_INFO("Retrieved tool " << m_extrapolator);
-    
-    if (m_intersector.retrieve().isFailure()) {
-      ATH_MSG_FATAL("Failed to retrieve tool " << m_intersector);
-      return StatusCode::FAILURE;
-    } 
-      ATH_MSG_INFO("Retrieved tool " << m_intersector);
+    ATH_CHECK( m_extrapolator.retrieve() );
+    ATH_MSG_DEBUG("Retrieved tool " << m_extrapolator);
     
+    ATH_CHECK( m_intersector.retrieve() );
+    ATH_MSG_DEBUG("Retrieved tool " << m_intersector);
 
     // retrieve services
-    if (m_trackingGeometrySvc.retrieve().isFailure()) {
-      ATH_MSG_FATAL("Failed to retrieve Svc " << m_trackingGeometrySvc);
-      return StatusCode::FAILURE;
-    } 
-      ATH_MSG_INFO("Retrieved Svc " << m_trackingGeometrySvc);
+    ATH_CHECK( m_trackingGeometrySvc.retrieve() );
+    ATH_MSG_DEBUG("Retrieved Svc " << m_trackingGeometrySvc);
     
-
     // need to create the IndetExit and MuonEntrance TrackingVolumes
-    if (m_trackingVolumesSvc.retrieve().isFailure()) {
-      ATH_MSG_FATAL("Failed to retrieve Svc " << m_trackingVolumesSvc);
-      return StatusCode::FAILURE;
-    } 
-      ATH_MSG_INFO("Retrieved Svc " << m_trackingVolumesSvc);
-      m_calorimeterVolume = new Volume(
+    ATH_CHECK( m_trackingVolumesSvc.retrieve() );
+    ATH_MSG_DEBUG("Retrieved Svc " << m_trackingVolumesSvc);
+    m_calorimeterVolume = new Volume(
         m_trackingVolumesSvc->volume(ITrackingVolumesSvc::MuonSpectrometerEntryLayer));
-      m_indetVolume = new Volume(
+    m_indetVolume = new Volume(
         m_trackingVolumesSvc->volume(ITrackingVolumesSvc::CalorimeterEntryLayer));
-    
 
     if (m_useStepPropagator > 0 && m_stepPropagator.retrieve().isFailure()) {
       ATH_MSG_FATAL("Failed to retrieve Svc " << m_stepPropagator);
       return StatusCode::FAILURE;
     }
 
-// Field for StepPropagator
+    // Field for StepPropagator
     m_stepField = Trk::MagneticFieldProperties(Trk::FullField);
     if (m_useStepPropagator == 2) m_stepField = Trk::MagneticFieldProperties(Trk::FastField);
 
@@ -146,7 +129,6 @@ namespace Trk
 
   StatusCode
   MaterialAllocator::finalize() {
-    ATH_MSG_INFO("finalize() ");
 
     // summarize WARNINGs
     m_messageHelper->printSummary();
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterHelper.h b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterHelper.h
index 2d66357c20ca0e16ca2f8f8b6d9fa745f4bf088a..222bea9e38e3b1907b86650392a6b288a163f104 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterHelper.h
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterHelper.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -49,9 +49,6 @@ namespace Trk {
       return IID_JetFitterHelper;
     }
 
-    StatusCode initialize();
-    StatusCode finalize();
-
     /**
      * Constructor
      */
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterInitializationHelper.h b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterInitializationHelper.h
index 32216d66e1b52856ec20fdb850650dcdd2f49939..ee6df945073c74bdc207474e1ce4484492877e90 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterInitializationHelper.h
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterInitializationHelper.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -49,8 +49,7 @@ namespace Trk {
       return IID_JetFitterInitializationHelper;
     }
 
-    StatusCode initialize();
-    StatusCode finalize();
+    virtual StatusCode initialize() override;
 
     /**
      * Constructor
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterRoutines.h b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterRoutines.h
index e960a452f07b3b14a8ac232d6582d71bc9b150a9..a63bba83f5533190f37c8aab2dd2aa46b21395a2 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterRoutines.h
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/JetFitterRoutines.h
@@ -63,8 +63,7 @@ namespace Trk {
     }
  
 
-    StatusCode initialize();
-    StatusCode finalize();
+    virtual StatusCode initialize() override;
 
     /**
      * Constructor
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/KalmanVertexOnJetAxisSmoother.h b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/KalmanVertexOnJetAxisSmoother.h
index fb080e021f1493f86335a50bc373ebf6649d33a6..cdb9656c2fdccdd601d8983d7ff60cc9592d9aa4 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/KalmanVertexOnJetAxisSmoother.h
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/KalmanVertexOnJetAxisSmoother.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -49,9 +49,8 @@ namespace Trk
  {
   public: 
   
-   StatusCode initialize();
-   StatusCode finalize();
- 
+   virtual StatusCode initialize() override;
+
    /**
     * Constructor
     */
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/KalmanVertexOnJetAxisUpdator.h b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/KalmanVertexOnJetAxisUpdator.h
index cff8b3c5a9714690f37c4154f7c2588be224c80e..91c722ded1ca34e7b158e9daecb0ab64c502f43d 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/KalmanVertexOnJetAxisUpdator.h
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/KalmanVertexOnJetAxisUpdator.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -61,9 +61,7 @@ namespace Trk
      };
 
 
-
-  StatusCode initialize();
-  StatusCode finalize();
+  virtual StatusCode initialize() override;
 
   /**
    * Constructor
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/TrkDistanceFinderNeutralCharged.h b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/TrkDistanceFinderNeutralCharged.h
index 0e6f7a8c7b4e01d1f2e130e3373c9086651b50c0..2b46b420abbfc0deca07d776c06882624497fcf9 100644
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/TrkDistanceFinderNeutralCharged.h
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/TrkDistanceFinderNeutralCharged.h
@@ -36,9 +36,6 @@ class TrkDistanceFinderNeutralCharged : public AthAlgTool
       return IID_TrkDistanceFinderNeutralCharged;
     };
 
-    StatusCode initialize();
-    StatusCode finalize();
-
  private:
 
   //parameters for precision
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/TrkDistanceFinderNeutralNeutral.h b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/TrkDistanceFinderNeutralNeutral.h
index 080f4e628539163f30e09116d84f511bb598dc92..3b56d0df2ca78ddc6f00da990fddd1cd3b6a2e0d 100644
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/TrkDistanceFinderNeutralNeutral.h
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/TrkJetVxFitter/TrkDistanceFinderNeutralNeutral.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DISTNEUNEU_H
@@ -31,12 +31,6 @@ class TrkDistanceFinderNeutralNeutral : public AthAlgTool
       return IID_TrkDistanceFinderNeutralNeutral;
     };
 
-    StatusCode initialize();
-    StatusCode finalize();
-
- private:
-
-
 };
 
 //no error possible: an analytic solution is possible here!
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterHelper.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterHelper.cxx
index 39fbb58d78b6783a9deb82620e7ad481e49b1c44..c094b1ae95194552ec32d31496b198967fcc1020 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterHelper.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterHelper.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -44,20 +44,6 @@ namespace Trk
   JetFitterHelper::~JetFitterHelper() = default;
 
 
-  StatusCode JetFitterHelper::initialize() {
-
-    ATH_MSG_INFO( "Initialize successful" );
-    return StatusCode::SUCCESS;
-
-  }
-
-  StatusCode JetFitterHelper::finalize() {
-
-    ATH_MSG_INFO( "Finalize successful" );
-    return StatusCode::SUCCESS;
-
-  }
-  
   void JetFitterHelper::addTracksOfFirstVertexToSecondVertex(const VxVertexOnJetAxis & first,VxVertexOnJetAxis & second) const {
     
     
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterInitializationHelper.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterInitializationHelper.cxx
index 8232277534f136562fd7551f20428a8745ed99d4..d1c5ce62fa4697619bff7caefec3aa5d35b4a7de 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterInitializationHelper.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterInitializationHelper.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -99,19 +99,11 @@ namespace Trk
     }
     
 
-   ATH_MSG_INFO ("Initialize successful");
     return StatusCode::SUCCESS;
 
   }
 
-  StatusCode JetFitterInitializationHelper::finalize() {
 
-    ATH_MSG_INFO ("Finalize successful");
-    return StatusCode::SUCCESS;
-
-  }
-
-  
   /**
    * Initialize the JetCandidate using a vector of Trk::ITrackLink* - needed for example 
    * if you run on ESD (Track*), but you have additional neutral tracks (TrackParticleBase*)
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterRoutines.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterRoutines.cxx
index cf5bc4daeb12042476a578c03622d6a92505a544..48d38c6b352a79f15511c088d6a10dbbd4e2ee78 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterRoutines.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterRoutines.cxx
@@ -108,16 +108,9 @@ namespace Trk
 
     ATH_CHECK( m_smoother.retrieve() );
 
-    ATH_MSG_INFO( "Initialize successful" );
     return StatusCode::SUCCESS;
   }
 
-  StatusCode JetFitterRoutines::finalize() {
-
-    ATH_MSG_INFO( "Finalize successful" );
-    return StatusCode::SUCCESS;
-
-  }
 
   void JetFitterRoutines::initializeToMinDistancesToJetAxis(VxJetCandidate* myJetCandidate) const {
     
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisSmoother.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisSmoother.cxx
index dbe2ed27947bd2819bd57b33460c2e35fed78b08..794569e3a4b99a140730b52955dc1d0e6b0056a7 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisSmoother.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisSmoother.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrkJetVxFitter/KalmanVertexOnJetAxisSmoother.h"
@@ -43,12 +43,7 @@ namespace Trk
 
   return StatusCode::SUCCESS;
  }
- 
- StatusCode KalmanVertexOnJetAxisSmoother::finalize()
- {
-   ATH_MSG_INFO( "Finalize successful" );
-  return StatusCode::SUCCESS;
- }
+
  
  KalmanVertexOnJetAxisSmoother::KalmanVertexOnJetAxisSmoother(const std::string& t, const std::string& n, const IInterface*  p):
    AthAlgTool(t,n,p),
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisUpdator.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisUpdator.cxx
index fd380247508c228025ff85d53d550d946cd0f812..9174452f37c68bf1d9e2b91ddc6997c90cd1e891 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisUpdator.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisUpdator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrkJetVxFitter/KalmanVertexOnJetAxisUpdator.h"
@@ -48,12 +48,6 @@ namespace Trk{
   return StatusCode::SUCCESS;
  }
 
- StatusCode KalmanVertexOnJetAxisUpdator::finalize()
- {
-   ATH_MSG_INFO( "Finalize successful" );
-   return StatusCode::SUCCESS;
- }
-
 
   void KalmanVertexOnJetAxisUpdator::add(VxTrackAtVertex* trackToAdd,
                                          const VxVertexOnJetAxis* vertexToUpdate,
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/TrkDistanceFinderNeutralCharged.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/TrkDistanceFinderNeutralCharged.cxx
index 2efc9e6fa13c64396540f9df5ead1a2c09e97539..7dc6d0e07fd1bf4eb38cefda8b00f793f33d39c6 100644
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/TrkDistanceFinderNeutralCharged.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/TrkDistanceFinderNeutralCharged.cxx
@@ -31,20 +31,6 @@ TrkDistanceFinderNeutralCharged::TrkDistanceFinderNeutralCharged(const std::stri
 }
 
 
-StatusCode TrkDistanceFinderNeutralCharged::initialize() 
-  { 
-    StatusCode s = AthAlgTool::initialize();
-    ATH_MSG_INFO("Initialize successful");
-    return StatusCode::SUCCESS;
-  }
-
-StatusCode TrkDistanceFinderNeutralCharged::finalize() 
-{
-  ATH_MSG_INFO("Finalize successful");
-  return StatusCode::SUCCESS;
-}
-
-
 TrkDistanceFinderNeutralCharged::~TrkDistanceFinderNeutralCharged() = default;
 
 std::pair<Amg::Vector3D,double>  
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/TrkDistanceFinderNeutralNeutral.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/TrkDistanceFinderNeutralNeutral.cxx
index 3e0bdf521e191fc3e482e040f6acf19fb614c450..6423af17af9eec38214dab4757f8b81cd49f4525 100644
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/TrkDistanceFinderNeutralNeutral.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/TrkDistanceFinderNeutralNeutral.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrkJetVxFitter/TrkDistanceFinderNeutralNeutral.h"
@@ -17,21 +17,6 @@ TrkDistanceFinderNeutralNeutral::TrkDistanceFinderNeutralNeutral(const std::stri
   
 }
 
-
-StatusCode TrkDistanceFinderNeutralNeutral::initialize() 
-  { 
-    StatusCode s = AthAlgTool::initialize();
-    ATH_MSG_INFO("Initialize successful");
-    return s;
-  }
-
-StatusCode TrkDistanceFinderNeutralNeutral::finalize() 
-{
-  ATH_MSG_INFO("Finalize successful");
-  return StatusCode::SUCCESS;
-}
-
-
 TrkDistanceFinderNeutralNeutral::~TrkDistanceFinderNeutralNeutral() = default;
 
 std::pair<Amg::Vector3D,double>  
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FastVertexFitter.h b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FastVertexFitter.h
index 09eff0b9df5463ba1b129c3ce87248b9f244904b..c81deec9ee766677518bdd8de30b391684830011 100755
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FastVertexFitter.h
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FastVertexFitter.h
@@ -41,7 +41,6 @@ public:
   using Trk::IVertexFitter::fit;
 
   virtual StatusCode initialize() override;
-  virtual StatusCode finalize() override;
 
   FastVertexFitter(const std::string& t,
                    const std::string& n,
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FullVertexFitter.h b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FullVertexFitter.h
index 7cf0ae1e4142cbfd670814131e71055857108557..245cef913f1da68706b824ccec6ef3782f31e6ab 100755
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FullVertexFitter.h
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FullVertexFitter.h
@@ -42,7 +42,6 @@ namespace Trk
     using Trk::IVertexFitter::fit;
 
     virtual StatusCode initialize() override;
-    virtual StatusCode finalize() override;
 
     enum FitError
     {
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx
index 3de822d35296e74fa4b975c05f810549f55c8472..0a5eb2d83527fcc7e4a613040f851cf349147393 100755
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx
@@ -76,17 +76,9 @@ namespace Trk
 			msg(MSG::INFO) << "Retrieved tool " << m_linFactory << endmsg;
 		
 
-
-
-		msg(MSG::INFO)  << "Initialize successful" << endmsg;
 		return StatusCode::SUCCESS;
 	}
 
-	StatusCode FastVertexFitter::finalize()
-	{
-		msg(MSG::INFO)  << "Finalize successful" << endmsg;
-		return StatusCode::SUCCESS;
-	}
 
 	FastVertexFitter::FastVertexFitter ( const std::string& t, const std::string& n, const IInterface*  p ) : base_class ( t,n,p ),
 														  m_maxIterations ( 3 ),
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx
index 1d5abc635ad84777603e660ebb9714d647d86459..ef05a7a790b69baa98339c6582720cb2c5572e34 100755
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx
@@ -110,13 +110,6 @@ namespace Trk
 			msg(MSG::INFO) << "Retrieved tool " << m_linFactory << endmsg;
 		
 
-		msg(MSG::INFO)  << "Initialize successful" << endmsg;
-		return StatusCode::SUCCESS;
-	}
-
-	StatusCode FullVertexFitter::finalize()
-	{
-		msg(MSG::INFO)  << "Finalize successful" << endmsg;
 		return StatusCode::SUCCESS;
 	}
 
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h
index ee646536959e9dd358a07c962fcda1754017550c..b86c5ae8728922a7bf9b21dc1cffaf9e6046193e 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TrkVertexFitterUtils_FULLLINEARIZEDTRACKFACTORY_H
@@ -59,10 +59,8 @@ namespace Trk
   /**
    * Standard AlgToolMethods
    */
-    StatusCode initialize();
+    virtual StatusCode initialize() override;
   
-    StatusCode finalize();
-    
   /**
    * Default constructor due to Athena interface
    */
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexTrackUpdator.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexTrackUpdator.h
index f0291b8ebd499edbf9fd328bebf82d3fa1552593..fe6369ccc351d4dcbefd65472d7e85386d06ba75 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexTrackUpdator.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexTrackUpdator.h
@@ -41,9 +41,8 @@ namespace Trk
  {
   public: 
   
-   StatusCode initialize();
-   StatusCode finalize();
- 
+   virtual StatusCode initialize() override;
+
 /**
  * Constructor
  */
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexUpdator.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexUpdator.h
index 5505a8a783c9a684cd35e929b3ee9e0fb6f4c9b8..5e129192a152d928e6220fe1ef17ce52fbbffb8c 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexUpdator.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexUpdator.h
@@ -37,8 +37,7 @@ namespace Trk
  {
   public:
   
-  StatusCode initialize();
-  StatusCode finalize();
+  virtual StatusCode initialize() override;
 /**
  * Constructor 
  */
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h
index 3dd1fda2cf0f2a3f46b474590673856f95355b5a..7354c548e76e759a073fe9f60efdfc8cc34881b3 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRKVERTEXFITTERUTILS_TRACKTOVERTEXIPESTIMATOR_H
@@ -78,9 +78,8 @@ namespace Trk
  /**
   * Default Athena interface methods
   */
-    StatusCode initialize();
-    
-    StatusCode finalize();
+    virtual StatusCode initialize() override;
+
  
  /**
   * Default Athena interface constructor and destructor 
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx
index 0260e27e35aa0a34192458bd4ceaff6711c9f6d6..afe995262c64acf0e0ea08d48164b41d810cb3dd 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /*********************************************************************
@@ -37,17 +37,10 @@ namespace Trk
     ATH_CHECK( m_extrapolator.retrieve() );
     ATH_CHECK( m_fieldCacheCondObjInputKey.initialize() );
 
-    msg(MSG::INFO)  << "Initialize successful" << endmsg;
     return StatusCode::SUCCESS;
   }
 
-  StatusCode FullLinearizedTrackFactory::finalize() 
-  {
-    ATH_MSG_INFO ("Finalize successful");
-    return StatusCode::SUCCESS;
-  }
-
-  void FullLinearizedTrackFactory::linearize(VxTrackAtVertex & theTrack,const Amg::Vector3D & linPoint) const 
+  void FullLinearizedTrackFactory::linearize(VxTrackAtVertex & theTrack,const Amg::Vector3D & linPoint) const
   {
     if (theTrack.initialPerigee())
       theTrack.setLinTrack(linearizedTrack(theTrack.initialPerigee(),linPoint));
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexTrackUpdator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexTrackUpdator.cxx
index 92e066272cdef4ec52106c18cd98b29b6d28b754..53d18abd8e8130748c16b640446e35c595aea2ed 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexTrackUpdator.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexTrackUpdator.cxx
@@ -24,12 +24,6 @@ namespace Trk
   return StatusCode::SUCCESS;
  }
  
- StatusCode KalmanVertexTrackUpdator::finalize()
- {
-  ATH_MSG_INFO("Finalize successful");
-  return StatusCode::SUCCESS;
- }
- 
  KalmanVertexTrackUpdator::KalmanVertexTrackUpdator(const std::string& t, const std::string& n, const IInterface*  p):
  AthAlgTool(t,n,p),m_Updator("Trk::KalmanVertexUpdator", this),m_maxWeight(0.001)
  { 
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexUpdator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexUpdator.cxx
index b00a39fe9b2d92bf3b88bc5829cd2cb1f3e1f211..59150eedd0d49ef9d0870482a3052dc4cedfc639 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexUpdator.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexUpdator.cxx
@@ -32,13 +32,7 @@ namespace Trk{
   return StatusCode::SUCCESS;
  }
 
- StatusCode KalmanVertexUpdator::finalize()
- {
-  msg(MSG::INFO)  << "Finalize successful" << endmsg;
-  return StatusCode::SUCCESS;
- }
 
- 
  xAOD::Vertex * KalmanVertexUpdator:: add(xAOD::Vertex& vtx, VxTrackAtVertex& trk) const
  {
    return update(vtx,trk,IVertexUpdator::addTrack);
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.cxx
index 5616c970351a6d732019e389738a9cc98dd8c808..9ca11c041bf0cfd4b85c70b17bcedc0d23169e5a 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /*********************************************************************
@@ -44,16 +44,9 @@ namespace Trk
       }
     }
 
-    msg(MSG::INFO)  << "Initialize successful" << endmsg;
     return StatusCode::SUCCESS;
   }
   
-  StatusCode NeutralParticleParameterCalculator::finalize() 
-  {
-    msg(MSG::INFO)  << "Finalize successful" << endmsg;
-    return StatusCode::SUCCESS;
-  }
-
 
   NeutralPerigee* NeutralParticleParameterCalculator::createNeutralTrackFromVertex
     (const xAOD::Vertex & myVertex) const
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.h
index b6a5486e7aa473522c07aa39847f3ffd61724ca6..f483e52c63740314eb58f67040a48cbe9b198683 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRKVERTEXFITTERUTILS_NEUTRALPARTICLEPARCALCULATOR_H
@@ -43,9 +43,8 @@ namespace Trk
   class NeutralParticleParameterCalculator : public AthAlgTool, virtual public INeutralParticleParameterCalculator
   {
   public:
-    StatusCode initialize();
-    StatusCode finalize();
-    
+    virtual StatusCode initialize() override;
+
   /**
    * Default constructor due to Athena interface
    */
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/TrackToVertexIPEstimator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/TrackToVertexIPEstimator.cxx
index 6d916c4897ad0160ff19b5cb6be6998b67868138..f125774d3752f38e8c1c0f99077a1b2c2d49931f 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/TrackToVertexIPEstimator.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/TrackToVertexIPEstimator.cxx
@@ -66,11 +66,6 @@ namespace Trk
    return StatusCode::SUCCESS;  
  }//end of initialize method
     
- StatusCode TrackToVertexIPEstimator::finalize()
- { 
-  msg(MSG::INFO)  << "Finalize successful" << endmsg;
-  return StatusCode::SUCCESS;
- }
 
  const  ImpactParametersAndSigma * TrackToVertexIPEstimator::estimate(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx, bool doRemoval) const
  {
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/TrkVertexFitters/AdaptiveVertexFitter.h b/Tracking/TrkVertexFitter/TrkVertexFitters/TrkVertexFitters/AdaptiveVertexFitter.h
index 4f79ed3c139d9712fe3beb8ba1a2104f1233ab3a..f012ebe42d17e40bae3830a9c0a95bd319c12cd0 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/TrkVertexFitters/AdaptiveVertexFitter.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/TrkVertexFitters/AdaptiveVertexFitter.h
@@ -88,8 +88,7 @@ namespace Trk
     using Trk::IVertexFitter::fit;
   
     virtual StatusCode initialize() override;
-    virtual StatusCode finalize() override;
-    
+
     //same kind error as FullVertexFitter code to be similar in error response - NOT IMPLEMENTED YET
     //enum FitError {FITOK,MATINV,NEGTRCHI2,MAXCHI2,MAXTRCHI2,NOTRKS,NOFIT};
     
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/TrkVertexFitters/SequentialVertexSmoother.h b/Tracking/TrkVertexFitter/TrkVertexFitters/TrkVertexFitters/SequentialVertexSmoother.h
index 455c25becf8b035834f2f2bd34c70eea09f9f430..cc25da13f2c8473ec149075c80f950b15f9a2eba 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/TrkVertexFitters/SequentialVertexSmoother.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/TrkVertexFitters/SequentialVertexSmoother.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TrkVertexFitters_SequentialVertexSmoother_H
@@ -46,8 +46,7 @@ namespace Trk
 /**
  * default AlgTools methods  
  */
-   StatusCode initialize();
-   StatusCode finalize();
+   virtual StatusCode initialize() override;
   
 /**
  *constructor and destructor  
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitter.cxx b/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitter.cxx
index cfff8d0176011951f8dd32041784a74da9d3ecb6..1409b9518c1a6ca6a6298a41457d18c125e3adcc 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitter.cxx
@@ -126,16 +126,10 @@ namespace Trk
   } 
     msg(MSG::INFO) << "Retrieved tool " << m_AnnealingMaker << endmsg;
   
-  
-    msg(MSG::INFO)  << "Initialize successful" << endmsg;
+
     return StatusCode::SUCCESS;
   }
   
-  StatusCode AdaptiveVertexFitter::finalize()
-  {
-    msg(MSG::INFO)  << "Finalize successful" << endmsg;
-    return StatusCode::SUCCESS;
-  }
 
   xAOD::Vertex*
   AdaptiveVertexFitter::_fit(
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/src/SequentialVertexSmoother.cxx b/Tracking/TrkVertexFitter/TrkVertexFitters/src/SequentialVertexSmoother.cxx
index dea280af62832d6a67d637033e51e5f0fc249b72..dc25055a7038bdf8cdff05737d1104ecc5c6b040 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/src/SequentialVertexSmoother.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/src/SequentialVertexSmoother.cxx
@@ -19,18 +19,11 @@ namespace  Trk
     return StatusCode::FAILURE;
   } 
     msg(MSG::INFO) << "Retrieved tool " << m_vertexTrackUpdator << endmsg;
-  
-  
-  msg(MSG::INFO)<<"Initialization successfull"<<endmsg;
+
   return StatusCode::SUCCESS;
  }//end of initialize method
  
- StatusCode SequentialVertexSmoother::finalize()
- {
-  msg(MSG::INFO)  << "Finalize successful" << endmsg;
-  return StatusCode::SUCCESS;
- }//end of finalize method
- 
+
  //class constructor 
  SequentialVertexSmoother::SequentialVertexSmoother(const std::string& t, const std::string& n, const IInterface*  p):
     AthAlgTool(t,n,p),
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/CrossDistancesSeedFinder.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/CrossDistancesSeedFinder.h
index e1c34c980582ca95f0c27ae52c503838cf4554d4..941ce22dc12f9c4a9baf75dfcbc3bb0343669edd 100755
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/CrossDistancesSeedFinder.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/CrossDistancesSeedFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRKVERTEXSEEDFINDERTOOLS_CROSSDISTANCESSEEDFINDER_H
@@ -50,7 +50,6 @@ namespace Trk
     virtual ~CrossDistancesSeedFinder();
 
     virtual StatusCode initialize() override;
-    virtual StatusCode finalize() override;
 
 
     using IVertexSeedFinder::findSeed;
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/IndexedCrossDistancesSeedFinder.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/IndexedCrossDistancesSeedFinder.h
index 0e21fd21002661b1343a3960fae976537033bc9a..80d86503f6db542c70c0901ed3fe62a923a494f6 100755
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/IndexedCrossDistancesSeedFinder.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/IndexedCrossDistancesSeedFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 #ifndef TRKVERTEXSEEDFINDERTOOLS_INDEXCROSSDISTANCESSEEDFINDER_H
 #define TRKVERTEXSEEDFINDERTOOLS_INDEXCROSSDISTANCESSEEDFINDER_H
@@ -43,7 +43,6 @@ namespace Trk
 
 
     virtual StatusCode initialize() override;
-    virtual StatusCode finalize() override;
 
     
     /**
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/MCTrueSeedFinder.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/MCTrueSeedFinder.h
index dbd5e0cfaaea953b6394c402ea7dc3922de51823..c657e49cb65b7033102f5cca4ce490bedc440666 100755
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/MCTrueSeedFinder.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/MCTrueSeedFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRKVERTEXSEEDFINDERTOOLS_MCTRUESEEDFINDER_H
@@ -45,7 +45,6 @@ namespace Trk
 
 
     virtual StatusCode initialize() override;
-    virtual StatusCode finalize() override;
 
 
     using IVertexSeedFinder::findSeed;
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/CrossDistancesSeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/CrossDistancesSeedFinder.cxx
index 313d4f5887faabaa3d9e832c67e0b423e5ec44f1..0d9061800bf189296de0d6d2c00f661c01c257d7 100755
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/CrossDistancesSeedFinder.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/CrossDistancesSeedFinder.cxx
@@ -75,17 +75,9 @@ namespace Trk
   { 
     ATH_CHECK( m_mode3dfinder.retrieve() );
     ATH_CHECK( m_distancefinder.retrieve() );
-    ATH_MSG_INFO( "Initialize successful"  );
     return StatusCode::SUCCESS;
   }
 
-  StatusCode CrossDistancesSeedFinder::finalize() 
-  {
-    ATH_MSG_INFO( "Finalize successful"  );
-    return StatusCode::SUCCESS;
-  }
-
-
   Amg::Vector3D CrossDistancesSeedFinder::findSeed(const std::vector<const Trk::Track*> & VectorTrk,const xAOD::Vertex * constraint) const {
     
 
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/IndexedCrossDistancesSeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/IndexedCrossDistancesSeedFinder.cxx
index 3e8bb44af2a0a65dea2fac4ef5901ea64de5f864..59d4829555be32cba4fb2bd92ca82872a5aa00b4 100755
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/IndexedCrossDistancesSeedFinder.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/IndexedCrossDistancesSeedFinder.cxx
@@ -60,13 +60,6 @@ namespace Trk
   { 
     ATH_CHECK( m_mode3dfinder.retrieve() );
     ATH_CHECK( m_distancefinder.retrieve() );
-    ATH_MSG_INFO( "Initialize successful" );
-    return StatusCode::SUCCESS;
-  }
-
-  StatusCode IndexedCrossDistancesSeedFinder::finalize() 
-  {
-    ATH_MSG_INFO( "Finalize successful" );
     return StatusCode::SUCCESS;
   }
 
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx
index c89f173cfde2ea7519fd38be9ded8019856ad7f2..55d7697af59ff8fa164f13a180f8eaf8d24932c6 100755
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx
@@ -67,13 +67,6 @@ namespace Trk
   StatusCode MCTrueSeedFinder::initialize() 
   { 
     ATH_CHECK( m_mcEventCollectionKey.initialize() );
-    msg(MSG::INFO)  << "Initialize successful" << endmsg;
-    return StatusCode::SUCCESS;
-  }
-
-  StatusCode MCTrueSeedFinder::finalize() 
-  {
-    msg(MSG::INFO)  << "Finalize successful" << endmsg;
     return StatusCode::SUCCESS;
   }
 
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/FsmwMode1dFinder.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/FsmwMode1dFinder.h
index 66e2cdabfeeaef4531b4d3d38d7c2e1550b1a547..3810fad952e38624b39bf0914bf22e98614b46bf 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/FsmwMode1dFinder.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/FsmwMode1dFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRKVERTEXSEEDFINDERUTILS_FSMWMODE1DFINDERALGO_H
@@ -37,9 +37,6 @@ namespace Trk
   class FsmwMode1dFinder : public AthAlgTool, virtual public IMode1dFinder
   {
   public:
-    StatusCode initialize();
-    StatusCode finalize();
-
     //default constructor due to Athena interface
     FsmwMode1dFinder(const std::string& t, const std::string& n, const IInterface*  p);
     
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Mode3dFromFsmw1dFinder.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Mode3dFromFsmw1dFinder.h
index 8ccaaa87280e6ae073a25f89701863788ddb86e1..45364008f25f8de91b61061234d22c17064349c4 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Mode3dFromFsmw1dFinder.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Mode3dFromFsmw1dFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 //Author: Lianyou Shan <lianyou.shan@cern.ch>
 #ifndef TRKVERTEXSEEDFINDERUTILS_MODE3DTOFSMW1DFINDER_H
@@ -37,10 +37,6 @@ namespace Trk
                            const IInterface*  p);
       
 
-    virtual StatusCode initialize() override;
-    virtual StatusCode finalize() override;
-    
-
     /**
      * @brief Obtain the 3d-mode (position) from a list of positions
      *        (distribution in space)
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Mode3dTo1dFinder.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Mode3dTo1dFinder.h
index 9850153e76d13ea023b82401c599fbb395fd1d99..4cb7faca0d105e7f52d3db5cc360727d74afb07d 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Mode3dTo1dFinder.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Mode3dTo1dFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRKVERTEXSEEDFINDERUTILS_MODE3DTO1DFINDER_H
@@ -39,8 +39,7 @@ namespace Trk
 
 
     virtual StatusCode initialize() override;
-    virtual StatusCode finalize() override;
-    
+
     
     /**
      * @brief Obtain the 3d-mode (position) from a list of positions
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dFromFsmw1dFinder_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dFromFsmw1dFinder_test.ref
index c95c87668b18df951f65f269ab4b54617dbc7805..d6381cd44551c8d214dbb78e64167e8e4c8fe399 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dFromFsmw1dFinder_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dFromFsmw1dFinder_test.ref
@@ -13,5 +13,4 @@ EventLoopMgr      WARNING Unable to locate service "EventSelector"
 EventLoopMgr      WARNING No events will be processed from external input.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-ToolSvc.Trk::Mo...   INFO Initialize successful
 test1
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dTo1dFinder_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dTo1dFinder_test.ref
index ac386076ea9c27b4ec59af5ec41e7026e9772d29..c40b05b87c3edbf6f8ea7a694f5501432b1f727d 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dTo1dFinder_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dTo1dFinder_test.ref
@@ -13,6 +13,4 @@ EventLoopMgr      WARNING Unable to locate service "EventSelector"
 EventLoopMgr      WARNING No events will be processed from external input.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-ToolSvc.Trk::Mo...   INFO Initialize successfull
-ToolSvc.Trk::Mo...   INFO Initialize successfull
 test1
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/FsmwMode1dFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/FsmwMode1dFinder.cxx
index 536899b89fadacad978cc85075352f4d97fea2f8..45cfc3bb6da9041b09a1c1d95363667063b8a287 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/FsmwMode1dFinder.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/FsmwMode1dFinder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /*********************************************************************
@@ -28,17 +28,6 @@ namespace Trk
 
   FsmwMode1dFinder::~FsmwMode1dFinder() = default;
 
-  StatusCode FsmwMode1dFinder::initialize() 
-  { 
-    msg(MSG::INFO) << "Initialize successfull" << endmsg;
-    return StatusCode::SUCCESS;
-  }
-
-  StatusCode FsmwMode1dFinder::finalize() 
-  {
-    msg(MSG::INFO)  << "Finalize successfull" << endmsg;
-    return StatusCode::SUCCESS;
-  }
 
 #ifdef FSMWMODE1DFINDER_DEBUG
   namespace {
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Mode3dFromFsmw1dFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Mode3dFromFsmw1dFinder.cxx
index ce301ea0bac75282ee8e8f495527375e61766527..f665719757825ecd7ce018b4d6696035ae536b17 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Mode3dFromFsmw1dFinder.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Mode3dFromFsmw1dFinder.cxx
@@ -42,21 +42,6 @@ Mode3dFromFsmw1dFinder::Mode3dFromFsmw1dFinder(const std::string& t, const std::
 //  6 : phi mode with coincided radius mode then coincide with Z mode
 
 
-StatusCode Mode3dFromFsmw1dFinder::initialize() 
-{ 
-  ATH_CHECK(  AlgTool::initialize() );
-  ATH_MSG_INFO("Initialize successful" );
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode Mode3dFromFsmw1dFinder::finalize() 
-{
-  ATH_MSG_INFO("Finalize successful" );
-  return StatusCode::SUCCESS;
-}
-
-
 Amg::Vector3D
 Mode3dFromFsmw1dFinder::getMode(const double vx,
                                 const double vy,
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Mode3dTo1dFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Mode3dTo1dFinder.cxx
index bb0cbbde03ebf8ae5116108f772d0bd584cf221f..b3b10a23c64f15248e1db460b161ca27c5e271bd 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Mode3dTo1dFinder.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Mode3dTo1dFinder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /*********************************************************************
@@ -27,14 +27,6 @@ namespace Trk
   { 
     ATH_CHECK( AlgTool::initialize() );
     ATH_CHECK( m_mode1dfinder.retrieve() );
-    ATH_MSG_INFO( "Initialize successfull"  );
-    return StatusCode::SUCCESS;
-  }
-
-
-  StatusCode Mode3dTo1dFinder::finalize() 
-  {
-    ATH_MSG_INFO( "Finalize successfull"  );
     return StatusCode::SUCCESS;
   }