diff --git a/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.cxx b/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.cxx
index ee4b285cf5568bef201764acf674fdf1fdde681f..b80b57a647604b8e09df97c0592a15649c820fed 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.cxx
+++ b/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.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 "MuonFeatureCnvTestAlg.h"
@@ -29,12 +29,6 @@ StatusCode MuonFeatureCnvTestAlg::initialize() {
     return StatusCode::SUCCESS;
 }
 
-StatusCode MuonFeatureCnvTestAlg::finalize() {
-    
-    // Return gracefully:
-    return StatusCode::SUCCESS;
-}
-
 StatusCode MuonFeatureCnvTestAlg::execute() {
 
   // Retrieve MuonFeatureContainer
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.h b/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.h
index e495f0ad92135317e570beb8f2b5bb1beabbb633..e994db39493cd5645363d58cf11864b7d3ef3ec6 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.h
+++ b/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.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
 */
 
 //
@@ -34,8 +34,6 @@ class MuonFeatureCnvTestAlg : public AthAlgorithm {
         
         /// Function initialising the algorithm
         virtual StatusCode initialize();
-        /// Function initialising the algorithm
-        virtual StatusCode finalize();
         /// Function executing the algorithm
         virtual StatusCode execute();
 
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.cxx b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.cxx
index 453039354bb26b86274c78711d64286b97205c80..feeebc4c9f533e4ece89b15531c550583a80d44e 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.cxx
+++ b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.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 "TrigMuonEFInfoCnvTestAlg.h"
@@ -35,12 +35,6 @@ StatusCode TrigMuonEFInfoCnvTestAlg::initialize() {
     return StatusCode::SUCCESS;
 }
 
-StatusCode TrigMuonEFInfoCnvTestAlg::finalize() {
-    
-    // Return gracefully:
-    return StatusCode::SUCCESS;
-}
-
 StatusCode TrigMuonEFInfoCnvTestAlg::execute() {
 
   // Retrieve the TrigMuonEFInfoContainer
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.h b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.h
index 4f11662daad3f6412ef40256715cb8a0a19b874d..d381e7e9ad095206c3e144e48f6b44aadec5c14c 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.h
+++ b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.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
 */
 
 //
@@ -43,8 +43,6 @@ class TrigMuonEFInfoCnvTestAlg : public AthAlgorithm {
         
         /// Function initialising the algorithm
         virtual StatusCode initialize();
-        /// Function initialising the algorithm
-        virtual StatusCode finalize();
         /// Function executing the algorithm
         virtual StatusCode execute();
 
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.cxx b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.cxx
index 7d13d09ee0094b5f164d3e47c262f65b922bf90a..ab8623d436c4b9c1ecb177075221e72a123a0c9e 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.cxx
+++ b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.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
 */
 
 //
@@ -26,13 +26,6 @@ TrigMuonEFInfoToMuonCnvTool::TrigMuonEFInfoToMuonCnvTool(const std::string& type
   declareProperty( "xAODEFInDetTrackParticleContainerName", m_inDetTrackParticles = "EFInDetTrackParticles" );   
 }
 
-/**
- * Destructor - nothing to do so far.
- */
-TrigMuonEFInfoToMuonCnvTool::~TrigMuonEFInfoToMuonCnvTool() {
-    
-}
-
 /**
  * Initialize the tool
  */
@@ -45,13 +38,6 @@ StatusCode TrigMuonEFInfoToMuonCnvTool::initialize() {
     return StatusCode::SUCCESS;
 }
 
-/**
- * Finalize the tool
- */
-StatusCode TrigMuonEFInfoToMuonCnvTool::finalize() {
-    return StatusCode::SUCCESS;
-}
-
 /**
  * Convert input TrigMuonEFInfo object into multuple xAOD::Muon objects.
  * The xAOD::Muon objects are stored into the MuonContainer passed to the function.
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.h b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.h
index 7bd1eff060d8a3b2344df1aa5372c6e95d23d400..7a1ac63fd1a7fe0e5c1d10ed4c7034fd14586746 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.h
+++ b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.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
 */
 
 //
@@ -30,14 +30,11 @@ public:
     TrigMuonEFInfoToMuonCnvTool(const std::string& type, const std::string& name, const IInterface* parent);
     
     /// Destructor
-    virtual ~TrigMuonEFInfoToMuonCnvTool();
+    virtual ~TrigMuonEFInfoToMuonCnvTool()=default;
     
     /// initialize the tool
     virtual StatusCode initialize() override;
     
-    /// finalize the tool
-    virtual StatusCode finalize() override;
-    
     /// Convert a single TrigMuonEFInfo object into (maybe multiple) xAOD::Muon objects.
     virtual StatusCode convertTrigMuonEFInfo(const TrigMuonEFInfo& efinfo,
                                                  xAOD::MuonContainer& muoncontainer,
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h b/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
index b20b0c241d0b4d6ed4ca85cdcf97028955f3a123..b80c338f98637497ff169db18f137d9e1cb7bcf2 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
@@ -51,7 +51,6 @@ public:
    static const InterfaceID& interfaceID() { return IID_IAmdcsimrecAthenaSvc; }
 
    virtual StatusCode initialize();
-   virtual StatusCode finalize();
 
    virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
index dc4189317622daa17fe2c2d4ce9ae8f18c243c31..57ee88cbbe69e3063ce92254d44a63809bc26a72 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
@@ -266,10 +266,7 @@ StatusCode AmdcsimrecAthenaSvc::initialize() {
   if ( m_EmergencyOut == 1 ) return StatusCode::FAILURE;
   return StatusCode::SUCCESS;
 }
- 
-/// Service finalisation
-StatusCode AmdcsimrecAthenaSvc::finalize(){return StatusCode::SUCCESS;}
- 
+
 StatusCode AmdcsimrecAthenaSvc::queryInterface( const InterfaceID& riid, void** ppvInterface ) {
   if ( IID_IAmdcsimrecAthenaSvc == riid )    {
     *ppvInterface = (AmdcsimrecAthenaSvc*)this;
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h
index e78595ec08fb2cf6602b86cc3006168ed36f764f..c8418f5d39e9691c258730e3f68f6f2bebe6f2c5 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h
@@ -31,7 +31,6 @@ class AmdcDb final : public AthService, virtual public IRDBAccessSvc {
   static const InterfaceID& interfaceID() { return IID_IRDBAccessSvc; }
 
   virtual StatusCode initialize() override;
-  virtual StatusCode finalize() override;
 
   virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
index ea84217fc16b42caa9e73770efbe1eb8b3c79ac0..bec013addc0ebcce2741704b31d5ae336aa1a5c8 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
@@ -195,9 +195,6 @@ StatusCode AmdcDb::DoUpdatedSvc()
   return StatusCode::SUCCESS;
 }
 
-/// Service finalisation
-StatusCode AmdcDb::finalize(){return StatusCode::SUCCESS;}
- 
 StatusCode AmdcDb::queryInterface(const InterfaceID& riid, void** ppvInterface)
 {
   if (IID_IRDBAccessSvc == riid)
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h b/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h
index bae89b19c50f5acc9df9edd517f5c7c1fe5c5a56..909af1d8f0d7871860ed4e0d55e81ccff57bd66d 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h
@@ -29,8 +29,7 @@ public:
 ///////////////////////////////////
 
    StatusCode initialize();
-   StatusCode execute();
-   StatusCode finalize();
+   StatusCode execute(){return StatusCode::SUCCESS;}
 
 private:
 ///////////////////////////////////
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
index 7df7f6d4a0adb8f1f9582390dc1461c38f8530df..b018dd56bebe0c9204f5ca420122ee1581d7a94e 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
@@ -374,10 +374,6 @@ StatusCode AmdcDumpOracle::DoIt()
 
 }
 
-StatusCode AmdcDumpOracle::execute() {return StatusCode::SUCCESS;}
- 
-StatusCode AmdcDumpOracle::finalize() {return StatusCode::SUCCESS;}
-
 void AmdcDumpOracle::DumpASZT( IRDBAccessSvc* pIRDBAccessSvc, std::string TagAdd, int& Kwarn,int& Kchck){
 
   std::string NameOfTheSet = "ASZT";
diff --git a/MuonSpectrometer/MuonCablings/CSCcabling/CSCcabling/CSCcablingSvc.h b/MuonSpectrometer/MuonCablings/CSCcabling/CSCcabling/CSCcablingSvc.h
index 88b2bc5d395a154b36711faa583777cf1a97d3a5..a4d8f93e69c8b47425607ac6ca88d54c1308288f 100755
--- a/MuonSpectrometer/MuonCablings/CSCcabling/CSCcabling/CSCcablingSvc.h
+++ b/MuonSpectrometer/MuonCablings/CSCcabling/CSCcabling/CSCcablingSvc.h
@@ -24,13 +24,12 @@ class CSCcablingSvc : public AthService, virtual public IInterface {
 public:
    
   CSCcablingSvc(const std::string& name,ISvcLocator* sl);
-  virtual ~CSCcablingSvc();
+  virtual ~CSCcablingSvc()=default;
 
   static const InterfaceID& interfaceID() { return IID_ICSCcablingSvc; }
   virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvIF);
 
   virtual StatusCode initialize(void);
-  virtual StatusCode finalize(void);  
 
   /** map offline ROD identifier to online ID */
   bool onlineId(const uint16_t subdetectorID, const uint16_t offlineID, uint32_t& rodId) const;
diff --git a/MuonSpectrometer/MuonCablings/CSCcabling/src/CSCcablingSvc.cxx b/MuonSpectrometer/MuonCablings/CSCcabling/src/CSCcablingSvc.cxx
index 9ab4c909ec53603c0f0bec4cfb1928d7a000f414..744a261245b113037250f5249d1e2dbce0cb3441 100755
--- a/MuonSpectrometer/MuonCablings/CSCcabling/src/CSCcablingSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/CSCcabling/src/CSCcablingSvc.cxx
@@ -22,8 +22,6 @@ CSCcablingSvc::CSCcablingSvc(const std::string& name, ISvcLocator* sl)
   declareProperty("Run1Cabling", m_run1 = false);
 }
 
-CSCcablingSvc::~CSCcablingSvc() {}
-
 StatusCode CSCcablingSvc::queryInterface(const InterfaceID& riid, void** ppvIF) {
  
   if( IID_ICSCcablingSvc.versionMatch(riid) ) { 
@@ -73,10 +71,6 @@ StatusCode CSCcablingSvc::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode CSCcablingSvc::finalize() { 
-  return StatusCode::SUCCESS;
-}
-
 /** map offline ROD identifier to online ID */
 bool CSCcablingSvc::onlineId(const uint16_t subDetectorID, const uint16_t offlineID, uint32_t& rodId) const {
 
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h
index ec9d0ac2b929bb3d60a78a71c0ba06bd090973dd..49d51af42e473fb33df51a2d6ed9a1909fd29820 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h
@@ -30,11 +30,10 @@ class RPCcablingServerSvc : public AthService,
     public:
     // Constructor and other Service methods
     RPCcablingServerSvc(const std::string& name, ISvcLocator* svc);
-    virtual ~RPCcablingServerSvc() {}
+    virtual ~RPCcablingServerSvc()=default;
   
     virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF) override;
     virtual StatusCode initialize(void) override;
-    virtual StatusCode finalize(void) override;
 
     // Interface implementation
     virtual StatusCode giveCabling(const IRPCcablingSvc*&) const override;
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/TGCcablingServerSvc.h b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/TGCcablingServerSvc.h
index 1cee8a8785081d4d031e2ae5dfe693a6601ceba2..0b4e05f664ce0a6b7a11ab4e685bd1ddd85148a1 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/TGCcablingServerSvc.h
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/TGCcablingServerSvc.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 TGCcablingServerSvc_H
@@ -22,11 +22,9 @@ class TGCcablingServerSvc : public AthService,
     public:
     // Constructor and other Service methods
     TGCcablingServerSvc(const std::string& name, ISvcLocator* svc);
-    virtual ~TGCcablingServerSvc() {}
+    virtual ~TGCcablingServerSvc()=default;
   
     virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF);
-    virtual StatusCode initialize(void);
-    virtual StatusCode finalize(void);
 
     // Interface implementation
     virtual StatusCode giveCabling( const ITGCcablingSvc*&) const;
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/RPCcablingServerSvc.cxx b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/RPCcablingServerSvc.cxx
index 36bd4892cee8b43df798bc35c4b2a95ccf35fefe..b2594f9dd23fe9f0c25bf7dd5db8fff06af09937 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/RPCcablingServerSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/RPCcablingServerSvc.cxx
@@ -57,11 +57,6 @@ RPCcablingServerSvc::initialize() {
     return StatusCode::SUCCESS;
 }
 
-StatusCode
-RPCcablingServerSvc::finalize() {
-    return StatusCode::SUCCESS;
-}
-
 StatusCode 
 RPCcablingServerSvc::giveCabling(const IRPCcablingSvc*& cabling) const {
 
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
index c61391da535885dd3e09bdf2aa0384a442708efd..ab1e48ba39855f8b15937fe69c955ced466cd14f 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
@@ -30,17 +30,6 @@ TGCcablingServerSvc::queryInterface(const InterfaceID& riid, void** ppvIF)
     
     addRef();
     return StatusCode::SUCCESS;
-} 
-
-StatusCode
-TGCcablingServerSvc::initialize() 
-{
-    return StatusCode::SUCCESS;
-}
-
-StatusCode
-TGCcablingServerSvc::finalize() {
-    return StatusCode::SUCCESS;
 }
 
 StatusCode
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MdtTestCabling.h b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MdtTestCabling.h
index dd353f1136418e3efce91886de881c9ed1b235c4..b640a47dd0d4ee71d432492912c6088371490aa6 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MdtTestCabling.h
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MdtTestCabling.h
@@ -29,10 +29,9 @@ class MdtTestCabling : public AthAlgorithm {
  public:
 
   MdtTestCabling(const std::string& name, ISvcLocator* pSvcLocator);
-  ~MdtTestCabling();
+  ~MdtTestCabling()=default;
 
   virtual StatusCode initialize();
-  virtual StatusCode finalize();
   virtual StatusCode execute();
 
  private:
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingAlg.h b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingAlg.h
index ad704fbfd4c3c549555c16189928008c7372aa6f..57128e1b00cb1c3d94af1bd5bf4fb4c0e5182123 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingAlg.h
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingAlg.h
@@ -36,7 +36,6 @@ class MuonMDT_CablingAlg: public AthAlgorithm {
   virtual ~MuonMDT_CablingAlg() = default;
   virtual StatusCode initialize() override;
   virtual StatusCode execute() override;
-  virtual StatusCode finalize() override;
   
  private:
 
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
index 27aadd9b9f9a28616fc9e0ed51bdb2ca46fe823b..183ce2895038b503876287f77b938270a9f30cb1 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
@@ -29,17 +29,9 @@ class MuonMDT_CablingSvc : public AthService ,
  public:
 
   MuonMDT_CablingSvc(const std::string& name,ISvcLocator* sl);
-  virtual ~MuonMDT_CablingSvc();
+  virtual ~MuonMDT_CablingSvc()=default;
   
   virtual StatusCode initialize() override;
-  virtual StatusCode finalize() override;
-
-  /** methods called at trigger stop/start */
-  //  virtual StatusCode start();
-  //  virtual StatusCode stop();
-
-  /** method for begin run transition */
-  //  virtual void handle(const Incident&);
 
   static const InterfaceID& interfaceID() { return IID_IMuonMDT_CablingSvc; }
 
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx
index 11ba99136ca32b068250b554bfeab477e5e79bf7..670fb574598276277389ec3052844a681c81f1cd 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx
@@ -10,9 +10,6 @@ MdtTestCabling::MdtTestCabling(const std::string& name, ISvcLocator* pSvcLocator
 { 
 }
 
-MdtTestCabling::~MdtTestCabling() { }
-
-
 StatusCode MdtTestCabling::initialize()
 {
   ATH_CHECK( m_chronoSvc.retrieve() );
@@ -45,12 +42,6 @@ StatusCode MdtTestCabling::execute()
   return StatusCode::SUCCESS;
 }
 
-
-StatusCode MdtTestCabling::finalize()
-{
-  return StatusCode::SUCCESS;
-}
-
 /** test the map content */
 bool MdtTestCabling::testMap()
 {
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx
index 784b3d7596852b265de9fe3b05bc349a50d394d9..73be45980b2d829938b03947dade25430c30d8c5 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx
@@ -286,10 +286,3 @@ StatusCode MuonMDT_CablingAlg::execute(){
   
   return StatusCode::SUCCESS;
 }
-
-
-StatusCode MuonMDT_CablingAlg::finalize(){
-  
-  ATH_MSG_DEBUG( "finalize " << name() );
-  return StatusCode::SUCCESS;
-}
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingSvc.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingSvc.cxx
index d5f66c5c7d1db0d93b2f7d2073176274f389edfa..39e59a52958b4c5f7beefdd85a010862efcd8ba0 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingSvc.cxx
@@ -39,10 +39,6 @@ AthService(svcName,sl),
     declareProperty("doCalStreamInit",m_doCalStreamInit=false);
 }
 
-MuonMDT_CablingSvc::~MuonMDT_CablingSvc()
-    { }
-
-
 /** Initialization method */
 StatusCode MuonMDT_CablingSvc::initialize()
 {
@@ -149,14 +145,6 @@ StatusCode MuonMDT_CablingSvc::initialize()
     return sc;
 }
 
-/** Finalization method */
-StatusCode MuonMDT_CablingSvc::finalize()
-{
-   return StatusCode::SUCCESS;
-}
-
-
-
 // queryInterface 
 StatusCode MuonMDT_CablingSvc::queryInterface(const InterfaceID& riid, void** ppvIF) 
 { 
diff --git a/MuonSpectrometer/MuonCablings/TGCcabling/TGCcabling/TGCcablingSvc.h b/MuonSpectrometer/MuonCablings/TGCcabling/TGCcabling/TGCcablingSvc.h
index 261e0e58fef28b24cd35b0047218f61b5bf93248..a8db79c4c973081b1f8acb72a5298b385d99a05e 100755
--- a/MuonSpectrometer/MuonCablings/TGCcabling/TGCcabling/TGCcablingSvc.h
+++ b/MuonSpectrometer/MuonCablings/TGCcabling/TGCcabling/TGCcablingSvc.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
 */
 
 /***************************************************************************
@@ -34,7 +34,7 @@ class TGCcablingSvc : public ITGCcablingSvc
 {
 public:
   TGCcablingSvc (const std::string& name, ISvcLocator* svc);
-  virtual ~TGCcablingSvc (void);
+  virtual ~TGCcablingSvc()=default;
 
   static const InterfaceID& interfaceID() 
   {
diff --git a/MuonSpectrometer/MuonCablings/TGCcabling/src/TGCcablingSvc.cxx b/MuonSpectrometer/MuonCablings/TGCcabling/src/TGCcablingSvc.cxx
index a2279c279125a1258083bd8f2b154db21fddf293..3f3c10fec9d455030f8257a80e4f2e819bdfa303 100755
--- a/MuonSpectrometer/MuonCablings/TGCcabling/src/TGCcablingSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/TGCcabling/src/TGCcablingSvc.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
 */
 
 /***************************************************************************
@@ -33,9 +33,6 @@ TGCcablingSvc::TGCcablingSvc (const std::string& name, ISvcLocator* svc)
   declareProperty("databasePPToSL",  m_databasePPToSL="PP2SL.db");
   declareProperty("databaseSLBToROD",m_databaseSLBToROD="SLB2ROD.db");
 }
-  
-TGCcablingSvc::~TGCcablingSvc (void)
-{}
 
 StatusCode  TGCcablingSvc::queryInterface(const InterfaceID& riid,void** ppvIF)
 {
diff --git a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MuonDetectorCondAlg.h b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MuonDetectorCondAlg.h
index 78c837f4c1ddbcf5109caf4824e301e491239883..952a91b8bfed5000611884f6dcd6a907c706e868 100755
--- a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MuonDetectorCondAlg.h
+++ b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MuonDetectorCondAlg.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 MUONGEOMODEL_MUONDETECTORCONDALG_H
@@ -26,8 +26,6 @@ public:
 
   virtual StatusCode initialize() override final;
   virtual StatusCode execute() override final;
-  virtual StatusCode finalize() override final;
-
 
 private:
   
diff --git a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorCondAlg.cxx b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorCondAlg.cxx
index e250f0ccb68931ff04b0665fb79a8d648126678d..e49a2003963b41d5280171b497d3b34ddbabcd15 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorCondAlg.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorCondAlg.cxx
@@ -152,10 +152,3 @@ StatusCode MuonDetectorCondAlg::execute()
 
   return StatusCode::SUCCESS;
 }
-
-
-StatusCode MuonDetectorCondAlg::finalize()
-{
-  ATH_MSG_DEBUG( "finalize " << name() );
-  return StatusCode::SUCCESS;
- }
diff --git a/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonGMTestOnPrd.h b/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonGMTestOnPrd.h
index e01d1da1844cca403464d4796630550a5025a51b..31cf424fa8d78216e62a6ceb2331ff75710ede54 100644
--- a/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonGMTestOnPrd.h
+++ b/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonGMTestOnPrd.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
 */
 
 /***************************************************************************
@@ -25,24 +25,18 @@
 #include "Identifier/Identifier.h"
 #include "Identifier/IdentifierHash.h"
 
-
 class StoreGateSvc;
 class ActiveStoreSvc;
 
-
-//class MuonReadoutElement;
-
-
 class MuonGMTestOnPrd: public AthAlgorithm
 {
 public:
     
     MuonGMTestOnPrd(const std::string& name, ISvcLocator* pSvcLocator);
-    ~MuonGMTestOnPrd();
+    ~MuonGMTestOnPrd()=default;
     
     StatusCode	initialize();
     StatusCode 	execute();
-    StatusCode 	finalize();
 
 private:
 
diff --git a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx
index 305cd04740737c5fffe5af52bd15b7519070a9a1..5edf1c4e2fbae18cf92642264b61cdd29da43c6e 100644
--- a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.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
 */
 
 /***************************************************************************
@@ -7,9 +7,6 @@
  -----------------------------------------
  ***************************************************************************/
 
-//<doc><file>	$Id: MuonGMTestOnPrd.cxx,v 1.8 2009-03-28 10:59:01 stefspa Exp $
-//<version>	$Name: not supported by cvs2svn $
-
 #include "GaudiKernel/MsgStream.h"
 #include "StoreGate/StoreGateSvc.h"
 
@@ -20,12 +17,6 @@
 #include "MuonReadoutGeometry/RpcReadoutElement.h"
 #include "MuonReadoutGeometry/CscReadoutElement.h"
 
-// #include "MuonPrepRawData/MdtPrepDataContainer.h"
-// #include "MuonPrepRawData/MdtPrepDataCollection.h"
-// #include "MuonPrepRawData/MdtPrepData.h"
-
-// #include "Identifier/Identifier.h"
-// #include "Identifier/IdentifierHash.h"
 #include "TrkDistortedSurfaces/SaggedLineSurface.h"
 
 MuonGMTestOnPrd::MuonGMTestOnPrd(const std::string& name, ISvcLocator* pSvcLocator)
@@ -48,9 +39,6 @@ MuonGMTestOnPrd::MuonGMTestOnPrd(const std::string& name, ISvcLocator* pSvcLocat
     declareProperty("doCheckMisal", m_check_misal );        
 }
 
-MuonGMTestOnPrd::~MuonGMTestOnPrd()
-{ }
-
 StatusCode
 MuonGMTestOnPrd::initialize()
 {
@@ -256,32 +244,9 @@ MuonGMTestOnPrd::execute()
         }
     }
 
-//     // Rpc
-//     Muon::RpcPrepDataContainer * rpcContainer;
-
-//     // Tgc 
-//     TgcPrepDataContainer * tgcContainer;
-//     if ( StatusCode::SUCCESS != p_EventStore->retrieve(tgcContainer, key) )
-//     {
-//         log<<MSG::ERROR<<"Cannot retrieve TGC PRD Container "<<endmsg;
-//         return StatusCode::FAILURE;
-//     }
-//     else
-//         log<<MSG::INFO<<"Retrieved TGC PRD Container with size = " << tgcContainer->size()<< endmsg;
-
-//     // Csc
-//     CscPrepDataContainer * cscContainer;
-    
     return StatusCode::SUCCESS;
 }
 
-StatusCode
-MuonGMTestOnPrd::finalize()
-{
-  ATH_MSG_DEBUG( "Finalizing"  );
-  return StatusCode::SUCCESS;
-}
-
 void MuonGMTestOnPrd::processMdtCollection(const Muon::MdtPrepDataCollection* mdtColl,
                                            Identifier& collid,
                                            IdentifierHash& collidh) const 
diff --git a/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MuonIdHelperSvc.h b/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MuonIdHelperSvc.h
index bd60bc1dd08ecf64fac1af39059003934da604e0..1fbecb12a5d93ed70a3a5f866f5eb7c052b72914 100644
--- a/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MuonIdHelperSvc.h
+++ b/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MuonIdHelperSvc.h
@@ -31,9 +31,6 @@ namespace Muon {
     /** @brief AlgTool initilize */
     virtual StatusCode initialize() override;
     
-    /** @brief AlgTool finalize */
-    virtual StatusCode finalize() override;
-    
     /** @brief print all fields to string */
     virtual std::string toString( const Identifier& id ) const override;
 
diff --git a/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelperSvc.cxx b/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelperSvc.cxx
index f114a40d93ccf7306f0d286cee2d9415c15db5ed..d111243a615fcdb3ea79f3aa8b7ba8bf53f01454 100644
--- a/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelperSvc.cxx
+++ b/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelperSvc.cxx
@@ -139,11 +139,6 @@ namespace Muon {
     return StatusCode::SUCCESS;
   }
 
-  StatusCode MuonIdHelperSvc::finalize() {
-    if( AthService::finalize().isFailure() ) return StatusCode::FAILURE;
-    return StatusCode::SUCCESS;
-  }
-
   int MuonIdHelperSvc::gasGap( const Identifier& id ) const {
     if( isRpc(id) ) {
       return m_rpcIdHelper->gasGap(id);