diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
index 20da9b781a0c461f7a71983b06b6c6bd6512891e..0f17da4051e58f74a93bce8654706140d7fdd9fb 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_add_library( PixelCalibAlgsLib
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
    LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils GaudiKernel InDetConditionsSummaryService 
    InDetPrepRawData InDetReadoutGeometry PixelGeoModelLib PixelReadoutGeometryLib PixelConditionsData StoreGateLib
-   PRIVATE_LINK_LIBRARIES AthenaPoolUtilities EventInfo InDetIdentifier InDetRawData )
+   PRIVATE_LINK_LIBRARIES AthenaPoolUtilities InDetIdentifier InDetRawData )
 
 atlas_add_component( PixelCalibAlgs
    src/components/*.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/HitMapBuilder.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/HitMapBuilder.cxx
index 2e17c82269d9a4330c06fdbee5fc5f4238c22d38..39504c68db081dd0d64bc27b63614ba07b80adb9 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/HitMapBuilder.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/HitMapBuilder.cxx
@@ -18,9 +18,6 @@
 #include "InDetReadoutGeometry/SiDetectorElement.h"
 #include "InDetReadoutGeometry/SiDetectorElementCollection.h"
 
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
 // geometry
 #include "InDetIdentifier/PixelID.h"
 
@@ -366,14 +363,12 @@ StatusCode HitMapBuilder::registerHistograms() {
 StatusCode HitMapBuilder::execute() {
   ATH_MSG_DEBUG( "Executing HitMapBuilder" );
 
-  // retrieve EventInfo
-  const EventInfo* eventInfo;
-  ATH_CHECK( evtStore()->retrieve(eventInfo) );
+  const EventContext& ctx = Gaudi::Hive::currentContext();
 
   // check LB is in allowed range
-  int LB =  static_cast<int>(eventInfo->event_ID()->lumi_block());
+  int LB =  static_cast<int>(ctx.eventID().lumi_block());
   if ((LB < m_evt_lbMin) || (m_evt_lbMax >= m_evt_lbMin && LB > m_evt_lbMax)) {
-    ATH_MSG_VERBOSE("Event in lumiblock " << eventInfo->event_ID()->lumi_block() << " not in selected range [" << m_evt_lbMin << "," << m_evt_lbMax << "] => skipped");
+    ATH_MSG_VERBOSE("Event in lumiblock " << LB << " not in selected range [" << m_evt_lbMin << "," << m_evt_lbMax << "] => skipped");
     return StatusCode::SUCCESS;
   }
 
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/OccupancyMapMaker.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/OccupancyMapMaker.cxx
index 1f305fedccc5e6023e88e50276b90eec4cfa537d..ce73f85e122d95acc45fe1724fcaad0874f7a4a8 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/OccupancyMapMaker.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/OccupancyMapMaker.cxx
@@ -11,8 +11,6 @@
 
 // EDM
 #include "InDetRawData/PixelRDO_Container.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
 
 // geometry
 #include "InDetIdentifier/PixelID.h"
@@ -301,25 +299,19 @@ StatusCode OccupancyMapMaker::registerHistograms(){
 StatusCode OccupancyMapMaker::execute(){
   ATH_MSG_DEBUG( "Executing OccupancyMapMaker" );
 
-  // retrieve EventInfo
-  const EventInfo* eventInfo;
-  StatusCode sc = evtStore()->retrieve(eventInfo);
-  if( !sc.isSuccess() ){
-    ATH_MSG_FATAL("Unable to retrieve event info");
-    return StatusCode::FAILURE;
-  } ATH_MSG_DEBUG("Event info retrieved");
+  const EventContext& ctx = Gaudi::Hive::currentContext();
 
   // check LB is in allowed range
-  unsigned int LB =  eventInfo->event_ID()->lumi_block();
+  unsigned int LB =  ctx.eventID().lumi_block();
   if( (LB < m_evt_lbMin) || (m_evt_lbMax >= m_evt_lbMin && LB > m_evt_lbMax) ){
-    ATH_MSG_VERBOSE("Event in lumiblock " << eventInfo->event_ID()->lumi_block() <<
+    ATH_MSG_VERBOSE("Event in lumiblock " << LB <<
 		    " not in selected range [" << m_evt_lbMin << "," << m_evt_lbMax << "] => skipped");    
     return StatusCode::SUCCESS;
   }
 
   // retrieve PixelRDO container
   const PixelRDO_Container* pixelRDOs = nullptr;
-  sc = evtStore()->retrieve(pixelRDOs, m_pixelRDOKey);
+  StatusCode sc = evtStore()->retrieve(pixelRDOs, m_pixelRDOKey);
   if( !sc.isSuccess() ){
     ATH_MSG_FATAL( "Unable to retrieve pixel RDO container at " << m_pixelRDOKey );
     return StatusCode::FAILURE;