diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcAthMisc.h b/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcAthMisc.h
deleted file mode 100755
index 390da5735a8b333db67e50d81261a831d9f1fc65..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcAthMisc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//
-//  Author :  Saclay Muon Software Group SaMuSoG
-//
-// The AmdcAthMisc header contains all this Bxxxxy stuff
-//
-#ifndef AmdcAthMisc_H
-#define AmdcAthMisc_H
-
-#include <iostream>
-#include <iomanip>
-#include <fstream>
-#include <cstdio>
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include <vector>
-#include <map>
-#include <string>
-#include <utility>
-
-#endif
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h b/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
index a4aff8e08a5a17c0a15d11ad046145cb0ff95b45..b20b0c241d0b4d6ed4ca85cdcf97028955f3a123 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.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 AMDCATH_AMDCSIMRECATHENASVC_H
@@ -22,8 +22,8 @@ class AtlasDetectorID ;
 
 #include "AthenaKernel/IOVSvcDefs.h"
 
-/////////////////////////////////////////////////////////////////////////////
-#include "AmdcAth/AmdcAthMisc.h"
+#include <vector>
+#include <string>
 
 class AmdcAlineStore ;
 class AmdcBlineStore ;
@@ -55,10 +55,6 @@ public:
 
    virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
 
-   bool       InitializedSvc();
-   bool       UsableSvc();
-   StatusCode UpdatedSvc(IOVSVC_CALLBACK_ARGS);
-
    /**Get Amdcsimrec interface */
    Amdcsimrec* GetAmdcsimrec();
 
@@ -101,10 +97,6 @@ private:
 ///////////////////////////////////
    void getAbsMax(double& currentMax, const double toCheck) const;
 
-   bool m_IsUsable ; //!< Tell usuability state 
-
-   bool m_IsInitialized ; //!< Tell initialisation state 
-
    /**Set A and B lines collections*/
    StatusCode SetAmdcABlineFromCool();
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
index f378dd2add50ecd75b36292643cfe7157bdf8097..dc4189317622daa17fe2c2d4ce9ae8f18c243c31 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
@@ -36,6 +36,8 @@
 #include "AmdcStand/bigamdcdump.h"
 #include "AmdcStand/loadamdcagddfromstring.h"
 
+#include <fstream>
+
 /// Standard Constructor
 AmdcsimrecAthenaSvc::AmdcsimrecAthenaSvc(const std::string& name,ISvcLocator* svc):
   AthService(name,svc),
@@ -60,9 +62,6 @@ AmdcsimrecAthenaSvc::AmdcsimrecAthenaSvc(const std::string& name,ISvcLocator* sv
    m_AmdcString = "" ;
    m_AgddString = "" ;
 
-   m_IsInitialized = false;
-   m_IsUsable      = false;
-
    m_AmdcABlinesStamp = 1;
    
    m_AGDD2GeoSwitchesStamp = -1 ;
@@ -208,9 +207,6 @@ StatusCode AmdcsimrecAthenaSvc::initialize() {
       ATH_MSG_DEBUG( "=>Strings come from Ascii file and A/B line stores from cool<=" ) ;
     }
 
-    m_IsInitialized = true ;
-    m_IsUsable      = true ;
-
     ATH_CHECK(initializeAscii());
     ATH_MSG_DEBUG( "Done: initializeAscii " ) ;
     
@@ -225,9 +221,6 @@ StatusCode AmdcsimrecAthenaSvc::initialize() {
   if ( (m_NameOfTheSource=="POOL" || m_NameOfTheSource=="GEOMODEL" ) && m_AlignmentSource == 3 ){
     ATH_MSG_DEBUG( "=>Strings come from Geomodel and A/B line stores as well<=" ) ;
     
-    m_IsInitialized = true ;
-    m_IsUsable      = true ;
-    
     ATH_CHECK(initializeFromGeomodel());
     ATH_MSG_DEBUG( "Done: initializeFromGeomodel " ) ;
   }
@@ -235,8 +228,6 @@ StatusCode AmdcsimrecAthenaSvc::initialize() {
 //Strings come from Geomodel and A/B line stores from cool
    if ( (m_NameOfTheSource=="POOL" || m_NameOfTheSource=="GEOMODEL" ) && m_AlignmentSource == 2 ){
     ATH_MSG_DEBUG( "=>Strings come from Geomodel and A/B line stores from cool<=" ) ;
-    m_IsInitialized = true ;
-    m_IsUsable      = true ;
 
     ATH_CHECK(initializeFromGeomodel());
     ATH_MSG_DEBUG( "Done: initializeFromGeomodel " ) ;
@@ -257,9 +248,6 @@ StatusCode AmdcsimrecAthenaSvc::initialize() {
       ATH_MSG_DEBUG( "=>Strings come from Oracle and A/B line stores from cool<=" ) ;
     }
 
-    m_IsInitialized = true ;
-    m_IsUsable      = true ;
-
     ATH_CHECK(initializeFromOracleNode());
     ATH_MSG_DEBUG( "Done: initializeFromOracleNode " ) ;
     
@@ -291,14 +279,6 @@ StatusCode AmdcsimrecAthenaSvc::queryInterface( const InterfaceID& riid, void**
   return StatusCode::SUCCESS;
 }
 
-bool AmdcsimrecAthenaSvc::UsableSvc()      {return m_IsUsable     ;}
-bool AmdcsimrecAthenaSvc::InitializedSvc() {return m_IsInitialized;}
-StatusCode AmdcsimrecAthenaSvc::UpdatedSvc(IOVSVC_CALLBACK_ARGS)
-{
- ATH_MSG_DEBUG("----> UpdatedSvc is called" ) ; 
- return StatusCode::SUCCESS;
-}
- 
 Amdcsimrec* AmdcsimrecAthenaSvc::GetAmdcsimrec(){return p_Amdcsimrec;}
 
 std::string AmdcsimrecAthenaSvc::GetNameOfTheSource(){return m_NameOfTheSource;}
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAline.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAline.h
index 864a9d7b165605cd570c4d73d8c36e2c10171707..385968379307a143633192cd50b41cc046152878 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAline.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAline.h
@@ -1,11 +1,12 @@
 /*
-  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 AmdcAline_H
-#define AmdcAline_H
+#ifndef AMDCCORE_AMDCALINE_H
+#define AMDCCORE_AMDCALINE_H
 
-#include "AmdcCore/AmdcsimrecMisc.h"
+#include <iostream>
+#include <string>
 
   /**
    @class AmdcAline
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAlineStore.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAlineStore.h
index e91deda45d7fb67ce7e6748b298e1c4eef70a205..7034e3ad3f65a429e7899a5c488666c57dff1828 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAlineStore.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAlineStore.h
@@ -1,13 +1,13 @@
 /*
-  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 AmdcAlineStore_H
-#define AmdcAlineStore_H
-
-#include "AmdcCore/AmdcsimrecMisc.h"
+#ifndef AMDCCORE_AMDCALINESTORE_H
+#define AMDCCORE_AMDCALINESTORE_H
 
 #include "AmdcCore/AmdcAline.h"
+#include <vector>
+#include <iostream>
 
   /**
    @class AmdcAlineStore
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBline.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBline.h
index 2591affc1c3fdab44deaa14a2696f5de62555adc..6df438a603a628e79528c841e2d470b9a608463c 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBline.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBline.h
@@ -1,11 +1,12 @@
 /*
-  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 AmdcBline_H
-#define AmdcBline_H
+#ifndef AMDCCORE_AMDCBLINE_H
+#define AMDCCORE_AMDCBLINE_H
 
-#include "AmdcCore/AmdcsimrecMisc.h"
+#include <string>
+#include <iostream>
 
   /**
    @class AmdcBline
@@ -19,7 +20,7 @@
 class AmdcBline{
 public:
    AmdcBline();
-   virtual ~AmdcBline();
+   ~AmdcBline();
 
 public:
 ///////////////////////////////////
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBlineStore.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBlineStore.h
index 062edb47bb85c3b2cd3b3c5f63f3b8269791d9c4..061fee79953a414e57ae2416a6acdd13f37e5e78 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBlineStore.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBlineStore.h
@@ -1,13 +1,13 @@
 /*
-  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 AmdcBlineStore_H
-#define AmdcBlineStore_H
-
-#include "AmdcCore/AmdcsimrecMisc.h"
+#ifndef AMDCCORE_AMDCBLINESTORE_H
+#define AMDCCORE_AMDCBLINESTORE_H
 
 #include "AmdcCore/AmdcBline.h"
+#include <vector>
+#include <iostream>
 
   /**
    @class AmdcBlineStore
@@ -21,7 +21,7 @@
 class AmdcBlineStore{
 public:
     AmdcBlineStore();
-    virtual ~AmdcBlineStore();
+    ~AmdcBlineStore();
 
 public:
 ///////////////////////////////////
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIline.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIline.h
index 02d77d65c74d4e3aba123ab476da7aee3c3a8f2a..7f0047d941838233adc1a2a1d0bf20e22d49c1a0 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIline.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIline.h
@@ -1,11 +1,12 @@
 /*
-  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 AmdcIline_H
-#define AmdcIline_H
+#ifndef AMDCCORE_AMDCILINE_H
+#define AMDCCORE_AMDCILINE_H
 
-#include "AmdcCore/AmdcsimrecMisc.h"
+#include <string>
+#include <iostream>
 
   /**
    @class AmdcIline
@@ -19,7 +20,7 @@
 class AmdcIline{
 public:
    AmdcIline();
-   virtual ~AmdcIline();
+   ~AmdcIline();
 
 public:
 ///////////////////////////////////
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIlineStore.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIlineStore.h
index 06114ae34bf253f5a986da07816df2bd15f14299..844faa0dca22aa8ef3a8a9cc0a52c05cdd410527 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIlineStore.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIlineStore.h
@@ -1,11 +1,12 @@
 /*
-  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 AmdcIlineStore_H
-#define AmdcIlineStore_H
+#ifndef AMDCCORE_AMDCILINESTORE_H
+#define AMDCCORE_AMDCILINESTORE_H
 
-#include "AmdcCore/AmdcsimrecMisc.h"
+#include <vector>
+#include <iostream>
 
 #include "AmdcCore/AmdcIline.h"
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/Amdcsimrec.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/Amdcsimrec.h
index 472c201b4a5a8e4ded3f64a61d6e0d606a286cd0..10337e6c79f92c32f6ed64c929864f6ad10da21c 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/Amdcsimrec.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/Amdcsimrec.h
@@ -1,11 +1,11 @@
 /*
-  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 Amdcsimrec_H
-#define Amdcsimrec_H
+#ifndef AMDCCORE_AMDCSIMREC_H
+#define AMDCCORE_AMDCSIMREC_H
 
-#include "AmdcCore/AmdcsimrecMisc.h"
+#include <string>
 
   /**
    @class Amdcsimrec
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecAccess.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecAccess.h
index b79688f2fa77edb0e1579ca2bd508e17f001a5e9..adb743ea9cfc3672c4f7f5c0e79171fc31c62406 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecAccess.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecAccess.h
@@ -1,11 +1,9 @@
 /*
-  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 AmdcsimrecAccess_H
-#define AmdcsimrecAccess_H
-
-#include "AmdcCore/AmdcsimrecMisc.h"
+#ifndef AMDCCORE_AMDCSIMRECACCESS_H
+#define AMDCCORE_AMDCSIMRECACCESS_H
 
 #include "AmdcCore/Amdcsimrec.h"
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecMisc.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecMisc.h
deleted file mode 100755
index 6224a8c67fa600a7ff8ed43bac0bba4ff61933f9..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecMisc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//
-//  Author :  Saclay Muon Software Group SaMuSoG
-//
-// The AmdcsimrecMisc header contains all this Bxxxxy stuff
-//
-#ifndef AmdcsimrecMisc_H
-#define AmdcsimrecMisc_H
-
-#include <iostream>
-#include <iomanip>
-#include <fstream>
-#include <cstdio>
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include <vector>
-#include <map>
-#include <string>
-#include <utility>
-
-#endif
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/cppbigdump.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/cppbigdump.h
index e7aa52dd4a1cb7224d82b79d9ced428cb0c307bc..aebd44997c6363e7e51b71fd406be74bb5c6e6fd 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/cppbigdump.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/cppbigdump.h
@@ -1,12 +1,11 @@
 /*
-  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 cppbigdump_H
-#define cppbigdump_H
+#ifndef AMDCCORE_CPPBIGDUMP_H
+#define AMDCCORE_CPPBIGDUMP_H
 
-#include "AmdcCore/Amdcsimrec.h"
-#include "AmdcCore/AmdcsimrecMisc.h"
+class Amdcsimrec;
 
 void cppbigdump(Amdcsimrec* pAmdcsimrec) ;
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcAline.cxx b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcAline.cxx
index 6698005e2c1829c7c61b142e39eeade4fcf7c0be..45ec2a2e4fec60884e2e0057dd9fdde327d6d52e 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcAline.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcAline.cxx
@@ -1,8 +1,9 @@
 /*
-  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 "AmdcCore/AmdcAline.h"
+#include <iomanip>
 
 using std::setiosflags;
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcBline.cxx b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcBline.cxx
index 722af20677500bd93ab719c2c3fd4060ae179f94..856419392e466d2a44e6d128d0dbdd87f44994d6 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcBline.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcBline.cxx
@@ -1,8 +1,9 @@
 /*
-  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 "AmdcCore/AmdcBline.h"
+#include <iomanip>
 
 using std::setiosflags;
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcIline.cxx b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcIline.cxx
index 2d5fad625bc89da705fa064ba89a6452360bb2da..4718e1ac280a6ed4aa2944cc3c67254570ecb69f 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcIline.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcIline.cxx
@@ -1,8 +1,9 @@
 /*
-  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 "AmdcCore/AmdcIline.h"
+#include <iomanip>
 
 using std::setiosflags;
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/cppbigdump.cxx b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/cppbigdump.cxx
index 9b6c68556097c49b8fc3ef482b5800259e233167..b5da9f97e6a2a4e21b33858bad98c8a710423600 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/cppbigdump.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/cppbigdump.cxx
@@ -1,9 +1,10 @@
 /*
-  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 "AmdcCore/Amdcsimrec.h"
-#include "AmdcCore/AmdcsimrecMisc.h"
+#include <fstream>
+#include <iomanip>
 
 using std::setiosflags;
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h
index 14b6f95fd171a2c0ed4f18c74bde3940d44d18b5..e78595ec08fb2cf6602b86cc3006168ed36f764f 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h
@@ -2,15 +2,11 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef AmdcDb_H
-#define AmdcDb_H
+#ifndef AMDCDB_AMDCDB_H
+#define AMDCDB_AMDCDB_H
 
 #include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h" 
-#include "AthenaKernel/IOVSvcDefs.h"
-#include "AmdcDb/AmdcDbMisc.h"
-#include "AmdcDb/IRDBAccessSvcWithUpdate.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBQuery.h"
 #include <memory>
@@ -30,7 +26,7 @@ template <class TYPE> class SvcFactory;
  *
  */
 
-class AmdcDb final : public AthService, virtual public IRDBAccessSvcWithUpdate {
+class AmdcDb final : public AthService, virtual public IRDBAccessSvc {
  public:
   static const InterfaceID& interfaceID() { return IID_IRDBAccessSvc; }
 
@@ -39,12 +35,6 @@ class AmdcDb final : public AthService, virtual public IRDBAccessSvcWithUpdate {
 
   virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
 
-  virtual bool       InitializedSvc() override;
-  virtual bool       UsableSvc() override;
-  virtual StatusCode UpdatedSvc(IOVSVC_CALLBACK_ARGS) override;
-
-  StatusCode AmdcsimrecAthenaSvcUpdatedSvc(IOVSVC_CALLBACK_ARGS);
-  
   virtual IRDBRecordset_ptr getRecordsetPtr(const std::string& node,
                                             const std::string& tag,
                                             const std::string& tag2node="",
@@ -74,14 +64,10 @@ class AmdcDb final : public AthService, virtual public IRDBAccessSvcWithUpdate {
   virtual ~AmdcDb();
 
  private:
-   bool m_IsUsable ; //!< Tell usuability state 
-   
-   bool m_IsInitialized ; //!< Tell initialisation state 
-   
-   StoreGateSvc* p_detStore     ; //!< Pointer On detector store
+   StoreGateSvc* m_detStore     ; //!< Pointer On detector store
   
-   AmdcDbSvc* p_AmdcDbSvcFromAmdc ; //!< Pointer on AmdcDbSvc
-   AmdcDbSvc* p_AmdcDbSvcFromRDB  ; //!< Pointer on AmdcDbSvc
+   AmdcDbSvc* m_AmdcDbSvcFromAmdc ; //!< Pointer on AmdcDbSvc
+   AmdcDbSvc* m_AmdcDbSvcFromRDB  ; //!< Pointer on AmdcDbSvc
 
    std::string m_AMDBtag; //!< name of Oracle node
 
@@ -110,15 +96,13 @@ class AmdcDb final : public AthService, virtual public IRDBAccessSvcWithUpdate {
    
    IRDBRecordset_ptr m_emptyRecordset ; //!< Pointer on an empty Recordset
 
-   ServiceHandle<AmdcsimrecAthenaSvc> p_AmdcsimrecAthenaSvc;  //!< Pointer On AmdcsimrecAthenaSvc
+   ServiceHandle<AmdcsimrecAthenaSvc> m_AmdcsimrecAthenaSvc;  //!< Pointer On AmdcsimrecAthenaSvc
 
    //Db Keys
    std::string m_detectorKey  ;
    std::string m_detectorNode ;
 
-   StatusCode regFcnAmdcsimrecAthenaSvcUpdatedSvc();
    StatusCode DoUpdatedSvc();
-   int m_AmdcsimrecAthenaSvcUpdatedSvcDONE ;
 };
 
 #endif
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb2Sql.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb2Sql.h
index 92798548e7b18e39e30b0fdd08c3a3baadbdbb2d..592dc485a46eccb60e36b402143bb470c8a8747f 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb2Sql.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb2Sql.h
@@ -1,11 +1,10 @@
 /*
-  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 AmdcDb2Sql_H
-#define AmdcDb2Sql_H
+#ifndef AMDCDB_AMDCDB2SQL_H
+#define AMDCDB_AMDCDB2SQL_H
 
-#include "AmdcDb/AmdcDbMisc.h"
 class IRDBAccessSvc;
 
   /**
@@ -20,7 +19,7 @@ class IRDBAccessSvc;
 class AmdcDb2Sql{
 public:
     AmdcDb2Sql();
-    virtual ~AmdcDb2Sql();
+    ~AmdcDb2Sql();
 
 public:
 ///////////////////////////////////
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbMisc.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbMisc.h
deleted file mode 100755
index 9c426bc08c1e68ebbf508b1c05592ea84bd2c89f..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbMisc.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//
-#ifndef AmdcOracleMisc_H
-#define AmdcOracleMisc_H
-
-#include <sstream>
-#include <iostream>
-#include <iomanip>
-#include <fstream>
-#include <cstdio>
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include <vector>
-#include <map>
-#include <string>
-#include <utility>
-#include <cctype>
-
-#endif
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbRecord.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbRecord.h
index a8bbc8160f5f53c6cfd9deb7b3b508b6a59e388f..8830b0b3e256af582ca35d33395e65e1e2ca3a49 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbRecord.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbRecord.h
@@ -1,14 +1,15 @@
 /*
-  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 AmdcDbRecord_H
-#define AmdcDbRecord_H
+#ifndef AMDCDB_AMDCDBRECORD_H
+#define AMDCDB_AMDCDBRECORD_H
 
 #include "RDBAccessSvc/IRDBRecord.h"
 
-/////////////////////////////////////////////////////////
-#include "AmdcDb/AmdcDbMisc.h"
+#include <string>
+#include <vector>
+#include <map>
 
   /**
    @class AmdcDbRecord
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbRecordset.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbRecordset.h
index 355a49cfa4c4b6aa9bf8cbe3dc525bbdb6a5c081..e6273a5f344c5b53a3cd56f6bd38c3f3d0d9639b 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbRecordset.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbRecordset.h
@@ -1,12 +1,12 @@
 /*
-  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 AmdcDbRecordset_H
-#define AmdcDbRecordset_H
+#ifndef AMDCDB_AMDCDBRECORDSET_H
+#define AMDCDB_AMDCDBRECORDSET_H
 
 #include "RDBAccessSvc/IRDBRecordset.h"
-#include "AmdcDb/AmdcDbMisc.h"
+#include <string>
 
   /**
    @class AmdcDbRecordset
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvc.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvc.h
index 99067a046ba0b59e3e7b4a80040acc05e0f4781f..a3c0a36d73d7da37cee53b2073f13adc76058fd5 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvc.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvc.h
@@ -5,8 +5,9 @@
 #ifndef AMDCDB_AMDCDBSVC_H
 #define AMDCDB_AMDCDBSVC_H
 
-#include "AmdcDb/AmdcDbMisc.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
+#include <string>
+#include <map>
 
 class pIRDBRecordset;
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvcMakerFromAmdc.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvcMakerFromAmdc.h
index e7200df3d4a62f587c86dab283a5f57c39237ac7..c5c18325687f76a55cf2e404c790169e33634cbe 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvcMakerFromAmdc.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvcMakerFromAmdc.h
@@ -2,10 +2,12 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef AmdcDbSvcMakerFromAmdc_H
-#define AmdcDbSvcMakerFromAmdc_H
+#ifndef AMDCDB_AMDCDBSVCMAKERFROMAMDC_H
+#define AMDCDB_AMDCDBSVCMAKERFROMAMDC_H
+
+#include <string>
+#include <map>
 
-#include "AmdcDb/AmdcDbMisc.h"
 class Amdcsimrec;
 class AmdcDbSvc;
 class AmdcDbRecordset;
@@ -23,7 +25,7 @@ class AmdcDbRecord;
 class AmdcDbSvcMakerFromAmdc{
 public:
     AmdcDbSvcMakerFromAmdc();
-    virtual ~AmdcDbSvcMakerFromAmdc()=default;
+    ~AmdcDbSvcMakerFromAmdc()=default;
 
 public:
 ///////////////////////////////////
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvcMakerFromRDB.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvcMakerFromRDB.h
index 5290740e77d42ef7d43e321d7b10afce058eb7a1..322fb11b52178d70f15d24003c66681bd240484e 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvcMakerFromRDB.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDbSvcMakerFromRDB.h
@@ -2,10 +2,11 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef AmdcDbSvcMakerFromRDB_H
-#define AmdcDbSvcMakerFromRDB_H
+#ifndef AMDCDB_AMDCDBSVCMAKERFROMRDB_H
+#define AMDCDB_AMDCDBSVCMAKERFROMRDB_H
 
-#include "AmdcDb/AmdcDbMisc.h"
+#include <string>
+#include <map>
 
 class IRDBAccessSvc;
 class AmdcDbSvc;
@@ -27,7 +28,7 @@ namespace AmdcDb_detail {
 class AmdcDbSvcMakerFromRDB{
 public:
     AmdcDbSvcMakerFromRDB();
-    virtual ~AmdcDbSvcMakerFromRDB()=default;
+    ~AmdcDbSvcMakerFromRDB()=default;
 
 public:
 ///////////////////////////////////
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/IRDBAccessSvcWithUpdate.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/IRDBAccessSvcWithUpdate.h
deleted file mode 100755
index 9867fe5c22eb7c62a3c05359d3084333d8afd54c..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/IRDBAccessSvcWithUpdate.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef IRDBAccessSvcWithUpdate_H
-#define IRDBAccessSvcWithUpdate_H
-
-#include "RDBAccessSvc/IRDBAccessSvc.h"
-
-#include "AthenaKernel/IOVSvcDefs.h"
-
-  /**
-   @class AmdcDb
-
-   This class dreived from IRDBAccessSvc adds the control state method
-   
-  @author samusog@cern.ch
-  
-  */
-
-class IRDBAccessSvcWithUpdate : virtual public IRDBAccessSvc {
-public:
-
-  virtual bool       InitializedSvc() = 0 ;
-  virtual bool       UsableSvc() = 0 ;
-  virtual StatusCode UpdatedSvc(IOVSVC_CALLBACK_ARGS) = 0 ;
-  
-};
-
-#endif
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
index 98baf256284f9383a2bdd3b3b60e6c3cf9eb9671..ea84217fc16b42caa9e73770efbe1eb8b3c79ac0 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
@@ -22,13 +22,10 @@
 AmdcDb::AmdcDb(const std::string& name,ISvcLocator* svc)
   : AthService(name,svc) 
   , m_emptyRecordset(new AmdcDbRecordset())
-  , p_AmdcsimrecAthenaSvc ( "AmdcsimrecAthenaSvc",name )
+  , m_AmdcsimrecAthenaSvc ( "AmdcsimrecAthenaSvc",name )
 {
-  p_AmdcDbSvcFromAmdc = 0 ;
-  p_AmdcDbSvcFromRDB  = 0 ;
-
-  m_IsInitialized = false;
-  m_IsUsable      = false;
+  m_AmdcDbSvcFromAmdc = 0 ;
+  m_AmdcDbSvcFromRDB  = 0 ;
 
   m_AMDBtag = "" ;
   m_UglyCodeOn = 0 ;
@@ -40,8 +37,6 @@ AmdcDb::AmdcDb(const std::string& name,ISvcLocator* svc)
   m_FromRDBEpsLengthCM = 5 ;
   m_FromRDBEpsAngle    = 6 ;
 
-  m_AmdcsimrecAthenaSvcUpdatedSvcDONE = false ;
-
   std::string DummyString = "AAAA" ;
   m_TabFromAmdcEpsLengthMM.push_back(DummyString) ; m_TabFromAmdcEpsLengthMM.clear() ;
   m_TabFromAmdcEpsLengthCM.push_back(DummyString) ; m_TabFromAmdcEpsLengthCM.clear() ;
@@ -84,15 +79,15 @@ AmdcDb::AmdcDb(const std::string& name,ISvcLocator* svc)
   declareProperty( "ValFromRDBEpsAngle"      , m_ValFromRDBEpsAngle     ) ;
    
 
-  declareProperty("AmdcsimrecAthenaSvc", p_AmdcsimrecAthenaSvc);
+  declareProperty("AmdcsimrecAthenaSvc", m_AmdcsimrecAthenaSvc);
   
-  p_detStore = 0 ;
+  m_detStore = 0 ;
 }
  
 /// Standard Destructor
 AmdcDb::~AmdcDb()  {
-  delete p_AmdcDbSvcFromAmdc ;
-  delete p_AmdcDbSvcFromRDB  ;
+  delete m_AmdcDbSvcFromAmdc ;
+  delete m_AmdcDbSvcFromRDB  ;
 }
  
 /// Service initialisation
@@ -135,106 +130,28 @@ StatusCode AmdcDb::initialize() {
   ATH_MSG_INFO( "Keys are  (key) "  << m_detectorKey << " (node) " << m_detectorNode ) ;
 
 //Set pointer on DetectorStore 
-  sc = service("DetectorStore",p_detStore);
+  sc = service("DetectorStore",m_detStore);
   if ( sc.isFailure() ) {
     ATH_MSG_FATAL( "DetectorStore service not found !" ) ;
     return StatusCode::FAILURE;
   }
 
-//Retrieve p_AmdcsimrecAthenaSvc and set up call back
-  if ( p_AmdcsimrecAthenaSvc.retrieve().isFailure() ) {
-    ATH_MSG_FATAL( "Failed to retrieve service " << p_AmdcsimrecAthenaSvc ) ;
+//Retrieve m_AmdcsimrecAthenaSvc and set up call back
+  if ( m_AmdcsimrecAthenaSvc.retrieve().isFailure() ) {
+    ATH_MSG_FATAL( "Failed to retrieve service " << m_AmdcsimrecAthenaSvc ) ;
     return StatusCode::FAILURE;
   } 
-  ATH_MSG_INFO( "Retrieved service " << p_AmdcsimrecAthenaSvc ) ;
-
-  if (p_AmdcsimrecAthenaSvc->InitializedSvc()) {
-    ATH_MSG_INFO( "p_AmdcsimrecAthenaSvc->InitializedSvc() is true " ) ;
-    m_AmdcsimrecAthenaSvcUpdatedSvcDONE = true ; 
-
-  }else{
-    ATH_MSG_INFO( "p_AmdcsimrecAthenaSvc->InitializedSvc() is false " ) ;
-
-    sc=regFcnAmdcsimrecAthenaSvcUpdatedSvc();
-    if ( sc.isFailure() ) {
-      ATH_MSG_FATAL("regFcnAmdcsimrecAthenaSvcUpdatedSvc failed" ) ;
-      return StatusCode::FAILURE;
-    }
-    ATH_MSG_INFO( "Done: regFcnAmdcsimrecAthenaSvcUpdatedSvc " ) ;
+  ATH_MSG_INFO( "Retrieved service " << m_AmdcsimrecAthenaSvc ) ;
 
-  }
-
-//Do something now if possible
-  if ( m_AmdcsimrecAthenaSvcUpdatedSvcDONE ){
-    ATH_MSG_INFO( "m_AmdcsimrecAthenaSvcUpdatedSvcDONE found true in initialize " ) ;
-      StatusCode sc = DoUpdatedSvc() ;
-      if ( sc.isFailure() ) {
-        ATH_MSG_FATAL( "DoUpdatedSvc failed" ) ; 
-        return StatusCode::FAILURE;
-      }
-      m_IsInitialized = true;
-  }
+  ATH_CHECK(DoUpdatedSvc());
   
   ATH_MSG_INFO( "Initialisation ended     " ) ;
   return StatusCode::SUCCESS;
 
 }
- 
-StatusCode AmdcDb::regFcnAmdcsimrecAthenaSvcUpdatedSvc()
-{
-
-  StatusCode sc = p_detStore->regFcn(
-                         &AmdcsimrecAthenaSvc::UpdatedSvc,(&*p_AmdcsimrecAthenaSvc),
-                         &AmdcDb::AmdcsimrecAthenaSvcUpdatedSvc,this,true
-                         );
-  if (sc.isFailure()) {
-    ATH_MSG_FATAL( "Unable to register callback on AmdcDb::AmdcsimrecAthenaSvcUpdatedSvc from AmdcsimrecAthenaSvc::UpdatedSvc " ) ;
-    return StatusCode::FAILURE;
-  }
-  ATH_MSG_INFO( "Done: Register callback on AmdcDb::AmdcsimrecAthenaSvcUpdatedSvc from AmdcsimrecAthenaSvc::UpdatedSvc" ) ;
-  sc = p_detStore->regFcn(
-              &AmdcDb::AmdcsimrecAthenaSvcUpdatedSvc,this,
-              &IRDBAccessSvcWithUpdate::UpdatedSvc,dynamic_cast<IRDBAccessSvcWithUpdate*>(this),true
-              );
-  if (sc.isFailure()) {
-    ATH_MSG_FATAL( "Unable to register callback on AmdcDb::UpdatedSvc from AmdcDb::AmdcsimrecAthenaSvcUpdatedSvc " ) ;
-    return StatusCode::FAILURE;
-  }
-  ATH_MSG_INFO( "Done: Register callback on AmdcDb::UpdatedSvc from AmdcDb::AmdcsimrecAthenaSvcUpdatedSvc " ) ;
-
-  return StatusCode::SUCCESS;
-  
-}
-
-StatusCode AmdcDb::AmdcsimrecAthenaSvcUpdatedSvc(IOVSVC_CALLBACK_ARGS)
-{
-  ATH_MSG_INFO( "AmdcsimrecAthenaSvcUpdatedSvc called     " ) ;  
-
-  if ( !(p_AmdcsimrecAthenaSvc->UsableSvc()) ) {
-    ATH_MSG_INFO( "BUT p_AmdcsimrecAthenaSvc found NOT usable yet  " ) ;  
-    return StatusCode::SUCCESS;
-  }else{
-    m_AmdcsimrecAthenaSvcUpdatedSvcDONE = true ;
-    ATH_MSG_INFO( "AND p_AmdcsimrecAthenaSvc found usable   " ) ;  
-  }
-
-
-  StatusCode sc = DoUpdatedSvc() ;
-  if ( sc.isFailure() ) {
-    ATH_MSG_FATAL( "DoUpdatedSvc failed" ) ; 
-    return StatusCode::FAILURE;
-  }
-
-  return StatusCode::SUCCESS;
-
-}
 
 StatusCode AmdcDb::DoUpdatedSvc()
 {
-  if ( !m_AmdcsimrecAthenaSvcUpdatedSvcDONE ){
-    ATH_MSG_INFO( "DoUpdatedSvc() called BUT m_AmdcsimrecAthenaSvcUpdatedSvcDONE is false    " ) ;
-    return StatusCode::SUCCESS;
-  }
 
 //Set Db Keys
   IRDBAccessSvc* pIRDBAccessSvc;
@@ -245,11 +162,11 @@ StatusCode AmdcDb::DoUpdatedSvc()
   }
   
 //Get Amdc geometry
-  Amdcsimrec* pAmdcsimrec = p_AmdcsimrecAthenaSvc->GetAmdcsimrec();
+  Amdcsimrec* pAmdcsimrec = m_AmdcsimrecAthenaSvc->GetAmdcsimrec();
    
-//Set p_AmdcDbSvcFromAmdc
-  delete p_AmdcDbSvcFromAmdc ;
-  p_AmdcDbSvcFromAmdc = new AmdcDbSvc();
+//Set m_AmdcDbSvcFromAmdc
+  delete m_AmdcDbSvcFromAmdc ;
+  m_AmdcDbSvcFromAmdc = new AmdcDbSvc();
   AmdcDbSvcMakerFromAmdc aAmdcDbSvcMakerFromAmdc;
   aAmdcDbSvcMakerFromAmdc.SetUglyCodeOn(m_UglyCodeOn);
   aAmdcDbSvcMakerFromAmdc.SetEpsLengthMM(m_FromAmdcEpsLengthMM);
@@ -261,33 +178,23 @@ StatusCode AmdcDb::DoUpdatedSvc()
   ItemMax =  m_TabFromAmdcEpsAngle.size()    ; for (int Item=0; Item<ItemMax ; Item++) aAmdcDbSvcMakerFromAmdc.SetEpsAngle   ( m_TabFromAmdcEpsAngle[Item]    , m_ValFromAmdcEpsAngle[Item]    ) ; 
   
   
-  aAmdcDbSvcMakerFromAmdc.Set(pAmdcsimrec,p_AmdcDbSvcFromAmdc);
+  aAmdcDbSvcMakerFromAmdc.Set(pAmdcsimrec,m_AmdcDbSvcFromAmdc);
  
-//Set p_AmdcDbSvcFromRDB
-  delete p_AmdcDbSvcFromRDB  ;
-  p_AmdcDbSvcFromRDB = new AmdcDbSvc();
+//Set m_AmdcDbSvcFromRDB
+  delete m_AmdcDbSvcFromRDB  ;
+  m_AmdcDbSvcFromRDB = new AmdcDbSvc();
   AmdcDbSvcMakerFromRDB aAmdcDbSvcMakerFromRDB;
   aAmdcDbSvcMakerFromRDB.SetEpsLengthMM(m_FromRDBEpsLengthMM);
   aAmdcDbSvcMakerFromRDB.SetEpsLengthCM(m_FromRDBEpsLengthCM);
   aAmdcDbSvcMakerFromRDB.SetEpsAngle(m_FromRDBEpsAngle);
-  aAmdcDbSvcMakerFromRDB.Set(m_detectorKey,m_detectorNode,pIRDBAccessSvc,p_AmdcDbSvcFromRDB);
+  aAmdcDbSvcMakerFromRDB.Set(m_detectorKey,m_detectorNode,pIRDBAccessSvc,m_AmdcDbSvcFromRDB);
   ItemMax =  m_TabFromRDBEpsLengthMM.size() ; for (int Item=0; Item<ItemMax ; Item++) aAmdcDbSvcMakerFromRDB.SetEpsLengthMM( m_TabFromRDBEpsLengthMM[Item] , m_ValFromRDBEpsLengthMM[Item] ) ;
   ItemMax =  m_TabFromRDBEpsLengthCM.size() ; for (int Item=0; Item<ItemMax ; Item++) aAmdcDbSvcMakerFromRDB.SetEpsLengthCM( m_TabFromRDBEpsLengthCM[Item] , m_ValFromRDBEpsLengthCM[Item] ) ;
   ItemMax =  m_TabFromRDBEpsAngle.size()    ; for (int Item=0; Item<ItemMax ; Item++) aAmdcDbSvcMakerFromRDB.SetEpsAngle   ( m_TabFromRDBEpsAngle[Item]    , m_ValFromRDBEpsAngle[Item]    ) ; 
 
-  m_IsUsable      = true ;
-  
   return StatusCode::SUCCESS;
 }
 
-bool AmdcDb::UsableSvc()      {return m_IsUsable     ;}
-bool AmdcDb::InitializedSvc() {return m_IsInitialized;}
-StatusCode AmdcDb::UpdatedSvc(IOVSVC_CALLBACK_ARGS)
-{
-  ATH_MSG_INFO( "UpdatedSvc done     " ) ;
-  return StatusCode::SUCCESS;
-}
- 
 /// Service finalisation
 StatusCode AmdcDb::finalize(){return StatusCode::SUCCESS;}
  
@@ -308,10 +215,10 @@ IRDBRecordset_ptr AmdcDb::getRecordsetPtr(const std::string& node,
                                           const std::string& /*connName*/)
 {
   if(tag=="RDB") {
-    return p_AmdcDbSvcFromRDB->getRecordset(node);
+    return m_AmdcDbSvcFromRDB->getRecordset(node);
   }
   else if(tag=="Amdc") {
-    return p_AmdcDbSvcFromAmdc->getRecordset(node);
+    return m_AmdcDbSvcFromAmdc->getRecordset(node);
   }
   else {
     return m_emptyRecordset;
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb2Sql.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb2Sql.cxx
index 1fcbe908bd82434f3ceeb273ed9d4e3666e39d5c..5389b2f202a8ff7c2ed83ba8c93b2938602a2524 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb2Sql.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb2Sql.cxx
@@ -10,6 +10,9 @@
 #include "AmdcDb/AmdcDb2Sql.h"
 
 #include "AmdcDb/AmdcDbRecord.h"
+#include <iostream>
+#include <fstream>
+#include <iomanip>
 
 AmdcDb2Sql::AmdcDb2Sql(){ 
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbRecord.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbRecord.cxx
index 71af92deefa761e0d3d9f55346bcc48c791a035d..0e5b658bf2531d9ab80ad8068a60a6ee4f4e6f19 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbRecord.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbRecord.cxx
@@ -4,6 +4,10 @@
 
 #include "AmdcDb/AmdcDbRecord.h"
 #include <cmath>
+#include <iostream>
+#include <fstream>
+#include <iomanip>
+
 AmdcDbRecord::AmdcDbRecord(long UniversalId,std::string NameOfTheRecord){
 
   m_MapOfint["Dummy"]    =  0  ; m_MapOfint.clear();
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbRecordset.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbRecordset.cxx
index c478be0c72c96cf51d251bcde0bfdf2729db4224..5339df63b7da9a93f5768cc5e8aa5b6b6674bc0e 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbRecordset.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbRecordset.cxx
@@ -1,9 +1,10 @@
 /*
-  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 "AmdcDb/AmdcDbRecordset.h"
 #include "AmdcDb/AmdcDbRecord.h"
+#include <iostream>
 
 AmdcDbRecordset::AmdcDbRecordset(){}
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbSvcMakerFromRDB.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbSvcMakerFromRDB.cxx
index da7eb91953fa29b4bbed3e61010e0c09b6b90117..a571d091bf4fe4228b7e91dacc7031101abb9df3 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbSvcMakerFromRDB.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbSvcMakerFromRDB.cxx
@@ -10,6 +10,8 @@
 #include "AmdcDb/AmdcDbRecordset.h"
 #include "AmdcDb/AmdcDbRecord.h"
 #include "boost/range/iterator_range.hpp"
+#include <iostream>
+#include <sstream>
 
 namespace AmdcDb_detail {
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcMGM/AmdcMGM/AmdcDumpGeoModel.h b/MuonSpectrometer/Amdcsimrec/AmdcMGM/AmdcMGM/AmdcDumpGeoModel.h
index 5450ca47cf6c062e2a38c0b7426854cbd686ad35..2fbcfef9d71eba2e548247c294d4473523b4f8c1 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcMGM/AmdcMGM/AmdcDumpGeoModel.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcMGM/AmdcMGM/AmdcDumpGeoModel.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef AmdcDumpGeoModel_H
-#define AmdcDumpGeoModel_H
+#ifndef AMDCMGM_AMDCDUMPGEOMODEL_H
+#define AMDCMGM_AMDCDUMPGEOMODEL_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ServiceHandle.h"
@@ -13,9 +13,12 @@
 #include "GeoPrimitives/GeoPrimitives.h"
 
 /////////////////////////////////////////////////////////////////////////////
-#include "AmdcMGM/AmdcMGMMisc.h"
 #include "AmdcAth/AmdcsimrecAthenaSvc.h"
 
+#include <string>
+#include <vector>
+#include <fstream>
+
 namespace MuonGM {
     class MdtReadoutElement;
     class RpcReadoutElement;
@@ -40,8 +43,6 @@ public:
    StatusCode initialize();
    StatusCode execute(){return StatusCode::SUCCESS;}
 
-   StatusCode DoItCallback(IOVSVC_CALLBACK_ARGS);
-
 private:
 ///////////////////////////////////
 //Functions
@@ -210,16 +211,12 @@ private:
    double m_Csc_MaxDiffzz  ; //!< Max deviation
    double m_Csc_MaxDifftt  ; //!< Max deviation
 
-   bool m_AmdcsimrecAthenaSvcUpdatedSvcDONE     ; //!< status of p_AmdcsimrecAthenaSvc
-
    int m_KountCallsDoIt     ; //!< Kount calls to DoIt
 
    ServiceHandle<AmdcsimrecAthenaSvc> p_AmdcsimrecAthenaSvc;  //!< Pointer On AmdcsimrecAthenaSvc
    ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
 
-   StatusCode regFcnDoIt();
    StatusCode DoIt();
-
 };
 
 #endif
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcMGM/AmdcMGM/AmdcMGMMisc.h b/MuonSpectrometer/Amdcsimrec/AmdcMGM/AmdcMGM/AmdcMGMMisc.h
deleted file mode 100644
index eceffe86cfba58d06ef01d9c4bae8b9e29fa3580..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcMGM/AmdcMGM/AmdcMGMMisc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//
-#ifndef AmdcMGMMISC_H
-#define AmdcMGMMISC_H
-
-#include <sstream>
-#include <iostream>
-#include <iomanip>
-#include <fstream>
-#include <cstdio>
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include <vector>
-#include <map>
-#include <string>
-#include <utility>
-
-#endif
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/AmdcDumpGeoModel.cxx b/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/AmdcDumpGeoModel.cxx
index 3a98b992d71064fa55873d5d5b7ce6155cf9263f..a5e18705b87a3c58d003362d009e312264de9d33 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/AmdcDumpGeoModel.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/AmdcDumpGeoModel.cxx
@@ -16,15 +16,12 @@
 #include "AmdcMGM/AmdcDumpGeoModel.h"
 
 
-AmdcDumpGeoModel::AmdcDumpGeoModel(const std::string& name, ISvcLocator* pSvcLocator) :
-  AthAlgorithm(name, pSvcLocator),
-p_AmdcsimrecAthenaSvc ( "AmdcsimrecAthenaSvc",name ) 
+AmdcDumpGeoModel::AmdcDumpGeoModel(const std::string& name, ISvcLocator* pSvcLocator) 
+  : AthAlgorithm(name, pSvcLocator)
+  , p_AmdcsimrecAthenaSvc ( "AmdcsimrecAthenaSvc",name ) 
 {
-
-  m_AmdcsimrecAthenaSvcUpdatedSvcDONE = false ; 
   m_KountCallsDoIt   = 0 ;
-
-   p_MuonDetectorManager = 0 ; 
+  p_MuonDetectorManager = 0 ; 
 
 // CheckTEC if 1 perform the comparison for TEC 
 // EpsLoTEC Min value on the position difference to output warning for TEC
@@ -64,16 +61,16 @@ p_AmdcsimrecAthenaSvc ( "AmdcsimrecAthenaSvc",name )
    declareProperty("CenterCscMean"             , m_CenterCscMean            = 0     ) ;
    declareProperty("EmergencyOut"              , m_EmergencyOut             = 1     ) ;
 
-   declareProperty("AntiStationSelection"          , m_AntiStationSelection         = 0     ) ;
-   declareProperty("AntiStationSelected"           , m_AntiStationSelected           ) ;
+   declareProperty("AntiStationSelection"      , m_AntiStationSelection     = 0     ) ;
+   declareProperty("AntiStationSelected"       , m_AntiStationSelected              ) ;
 
    declareProperty("StationSelection"          , m_StationSelection         = 0     ) ;
-   declareProperty("StationSelected"           , m_StationSelected           ) ;
+   declareProperty("StationSelected"           , m_StationSelected                  ) ;
 
    declareProperty("ChamberSelection"          , m_ChamberSelection         = 0     ) ;
-   declareProperty("StationNameSelected"       , m_StationNameSelected       ) ;
-   declareProperty("StationAbsAmdcJzzSelected" , m_StationAbsAmdcJzzSelected ) ;
-   declareProperty("StationAmdcJffSelected"    , m_StationAmdcJffSelected    ) ;
+   declareProperty("StationNameSelected"       , m_StationNameSelected              ) ;
+   declareProperty("StationAbsAmdcJzzSelected" , m_StationAbsAmdcJzzSelected        ) ;
+   declareProperty("StationAmdcJffSelected"    , m_StationAmdcJffSelected           ) ;
 
 
    declareProperty("AmdcsimrecAthenaSvc", p_AmdcsimrecAthenaSvc);
@@ -183,21 +180,7 @@ StatusCode AmdcDumpGeoModel::initialize(){
     ATH_CHECK(p_AmdcsimrecAthenaSvc.retrieve());
     ATH_MSG_INFO( "Retrieved service " << p_AmdcsimrecAthenaSvc ) ;
 
-    if (p_AmdcsimrecAthenaSvc->InitializedSvc()) {
-      ATH_MSG_INFO( "p_AmdcsimrecAthenaSvc->InitializedSvc() is true " ) ;
-      m_AmdcsimrecAthenaSvcUpdatedSvcDONE = true ; 
-    }else{
-      ATH_MSG_INFO( "p_AmdcsimrecAthenaSvc->InitializedSvc() is false " ) ;
-      ATH_CHECK(regFcnDoIt());
-      ATH_MSG_INFO( "Done: regFcnDoIt " ) ;
-    }
-
-//  Do something now if possible
-    if ( m_AmdcsimrecAthenaSvcUpdatedSvcDONE ){
-      ATH_MSG_INFO( "m_AmdcsimrecAthenaSvcUpdatedSvcDONE found true in initialize " ) ;
-      ATH_CHECK(DoIt());
-    }
-
+    ATH_CHECK(DoIt());
   }
   
   ATH_MSG_INFO( "Initialisation ended     " ) ;
@@ -207,53 +190,10 @@ StatusCode AmdcDumpGeoModel::initialize(){
 }
 
 // Do it
-StatusCode AmdcDumpGeoModel::DoItCallback(IOVSVC_CALLBACK_ARGS)
-{
-  ATH_MSG_INFO( "DoItCallback called     " ) ;  
-
-  if ( !(p_AmdcsimrecAthenaSvc->UsableSvc()) ) {
-    ATH_MSG_INFO( "BUT p_AmdcsimrecAthenaSvc found NOT usable yet  " ) ;  
-    return StatusCode::SUCCESS;
-  }else{
-    m_AmdcsimrecAthenaSvcUpdatedSvcDONE = true ;
-    ATH_MSG_INFO( "AND p_AmdcsimrecAthenaSvc found usable   " ) ;  
-  }
-
-  StatusCode sc = DoIt() ;
-  if ( sc.isFailure() ) {
-    ATH_MSG_FATAL( "DoIt failed" ) ; 
-    return StatusCode::FAILURE;
-  }
-  
-  return StatusCode::SUCCESS;
-
-}
-
-StatusCode AmdcDumpGeoModel::regFcnDoIt()
-{
-
-  StatusCode sc = detStore()->regFcn(
-                         &AmdcsimrecAthenaSvc::UpdatedSvc,(&*p_AmdcsimrecAthenaSvc),
-                         &AmdcDumpGeoModel::DoItCallback,this,true
-                        );
-  if (sc.isFailure()) {
-    ATH_MSG_FATAL( "Unable to register callback on AmdcDumpGeoModel::DoItCallback from AmdcsimrecAthenaSvc::UpdatedSvc " ) ;
-    return StatusCode::FAILURE;
-  }
-  ATH_MSG_INFO( "Done: Register callback on AmdcDumpGeoModel::DoItCallback from AmdcsimrecAthenaSvc::UpdatedSvc " ) ;
-
-  return StatusCode::SUCCESS;
-  
-}
 StatusCode AmdcDumpGeoModel::DoIt() 
 {
   ATH_MSG_INFO( "DoIt called     " ) ;  
 
-  if ( !m_AmdcsimrecAthenaSvcUpdatedSvcDONE ){
-    ATH_MSG_INFO( "DoIt() called BUT m_AmdcsimrecAthenaSvcUpdatedSvcDONE is false    " ) ;
-    return StatusCode::SUCCESS;
-  }
-
   if (m_SwitchOff == 0) {
 
 //  Count calls
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h b/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h
index da52d8ed242aecdbd904ce4be1ade22cb8a675ba..bae89b19c50f5acc9df9edd517f5c7c1fe5c5a56 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h
@@ -1,17 +1,14 @@
 /*
-  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 AmdcDumpOracle_H
-#define AmdcDumpOracle_H
+#ifndef AMDCORACLE_AMDCDUMPORACLE_H
+#define AMDCORACLE_AMDCDUMPORACLE_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h" 
-#include "AmdcDb/IRDBAccessSvcWithUpdate.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#include "AmdcOracle/AmdcOracleMisc.h"
+#include "AmdcDb/AmdcDb.h"
 
 class IRDBAccessSvc;
 
@@ -35,8 +32,6 @@ public:
    StatusCode execute();
    StatusCode finalize();
 
-   StatusCode DoItCallback(IOVSVC_CALLBACK_ARGS);
-
 private:
 ///////////////////////////////////
 
@@ -70,9 +65,6 @@ private:
    void DumpXtomoData( IRDBAccessSvc* pIRDBAccessSvc , std::string TagAdd ,int& Kwarn, int& Kchck );
 
 
-   bool m_IRDBAccessSvcWithUpdateUpdatedSvcDONE     ; //!< status of p_IRDBAccessSvcWithUpdate
-   
-   
    int m_SwitchOff     ; //!< Control execution
  
    int m_WarningLevel  ; //!< Warning Level
@@ -84,9 +76,8 @@ private:
   
    int m_KountCallsDoIt     ; //!< Kount calls to DoIt
   
-   ServiceHandle<IRDBAccessSvcWithUpdate> p_IRDBAccessSvcWithUpdate;  //!< Pointer On IRDBAccessSvcWithUpdate
+   ServiceHandle<IRDBAccessSvc> m_amdcDb;  //!< Pointer to AmdcDb
 
-   StatusCode regFcnDoIt();
    StatusCode DoIt();
   
 };
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcOracleMisc.h b/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcOracleMisc.h
deleted file mode 100755
index eb06285bc7e83c50989312ea2554b311310e2dc7..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcOracleMisc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//
-#ifndef AmdcOracleMisc_H
-#define AmdcOracleMisc_H
-
-#include <sstream>
-#include <iostream>
-#include <iomanip>
-#include <fstream>
-#include <cstdio>
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include <vector>
-#include <map>
-#include <string>
-#include <utility>
-
-#endif
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
index 61f445ee19bd95698dbc6752700615e6723885fc..7df7f6d4a0adb8f1f9582390dc1461c38f8530df 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
@@ -11,21 +11,18 @@
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 
-/////////////////////////////////////////////////////////
-#include "AmdcDb/IRDBAccessSvcWithUpdate.h"
-
 #include "AmdcOracle/AmdcDumpOracle.h"
 
 #include "AmdcDb/AmdcDbRecord.h"
 
 #include "AmdcDb/AmdcDb2Sql.h"
 
-AmdcDumpOracle::AmdcDumpOracle(const std::string& name, ISvcLocator* pSvcLocator) :
-  AthAlgorithm(name, pSvcLocator),
-p_IRDBAccessSvcWithUpdate ( "AmdcDb",name )
-{
+#include <fstream>
 
-  m_IRDBAccessSvcWithUpdateUpdatedSvcDONE = false ; 
+AmdcDumpOracle::AmdcDumpOracle(const std::string& name, ISvcLocator* pSvcLocator) 
+  : AthAlgorithm(name, pSvcLocator)
+  , m_amdcDb ( "AmdcDb",name )
+{
 
 //Set Default values
    m_KountCallsDoIt   = 0 ;
@@ -56,42 +53,9 @@ StatusCode AmdcDumpOracle::initialize(){
   ATH_MSG_INFO( "= SwitchOff          " << m_SwitchOff          ) ;
   ATH_MSG_INFO( "================================" ) ;
 
-
   if (m_SwitchOff == 0) {
-    StatusCode sc ;
-
-//  Retrieve p_IRDBAccessSvcWithUpdate and set up call back
-    if ( p_IRDBAccessSvcWithUpdate.retrieve().isFailure() ) {
-      ATH_MSG_FATAL( "Failed to retrieve service " << p_IRDBAccessSvcWithUpdate ) ;
-      return StatusCode::FAILURE;
-    } 
-    ATH_MSG_INFO( "Retrieved service " << p_IRDBAccessSvcWithUpdate ) ;
-
-    if (p_IRDBAccessSvcWithUpdate->InitializedSvc()) {
-      ATH_MSG_INFO( "p_IRDBAccessSvcWithUpdate->InitializedSvc() is true " ) ;
-      m_IRDBAccessSvcWithUpdateUpdatedSvcDONE = true ; 
-    }else{
-      ATH_MSG_INFO( "p_IRDBAccessSvcWithUpdate->InitializedSvc() is false " ) ;
-
-      sc=regFcnDoIt();
-      if ( sc.isFailure() ) {
-        ATH_MSG_FATAL("regFcnDoIt failed" ) ;
-        return StatusCode::FAILURE;
-      }
-      ATH_MSG_INFO( "Done: regFcnDoIt " ) ;
-     
-    }
-
-//  Do something now if possible
-    if ( m_IRDBAccessSvcWithUpdateUpdatedSvcDONE ){
-      ATH_MSG_INFO( "m_IRDBAccessSvcWithUpdateUpdatedSvcDONE found true in initialize " ) ;
-      sc = DoIt() ;
-      if ( sc.isFailure() ) {
-        ATH_MSG_FATAL( "DoIt failed" ) ; 
-        return StatusCode::FAILURE;
-      }
-    }
-  
+    ATH_CHECK(m_amdcDb.retrieve());
+    ATH_CHECK(DoIt());
   }
 
   ATH_MSG_INFO( "Initialisation ended     " ) ;
@@ -100,54 +64,10 @@ StatusCode AmdcDumpOracle::initialize(){
 
 }
 
-// Do it
-StatusCode AmdcDumpOracle::DoItCallback(IOVSVC_CALLBACK_ARGS)
-{
-  ATH_MSG_INFO( "DoItCallback called     " ) ;  
-
-  if ( !(p_IRDBAccessSvcWithUpdate->UsableSvc()) ) {
-    ATH_MSG_INFO( "BUT p_IRDBAccessSvcWithUpdate found NOT usable yet  " ) ;  
-    return StatusCode::SUCCESS;
-  }else{
-    m_IRDBAccessSvcWithUpdateUpdatedSvcDONE = true ;
-    ATH_MSG_INFO( "AND p_IRDBAccessSvcWithUpdate found usable   " ) ;  
-  }
-
-  StatusCode sc = DoIt() ;
-  if ( sc.isFailure() ) {
-    ATH_MSG_FATAL( "DoIt failed" ) ; 
-    return StatusCode::FAILURE;
-  }
-  
-  return StatusCode::SUCCESS;
-
-}
-
-StatusCode AmdcDumpOracle::regFcnDoIt()
-{
-
-  StatusCode sc = detStore()->regFcn(
-                         &IRDBAccessSvcWithUpdate::UpdatedSvc,dynamic_cast<IRDBAccessSvcWithUpdate*>(&*p_IRDBAccessSvcWithUpdate),
-                         &AmdcDumpOracle::DoItCallback,this,true
-                        );
-  if (sc.isFailure()) {
-    ATH_MSG_FATAL( "Unable to register callback on AmdcDumpOracle::DoItCallback from IRDBAccessSvcWithUpdate::UpdatedSvc " ) ;
-    return StatusCode::FAILURE;
-  }
-  ATH_MSG_INFO( "Done: Register callback on AmdcDumpOracle::DoItCallback from IRDBAccessSvcWithUpdate::UpdatedSvc " ) ;
-
-  return StatusCode::SUCCESS;
-  
-}
 StatusCode AmdcDumpOracle::DoIt()
 {
   ATH_MSG_INFO( "DoIt called     " ) ;  
 
-  if ( !m_IRDBAccessSvcWithUpdateUpdatedSvcDONE ){
-    ATH_MSG_INFO( "DoIt() called BUT m_IRDBAccessSvcWithUpdateUpdatedSvcDONE is false    " ) ;
-    return StatusCode::SUCCESS;
-  }
-
   if (m_SwitchOff == 0) {
   
 //  Count calls
@@ -166,10 +86,10 @@ StatusCode AmdcDumpOracle::DoIt()
     aAmdcDb2Sql.SetUseKeysOn(m_UseKeysOn);
     
     StringBidon = "Out.AmdcOracle.DB" + KountCallsDoItASstring ;
-    aAmdcDb2Sql.DoIt(StringBidon,"RDB",(&*p_IRDBAccessSvcWithUpdate));
+    aAmdcDb2Sql.DoIt(StringBidon,"RDB",m_amdcDb.get());
     
     StringBidon = "Out.AmdcOracle.AM" + KountCallsDoItASstring ;
-    aAmdcDb2Sql.DoIt(StringBidon,"Amdc",(&*p_IRDBAccessSvcWithUpdate));
+    aAmdcDb2Sql.DoIt(StringBidon,"Amdc",m_amdcDb.get());
 
 //  Check contents
     StringBidon = "Out.AmdcOracle" + KountCallsDoItASstring ;
@@ -185,7 +105,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check ASZT
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpASZT((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpASZT(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -195,7 +115,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check ISZT
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpISZT((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpISZT(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -205,7 +125,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check APTP
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpAPTP((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpAPTP(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -215,7 +135,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check ALMN
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpALMN((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpALMN(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -225,7 +145,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check ALIN
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpALIN((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpALIN(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -235,7 +155,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WMDT
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWMDT((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWMDT(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -245,7 +165,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WSPA
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWSPA((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWSPA(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -255,7 +175,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WSUP
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWSUP((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWSUP(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -265,7 +185,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WCHV
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWCHV((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWCHV(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -275,7 +195,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WCMI
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWCMI((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWCMI(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -285,7 +205,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WCRO
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWCRO((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWCRO(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -295,7 +215,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WLBI
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWLBI((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWLBI(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -305,7 +225,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WDED
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWDED((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWDED(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -315,7 +235,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check ASMP
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpASMP((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpASMP(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -325,7 +245,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check DBAM
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpDBAM((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpDBAM(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -335,7 +255,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WCSC
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWCSC((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWCSC(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -345,7 +265,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check ATLN
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpATLN((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpATLN(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -355,7 +275,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check GGLN
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpGGLN((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpGGLN(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -365,7 +285,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WTGC
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWTGC((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWTGC(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -375,7 +295,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check AWLN
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpAWLN((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpAWLN(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -385,7 +305,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check WRPC
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpWRPC((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpWRPC(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -395,7 +315,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check ACUT
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpACUT((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpACUT(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -405,7 +325,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check ATYP
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpATYP((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpATYP(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -415,7 +335,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check AMDC
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpAMDC((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpAMDC(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -425,7 +345,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check HwSwIdMapping
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpHwSwIdMapping((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpHwSwIdMapping(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
@@ -435,7 +355,7 @@ StatusCode AmdcDumpOracle::DoIt()
 //  Check XtomoData
     Kwarn = 0 ;
     Kchck = 0 ;
-    DumpXtomoData((&*p_IRDBAccessSvcWithUpdate),KountCallsDoItASstring,Kwarn,Kchck);
+    DumpXtomoData(m_amdcDb.get(),KountCallsDoItASstring,Kwarn,Kchck);
     KwarnTot = KwarnTot + Kwarn ;
     KchckTot = KchckTot + Kchck ;
     OutFile 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/AmdcStandMisc.h b/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/AmdcStandMisc.h
deleted file mode 100755
index 25ee4b06d5ab983ce22503cc277bf1e6dfc2b24d..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/AmdcStandMisc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//
-//  Author :  Saclay Muon Software Group SaMuSoG
-//
-// The AmdcStandMisc header contains all this Bxxxxy stuff
-//
-#ifndef AmdcStandMisc_H
-#define AmdcStandMisc_H
-
-#include <iostream>
-#include <iomanip>
-#include <fstream>
-#include <cstdio>
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include <vector>
-#include <map>
-#include <string>
-#include <utility>
-
-#endif
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/AmdcsimrecStand.h b/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/AmdcsimrecStand.h
index 1a9e8e313a4219e7010da83608710fbacf08508d..7624fb77bb05f0d5a732b95515cc474fc902723a 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/AmdcsimrecStand.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/AmdcsimrecStand.h
@@ -1,11 +1,11 @@
 /*
-  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 AmdcsimrecStand_H
-#define AmdcsimrecStand_H
+#ifndef AMDCSTAND_AMDCSIMRECSTAND_H
+#define AMDCSTAND_AMDCSIMRECSTAND_H
 
-#include "AmdcStand/AmdcStandMisc.h"
+#include <string>
 
 #include "AmdcCore/Amdcsimrec.h"
 
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/GetAmdcsimrecVariable.h b/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/GetAmdcsimrecVariable.h
index e5a8889a63a630eec3ed421c4d90bec4a435d910..f5b5c2912c8da75b75498626bf65d9cfb27dea42 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/GetAmdcsimrecVariable.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/GetAmdcsimrecVariable.h
@@ -1,11 +1,11 @@
 /*
-  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 GetAmdcsimrecVariable_H
-#define GetAmdcsimrecVariable_H
+#ifndef AMDCSTAND_GETAMDCSIMRECVARIABLE_H
+#define AMDCSTAND_GETAMDCSIMRECVARIABLE_H
 
-#include "AmdcStand/AmdcStandMisc.h"
+#include <string>
 
 double       GetAmdcRealVar(std::string VarName, int I1, int I2, int I3);
 int          GetAmdcIntVar (std::string VarName, int I1, int I2, int I3);
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcStand/src/AmdcsimrecStand.cxx b/MuonSpectrometer/Amdcsimrec/AmdcStand/src/AmdcsimrecStand.cxx
index 18b574d6148e3df9454e5993fcbb4f451f64f36e..ec66ff326508ade1e572a4951bd3d4c21f8f1c0f 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcStand/src/AmdcsimrecStand.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcStand/src/AmdcsimrecStand.cxx
@@ -11,6 +11,9 @@
 #include "TomoTubeDisplacement.h"
 #include "TomoTubeDisplacementContinuous.h"
 
+#include <iomanip>
+#include <cmath>
+#include <fstream>
 #include "f1get.h"
 #include "getindfromamdc.h"
 #include "getamdcindfrom.h"
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcStand/src/GetAmdcsimrecVariable.cxx b/MuonSpectrometer/Amdcsimrec/AmdcStand/src/GetAmdcsimrecVariable.cxx
index 87b5ac4b9f6a9d12ac85abc3c1402372dc6881a4..21df48407e274d2ef7ef0fa6723620a6aa4d1e1d 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcStand/src/GetAmdcsimrecVariable.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcStand/src/GetAmdcsimrecVariable.cxx
@@ -2,8 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "AmdcStand/AmdcStandMisc.h"
-
+#include <string>
 
 // Fortran routines -------------------------------------------------------------
 #include "f1get.h"
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcStand/src/TomoTubeDisplacement.h b/MuonSpectrometer/Amdcsimrec/AmdcStand/src/TomoTubeDisplacement.h
index 42376c9ba9e0254e80c4abeb5a970617b4a62da2..a1adce705b0111a490c083d87107b55704536563 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcStand/src/TomoTubeDisplacement.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcStand/src/TomoTubeDisplacement.h
@@ -1,11 +1,11 @@
 /*
-  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 TomoTubeDisplacement_H
-#define TomoTubeDisplacement_H
+#ifndef AMDCSTAND_TOMOTUBEDISPLACEMENT_H
+#define AMDCSTAND_TOMOTUBEDISPLACEMENT_H
 
-#include "AmdcStand/AmdcStandMisc.h"
+#include <string>
 
 void tomotubedisplacement_(
 		         int& optionflag,
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcStand/src/TomoTubeDisplacementContinuous.h b/MuonSpectrometer/Amdcsimrec/AmdcStand/src/TomoTubeDisplacementContinuous.h
index dea1cacad551bcf6998d2f28147ebf906b431486..8917f0e04579a39c80ac7d4959d637b14956e1af 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcStand/src/TomoTubeDisplacementContinuous.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcStand/src/TomoTubeDisplacementContinuous.h
@@ -1,11 +1,11 @@
 /*
-  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 TomoTubeDisplacementContinuous_H
-#define TomoTubeDisplacementContinuous_H
+#ifndef AMDCSTAND_TOMOTUBEDISPLACEMENTCONTINUOUS_H
+#define AMDCSTAND_TOMOTUBEDISPLACEMENTCONTINUOUS_H
 
-#include "AmdcStand/AmdcStandMisc.h"
+#include <string>
 
 void tomotubedisplacementcontinuous_(
                          int Iside_In,
diff --git a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorTool.cxx b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorTool.cxx
index 1e410e8a7ff1c0561fe3815abfa05806350e1584..29675909ddfa9bad94759cbcdafaf435cc9f5169 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorTool.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorTool.cxx
@@ -322,15 +322,8 @@ MuonDetectorTool::createFactory(MuonDetectorFactory001& theFactory) const
     bool isAmdcDb = false;
     if( dynamic_cast<AmdcDb*>(access) && m_amdcDb) {
       ATH_MSG_INFO("AmdcDb is used instead of RDBAccessSvc");
-      AmdcDb* p_access = dynamic_cast<AmdcDb*>(access);
       isAmdcDb = true;
-      if (p_access->InitializedSvc()) {
-        ATH_MSG_INFO("AmdcDb->InitializedSvc() is true") ;
-      }else{
-        ATH_MSG_INFO("AmdcDb->InitializedSvc() is false");
-        if(p_access->initialize()) ATH_MSG_INFO("Now it's initialized. Go ahead and use it!");
-        ATH_MSG_INFO("\t\t BUT PAY ATTENTION THE HARD WIRED ENVELOPE IS USED (see MuonDetectorFactory001.cxx)!!");
-      }
+      ATH_MSG_INFO("AmdcDb->InitializedSvc() is true") ;
     }
 
     theFactory.setDBAtlasVersion(AtlasVersion);