diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/CMakeLists.txt b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/CMakeLists.txt
index 2cc9c025c14ba35ea62b76479f6c39a5591905a8..ba5576ea9df812ecfd6f44f16c619b7122501da0 100644
--- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/CMakeLists.txt
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/CMakeLists.txt
@@ -12,14 +12,13 @@ atlas_depends_on_subdirs( PUBLIC
                           Database/RegistrationServices
                           GaudiKernel
                           PRIVATE
-                          DetectorDescription/DetDescrCond/DetDescrConditions
-                          Event/EventInfo )
+                          DetectorDescription/DetDescrCond/DetDescrConditions )
 
 # Component(s) in the package:
 atlas_add_component( LArAlignmentAlgs
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel DetDescrConditions EventInfo )
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel DetDescrConditions )
 
 # Install files from the package:
 atlas_install_headers( LArAlignmentAlgs )
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignDbAlg.cxx b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignDbAlg.cxx
index c3eb726a91fa74ddacacd33c681d0f2354df290c..f87463c7a35b807a69d1ae3bc11269a00e23bffc 100755
--- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignDbAlg.cxx
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignDbAlg.cxx
@@ -2,11 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "LArAlignmentAlgs/LArAlignDbAlg.h"
-
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
+#include "LArAlignDbAlg.h"
 #include "DetDescrConditions/DetCondKeyTrans.h"
 
 #include <fstream>
@@ -27,7 +23,6 @@ LArAlignDbAlg::LArAlignDbAlg(const std::string& name, ISvcLocator* pSvcLocator)
     m_inpFile("LArAlign.inp"),
     m_outpFile("LArAlign-TEST.pool.root"),
     m_outpTag("LARAlign-TEST"),
-    m_evt(0),
     m_regSvc("IOVRegistrationSvc",name),
     m_streamer("AthenaOutputStreamTool")
 {
@@ -69,10 +64,10 @@ StatusCode LArAlignDbAlg::execute()
 {
   ATH_MSG_DEBUG(" in execute() "  );
 
-  ATH_CHECK( evtStore()->retrieve(m_evt) );
+  const EventContext& context = getContext();
+  int nrun = context.eventID().run_number();
+  int nevt = context.eventID().event_number();
 
-  int nrun = m_evt->event_ID()->run_number();
-  int nevt = m_evt->event_ID()->event_number();
   ATH_MSG_DEBUG( " Event: [" << nrun << "," << nevt << "]"  );
 
   // If I need to write out the conditions object I'll do that on the first event
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/LArAlignmentAlgs/LArAlignDbAlg.h b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignDbAlg.h
similarity index 72%
rename from LArCalorimeter/LArAlignment/LArAlignmentAlgs/LArAlignmentAlgs/LArAlignDbAlg.h
rename to LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignDbAlg.h
index 6cca637b0a79681543373758ff0e845aa06c8733..93e6b586569481f37e60f6750a619e1c82c0902f 100755
--- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/LArAlignmentAlgs/LArAlignDbAlg.h
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignDbAlg.h
@@ -1,14 +1,9 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- LArCalorimeter/LArAlignment/LArAloignmentAlgs package
- -----------------------------------------
- ***************************************************************************/
-
-#ifndef LARALIGNDBALG_LARALIGNDBALG_H
-#define LARALIGNDBALG_LARALIGNDBALG_H
+#ifndef LARALIGNMENTALGS_LARALIGNDBALG_H
+#define LARALIGNMENTALGS_LARALIGNDBALG_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
@@ -16,7 +11,6 @@
 #include "AthenaKernel/IAthenaOutputStreamTool.h"
 #include "RegistrationServices/IIOVRegistrationSvc.h"
 
-class EventInfo;
 class IIOVRegistrationSvc;
 
 /**
@@ -49,8 +43,6 @@ class LArAlignDbAlg: public AthAlgorithm
   StringProperty            m_outpFile;
   StringProperty            m_outpTag;
   
-  const EventInfo*          m_evt;
-
   ServiceHandle<IIOVRegistrationSvc>   m_regSvc;
   ToolHandle<IAthenaOutputStreamTool>  m_streamer;  
 };
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
index 2e192a505001ea4ad94f5ce36f911b592c4475ac..778d3a6825108f9fb62746d18dcdc24b26a3d9bd 100644
--- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
@@ -1,4 +1,4 @@
-#include "LArAlignmentAlgs/LArAlignDbAlg.h"
+#include "../LArAlignDbAlg.h"
 
 DECLARE_COMPONENT( LArAlignDbAlg )