diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SiCluster.icc b/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SiCluster.icc
index c9b594495747f113b72e18f406e41aaa60e741ed..921555a260756e24d09c2641402e50fb86d26d79 100644
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SiCluster.icc
+++ b/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SiCluster.icc
@@ -13,11 +13,7 @@ SiCluster::width() const
 inline const Amg::Vector3D&
 SiCluster::globalPosition() const
 {
-  if (not m_globalPosition) {
-    m_globalPosition.set(std::unique_ptr<const Amg::Vector3D>(
-      m_detEl->surface(identify()).localToGlobal(localPosition())));
-  }
-  return *m_globalPosition;
+  return m_globalPosition;
 }
 // set gangedPixel:
 inline void
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/ConversionFinderUtils.cxx b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/ConversionFinderUtils.cxx
index 032985eb0b8cd1fb8e1a155acf458c0dc71e6b85..e26f80da541d0e3672f5799eeaccf5e36301ec9b 100644
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/ConversionFinderUtils.cxx
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/ConversionFinderUtils.cxx
@@ -72,12 +72,12 @@ namespace InDet {
         continue;
       }
 
-      if (rd && rd->type(Trk::PrepRawDataType::SiCluster)) {
+      if (rd->type(Trk::PrepRawDataType::SiCluster)) {
         ++nclus;
         continue;
       }
 
-      if (rd && rd->type(Trk::PrepRawDataType::TRT_DriftCircle)) {
+      if (rd->type(Trk::PrepRawDataType::TRT_DriftCircle)) {
         ++ntrt;
         continue;
       }