diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.cxx
index 3b79e7f283d74d330770b84e7a3994679c617dcb..50ff261f7b2f90d13e6a2394020ad1351458cf41 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.cxx
@@ -4,8 +4,6 @@
 
 #include "CondWriterExtAlg.h"
 
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventIncident.h"
 #include "StoreGate/ReadHandle.h"
 #include "AthenaKernel/IOVTime.h"
 #include "AthenaKernel/IOVRange.h"
@@ -17,30 +15,26 @@ namespace DMTest {
 CondWriterExtAlg::CondWriterExtAlg(const std::string& name, ISvcLocator* pSvcLocator) :
   AthAlgorithm(name, pSvcLocator),
   m_iovSvc("IOVSvc", name),
-  m_iovDbSvc("IOVDbSvc", name),
-  m_incidentSvc("IncidentSvc", name)
+  m_iovDbSvc("IOVDbSvc", name)
 {
 }
 
 StatusCode CondWriterExtAlg::initialize()
 {
-  ATH_CHECK( m_eventInfoKey.initialize() );    
   ATH_CHECK( m_iovSvc.retrieve() );
   ATH_CHECK( m_iovDbSvc.retrieve() );
-  ATH_CHECK( m_incidentSvc.retrieve() );
 
   return StatusCode::SUCCESS;
 }
 
 StatusCode CondWriterExtAlg::execute()
 {
-  SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey);
-
-  ATH_MSG_INFO ("Event " << eventInfo->event_ID()->event_number() <<
-                " LBN " << eventInfo->event_ID()->lumi_block());
+  const EventContext& context = getContext();
+  ATH_MSG_INFO ("Event " << context.eventID().event_number() <<
+                " LBN " << context.eventID().lumi_block());
 
   // Check if we need to execute a command
-  auto it = m_cmd.find(eventInfo->event_ID()->lumi_block());
+  auto it = m_cmd.find(context.eventID().lumi_block());
   if (it != m_cmd.end()) {
     ATH_MSG_INFO("Executing: " << it->second);
     if ( system(it->second.c_str()) != 0 ) {
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.h
index f0049c83397d6bb3b61505b74f08ed909cda1dbb..2534c615e3131f071875341aa5557ef25997313c 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.h
@@ -7,8 +7,6 @@
 #include "AthenaBaseComps/AthAlgorithm.h"
 
 #include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "EventInfo/EventInfo.h"
 #include "StoreGate/ReadHandleKey.h"
 #include "AthenaKernel/IIOVDbSvc.h"
 #include "AthenaKernel/IIOVSvc.h"
@@ -30,13 +28,11 @@ public:
   virtual StatusCode execute() override;
 
 private:
-  SG::ReadHandleKey<EventInfo> m_eventInfoKey{this, "EventInfoKey", "McEventInfo"};
   Gaudi::Property<std::string> m_attrListKey{this, "AttrListKey", "/DMTest/TestAttrList"};
   Gaudi::Property<std::map<int,std::string>> m_cmd{this, "Commands", {}, "Commands to be executed on LB change"};
 
   ServiceHandle<IIOVSvc> m_iovSvc;
   ServiceHandle<IIOVDbSvc> m_iovDbSvc;
-  ServiceHandle<IIncidentSvc> m_incidentSvc;
 };
 
 } // namespace DMTest