diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/MuonAGDDBase/AGDDMMSpacer.h b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/MuonAGDDBase/AGDDMMSpacer.h
index 3d585c25661127f760435af732c5eb403cfe45ff..125029ef54b971bdc6ec0bd48d0ab70a66f313ec 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/MuonAGDDBase/AGDDMMSpacer.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/MuonAGDDBase/AGDDMMSpacer.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef AGDDMMSpacer_H
@@ -38,8 +38,6 @@ private:
 	double m_large_x;
 	double m_y;
 	double m_z;
-	
-	GeoMaterial* GetMMMaterial(std::string);
 };
 
 #endif
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/MuonAGDDBase/AGDDMuonStation.h b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/MuonAGDDBase/AGDDMuonStation.h
index 2c8249903dd80d56d201f3cde8ccfdeaa8969be2..5525ac8000fc7c41b73eb85af8c2425f2fcca80e 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/MuonAGDDBase/AGDDMuonStation.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/MuonAGDDBase/AGDDMuonStation.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef AGDDMuonStation_H
@@ -38,7 +38,7 @@ private:
 	double m_y;
 	double m_z;
 	
-	GeoMaterial* GetMMMaterial(std::string);
+        const GeoMaterial* GetMMMaterial(std::string);
 };
 
 #endif
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/src/AGDDMMSpacer.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/src/AGDDMMSpacer.cxx
index e75edb27a1e2779eed8ecae719fd1cff9419acaf..dc8312d152e9d69161ed0c73ce7d942bf176c6c5 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/src/AGDDMMSpacer.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/src/AGDDMMSpacer.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -47,20 +47,3 @@ void AGDDMMSpacer::CreateVolume()
 //		std::cout<<"done creating volume "<<std::endl;
 	}
 }
-
-GeoMaterial* AGDDMMSpacer::GetMMMaterial(std::string name)
-{
-	StoreGateSvc* pDetStore=0;
-	ISvcLocator* svcLocator = Gaudi::svcLocator();
-	StatusCode sc=svcLocator->service("DetectorStore",pDetStore);
-	if(sc.isSuccess())
-	{
-		DataHandle<StoredMaterialManager> theMaterialManager;
-		sc = pDetStore->retrieve(theMaterialManager, "MATERIALS");
-		if(sc.isSuccess())
-        {
-			return theMaterialManager->getMaterial(name);
-        }
-	}
-	return 0;
-}
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/src/AGDDMuonStation.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/src/AGDDMuonStation.cxx
index 9660320df175e4f7ccc0a0b97148079f5a298a72..c33b93bbf26eb79760bb1e1dd0faf05b5dd27221 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/src/AGDDMuonStation.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/src/AGDDMuonStation.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -33,7 +33,7 @@ void AGDDMuonStation::CreateVolume()
 {
     std::cout<<"this is AGDDMuonStation::CreateVolume()"<<std::endl;
 	static int ifirst=1;
-	static GeoMaterial* air=0;
+	static const GeoMaterial* air=0;
 	if (ifirst)
 	{
 		ifirst=0;
@@ -55,14 +55,14 @@ void AGDDMuonStation::CreateVolume()
 	}
 }
 
-GeoMaterial* AGDDMuonStation::GetMMMaterial(std::string name)
+const GeoMaterial* AGDDMuonStation::GetMMMaterial(std::string name)
 {
 	StoreGateSvc* pDetStore=0;
 	ISvcLocator* svcLocator = Gaudi::svcLocator();
 	StatusCode sc=svcLocator->service("DetectorStore",pDetStore);
 	if(sc.isSuccess())
 	{
-		DataHandle<StoredMaterialManager> theMaterialManager;
+                const StoredMaterialManager* theMaterialManager = nullptr;
 		sc = pDetStore->retrieve(theMaterialManager, "MATERIALS");
 		if(sc.isSuccess())
         {