diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactory.cxx b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactory.cxx
index a0045ca837dadc1f342e749bf2334fa5a53b7546..1c1f42fe3c1f3386339c0e73ea071c143302d150 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactory.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactory.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArDetectorFactory.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactoryLite.cxx b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactoryLite.cxx
index c149bf6844fd3af4a79e7fe02916a4b7b1e7e32a..e5b8e343c06e4db809c1244f26df2e08439a2d6c 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactoryLite.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactoryLite.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArDetectorFactoryLite.h"
@@ -191,7 +191,7 @@ void LArGeo::LArDetectorFactoryLite::create(GeoPhysVol* world)
   while(!cursor.atEnd()) {
     std::string volName = cursor.getName();
     if(volName.compare(0,3,"LAr")==0) {
-      m_detectorManager->addTreeTop(GeoPVLink(cursor.getVolume().operator->()));
+      m_detectorManager->addTreeTop(cursor.getVolume());
     }
     cursor.next();
   }
diff --git a/TileCalorimeter/TileGeoModel/src/TileDetectorFactoryLite.cxx b/TileCalorimeter/TileGeoModel/src/TileDetectorFactoryLite.cxx
index fce8f0540fa5ba255b11b4ff2dcae9aa659cedf9..0b7d1f01ed774945d2f45d887502a3c636661ac3 100755
--- a/TileCalorimeter/TileGeoModel/src/TileDetectorFactoryLite.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileDetectorFactoryLite.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -185,7 +185,7 @@ void TileDetectorFactoryLite::create(GeoPhysVol *world)
     std::string volName = cursor.getName();
     if (volName.compare(0,4,"Tile")==0) {
       (*m_log) << MSG::DEBUG << "Adding vol '" << volName << "' to detManager" << endmsg;
-      m_detectorManager->addTreeTop(GeoPVLink(cursor.getVolume().operator->()));
+      m_detectorManager->addTreeTop(cursor.getVolume());
     }
     cursor.next();
   }
diff --git a/graphics/VP1/VP1Utils/src/VP1JobConfigInfo.cxx b/graphics/VP1/VP1Utils/src/VP1JobConfigInfo.cxx
index e169f62a296335583d88b61ae3365824f2411281..6900c1e597dfeebdbeb223494ff3a8ac2567b0f9 100644
--- a/graphics/VP1/VP1Utils/src/VP1JobConfigInfo.cxx
+++ b/graphics/VP1/VP1Utils/src/VP1JobConfigInfo.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -175,8 +175,6 @@ bool VP1JobConfigInfo::Imp::actualInit( StoreGateSvc* detStore )
 
   hasGeoModelExperiment = true;
   PVConstLink world(worldPhysVol);
-  VP1Msg::messageDebug("VP1JobConfigInfo: called world(worldPhysVol)");
-    std::cout << "world :" << world << std::endl;
 
   GeoVolumeCursor av(world);