diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MultiLevelAlignmentDbTool.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MultiLevelAlignmentDbTool.cxx
index bc02324ae1cf9943b8e7aa81f3bcf3f0e1cd8418..fcc94b5c816f878593349ffeff3cf3a634b89a85 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MultiLevelAlignmentDbTool.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MultiLevelAlignmentDbTool.cxx
@@ -142,15 +142,8 @@ StatusCode MultiLevelAlignmentDbTool::initialize()
   }
   else ATH_MSG_INFO("proxy for class ALineParContainer found");
   
-  SG::TransientAddress* tad =  proxy->transientAddress();
-  if (!tad) {
-    ATH_MSG_ERROR("Unable to get the tad");
-    return StatusCode::FAILURE;
-  }
-  else ATH_MSG_INFO("proxy transient Address found");
-  
   IAddressProvider* addp = this;
-  tad->setProvider(addp, StoreID::DETECTOR_STORE);
+  proxy->setProvider(addp, StoreID::DETECTOR_STORE);
   //tad->setProvider(addp);
   ATH_MSG_DEBUG("set address provider for ALineParContainer");
   
@@ -162,15 +155,8 @@ StatusCode MultiLevelAlignmentDbTool::initialize()
   }
   else ATH_MSG_INFO("proxy for class BLineParContainer found");
   
-  tad =  proxy->transientAddress();
-  if (!tad) {
-    ATH_MSG_ERROR("Unable to get the tad");
-    return StatusCode::FAILURE;
-  }
-  else ATH_MSG_INFO("proxy transient Address found");
-  
   addp = this;
-  tad->setProvider(addp, StoreID::DETECTOR_STORE);
+  proxy->setProvider(addp, StoreID::DETECTOR_STORE);
   //tad->setProvider(addp);
   ATH_MSG_DEBUG("set address provider for BLineParContainer");
   
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonAlignmentDbTool.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonAlignmentDbTool.cxx
index 4b6d0ab4345638629d79f62b62d6b046007c490a..4abc8115b8c19e89f7c60913132459d3b4d68cbb 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonAlignmentDbTool.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonAlignmentDbTool.cxx
@@ -217,15 +217,8 @@ StatusCode MuonAlignmentDbTool::initialize()
 
 
 
-   SG::TransientAddress* tad =  proxy->transientAddress();
-   if (!tad) {
-     m_log << MSG::ERROR << "Unable to get the tad" << endmsg;
-      return StatusCode::FAILURE;
-   }
-   else m_log << MSG::INFO << "proxy transient Address found" << endmsg;
-
    IAddressProvider* addp = this;
-   tad->setProvider(addp, StoreID::DETECTOR_STORE);
+   proxy->setProvider(addp, StoreID::DETECTOR_STORE);
    //   tad->setProvider(addp);
    if( m_debug )  m_log << MSG::DEBUG << "set address provider for ALineParContainer" << endmsg;
 
@@ -238,15 +231,8 @@ StatusCode MuonAlignmentDbTool::initialize()
    }
    else m_log << MSG::INFO << "proxy for class BLineParContainer found" << endmsg;
    
-   tad =  proxy->transientAddress();
-   if (!tad) {
-     m_log << MSG::ERROR << "Unable to get the tad" << endmsg;
-     return StatusCode::FAILURE;
-   }
-   else m_log << MSG::INFO << "proxy transient Address found" << endmsg;
-
    addp = this;
-   tad->setProvider(addp, StoreID::DETECTOR_STORE);
+   proxy->setProvider(addp, StoreID::DETECTOR_STORE);
    //tad->setProvider(addp);
    if( m_debug )  m_log << MSG::DEBUG << "set address provider for BLineParContainer" << endmsg;
 
@@ -257,15 +243,8 @@ StatusCode MuonAlignmentDbTool::initialize()
    }
    else m_log << MSG::INFO << "proxy for class CscInternalAlignmentMapContainer found or not needed" << endmsg;
    
-   if( proxy ) tad =  proxy->transientAddress();
-   if (!tad && m_ILinesFromDb) {
-     m_log << MSG::ERROR << "Unable to get the tad" << endmsg;
-     return StatusCode::FAILURE;
-   }
-   else m_log << MSG::INFO << "proxy transient Address found or not needed" << endmsg;
-
    addp = this;
-   if( m_ILinesFromDb ) tad->setProvider(addp, StoreID::DETECTOR_STORE);
+   if( m_ILinesFromDb ) proxy->setProvider(addp, StoreID::DETECTOR_STORE);
    //tad->setProvider(addp);
    if( m_debug )  m_log << MSG::DEBUG << "set address provider for CscInternalAlignmentMapContainer" << endmsg;
 
@@ -277,15 +256,8 @@ StatusCode MuonAlignmentDbTool::initialize()
    }
    else m_log << MSG::INFO << "proxy for class MdtAsBuiltParContainer found" << endmsg;
    
-   tad =  proxy->transientAddress();
-   if (!tad) {
-     m_log << MSG::ERROR << "Unable to get the tad" << endmsg;
-     return StatusCode::FAILURE;
-   }
-   else m_log << MSG::INFO << "proxy transient Address found" << endmsg;
-
    addp = this;
-   tad->setProvider(addp, StoreID::DETECTOR_STORE);
+   proxy->setProvider(addp, StoreID::DETECTOR_STORE);
    //tad->setProvider(addp);
    if( m_debug )  m_log << MSG::DEBUG << "set address provider for MdtAsBuiltParContainer" << endmsg;
 
@@ -871,14 +843,9 @@ StatusCode MuonAlignmentDbTool::loadAlignABLines(std::string folderName)
       log << MSG::ERROR << "Unable to get the proxy for class ALineParContainer" << endmsg;
       return StatusCode::FAILURE;
     }
-    SG::TransientAddress* tad =  proxy->transientAddress();
-    if (!tad) {
-      log << MSG::ERROR << "Unable to get the tad" << endmsg;
-      return StatusCode::FAILURE;
-    }
     IAddressProvider* addp = this;
     //    tad->setProvider(addp);
-    tad->setProvider(addp, StoreID::DETECTOR_STORE);
+    proxy->setProvider(addp, StoreID::DETECTOR_STORE);
     if( m_debug ) log << MSG::DEBUG<< "set address provider for ALineParContainer" << endmsg;
    
    return  sc; 
@@ -1110,14 +1077,9 @@ StatusCode MuonAlignmentDbTool::loadAlignILines(std::string folderName)
       log << MSG::ERROR << "Unable to get the proxy for class ILineParContainer" << endmsg;
       return StatusCode::FAILURE;
     }
-    SG::TransientAddress* tad =  proxy->transientAddress();
-    if (!tad) {
-      log << MSG::ERROR << "Unable to get the tad" << endmsg;
-      return StatusCode::FAILURE;
-    }
     IAddressProvider* addp = this;
     //    tad->setProvider(addp);
-    tad->setProvider(addp, StoreID::DETECTOR_STORE);
+    proxy->setProvider(addp, StoreID::DETECTOR_STORE);
     if( m_debug ) log << MSG::DEBUG<< "set address provider for ILineParContainer" << endmsg;
    
    return  sc; 
@@ -1230,14 +1192,9 @@ StatusCode MuonAlignmentDbTool::loadAlignAsBuilt(std::string folderName)
       ATH_MSG_ERROR( "Unable to get the proxy for class ILineParContainer"  );
       return StatusCode::FAILURE;
     }
-    SG::TransientAddress* tad =  proxy->transientAddress();
-    if (!tad) {
-      m_log << MSG::ERROR << "Unable to get the tad" << endmsg;
-      return StatusCode::FAILURE;
-    }
     IAddressProvider* addp = this;
     //    tad->setProvider(addp);
-    tad->setProvider(addp, StoreID::DETECTOR_STORE);
+    proxy->setProvider(addp, StoreID::DETECTOR_STORE);
     ATH_MSG_DEBUG( "set address provider for MdtAsBuiltParContainer"  );
    
    return  sc; 
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonDetectorStatusDbTool.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonDetectorStatusDbTool.cxx
index 011f7a84bad0299c1a7fd1698a81e1c21f38d618..f3926cde29e8a1b2ba4ab536d01c2c65fb339881 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonDetectorStatusDbTool.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonDetectorStatusDbTool.cxx
@@ -81,14 +81,8 @@ StatusCode MuonDetectorStatusDbTool::initialize()
     return StatusCode::FAILURE;
   }
 
-  SG::TransientAddress* tad =  proxy->transientAddress();
-  if (!tad) {
-    ATH_MSG_ERROR( "Unable to get the tad" );
-    return StatusCode::FAILURE;
-  }
-
   IAddressProvider* addp = this;
-  tad->setProvider(addp, StoreID::DETECTOR_STORE);
+  proxy->setProvider(addp, StoreID::DETECTOR_STORE);
   //tad->setProvider(addp);
   ATH_MSG_DEBUG( "set address provider for TubeStatusContainer" );
   
@@ -266,14 +260,8 @@ StatusCode MuonDetectorStatusDbTool::loadTubeStatus(IOVSVC_CALLBACK_ARGS_P(I,key
      return StatusCode::FAILURE;
    }
    
-   SG::TransientAddress* tad =  proxy->transientAddress();
-   if (!tad) {
-     ATH_MSG_ERROR( "Unable to get the tad" );
-     return StatusCode::FAILURE;
-   }
-   
    IAddressProvider* addp = this;
-   tad->setProvider(addp, StoreID::DETECTOR_STORE);
+   proxy->setProvider(addp, StoreID::DETECTOR_STORE);
    //tad->setProvider(addp);
    ATH_MSG_DEBUG( "set address provider for TubeStatusContainer" );