diff --git a/TestBeam/TBConditions/TBCaloConditions/CMakeLists.txt b/TestBeam/TBConditions/TBCaloConditions/CMakeLists.txt
index 28c9b466959f4b5daf644313c923aa87b23bdb4a..d04e03f063e0795dd1971d3079d7d94a20ea5029 100644
--- a/TestBeam/TBConditions/TBCaloConditions/CMakeLists.txt
+++ b/TestBeam/TBConditions/TBCaloConditions/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TBCaloConditions )
@@ -12,7 +12,7 @@ atlas_add_library( TBCaloConditionsLib
 
 atlas_add_component( TBCaloConditions
                      src/*.cxx src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel AthenaBaseComps StoreGateLib AthenaPoolUtilities CondDBObjects EventInfo TBCaloConditionsLib )
+                     LINK_LIBRARIES GaudiKernel AthenaBaseComps StoreGateLib AthenaPoolUtilities CondDBObjects TBCaloConditionsLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx
index 89fa2ba6c678919b4e02ff6c260536163b245e0c..5308ad7da24e7345b40900fad81588c97a1de280 100755
--- a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBCaloCoolPosTool.h"
@@ -9,9 +9,6 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/IIncidentSvc.h"
 
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
 
 TBCaloCoolPosTool::TBCaloCoolPosTool(const std::string& type, 
 			 const std::string& name, 
@@ -58,7 +55,7 @@ StatusCode TBCaloCoolPosTool::initialize()
 
 void TBCaloCoolPosTool::handle(const Incident&) 
 {
-  // This should be the beginning of Run.  EventInfo is available now. 
+  // This should be the beginning of Run.  
   
     ATH_MSG_DEBUG ("in handle()" );
     if(! m_init) { 
@@ -78,10 +75,8 @@ bool TBCaloCoolPosTool::initHandles()
 { 
       ATH_MSG_DEBUG ("in initHandles()" );
 
-      const EventInfo* evtInfo = nullptr;
-      ATH_CHECK( evtStore()->retrieve(evtInfo), false );
-
-      int run = evtInfo->event_ID()->run_number(); 
+      const EventContext& ctx = Gaudi::Hive::currentContext();
+      int run = ctx.eventID().run_number(); 
 
       std::string etaKey,thetaKey,zKey,deltaKey; 
 
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx
index 4fb08a0e1c6c1c9dae4d755986284c0e748cb1ce..c9274363c47d45e3762fb81f46121c6ed0742a2c 100755
--- a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBCaloPosTool.h"
@@ -9,9 +9,6 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/IIncidentSvc.h"
 
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
 
 TBCaloPosTool::TBCaloPosTool(const std::string& type, 
 			 const std::string& name, 
@@ -59,7 +56,7 @@ StatusCode TBCaloPosTool::initialize()
 
 void TBCaloPosTool::handle(const Incident&) 
 {
-  // This should be the beginning of Run.  EventInfo is available now. 
+  // This should be the beginning of Run.  
   
     ATH_MSG_DEBUG ("in handle()" );
     if(! m_init) { 
@@ -79,10 +76,8 @@ bool TBCaloPosTool::initHandles()
 { 
       ATH_MSG_DEBUG ("in initHandles()" );
 
-      const EventInfo* evtInfo = nullptr;
-      ATH_CHECK( evtStore()->retrieve(evtInfo), false );
-
-      int run = evtInfo->event_ID()->run_number(); 
+      const EventContext& ctx = Gaudi::Hive::currentContext();
+      int run = ctx.eventID().run_number(); 
 
       std::string etaKey,thetaKey,zKey,deltaKey;