diff --git a/LArCalorimeter/LArCafJobs/src/LArNoiseBursts.cxx b/LArCalorimeter/LArCafJobs/src/LArNoiseBursts.cxx
index a4344ed61481db7c1c4facdf90adbe3183f7bc7b..b76e131e4f2836962909838a2f6d29f8105e8cd1 100644
--- a/LArCalorimeter/LArCafJobs/src/LArNoiseBursts.cxx
+++ b/LArCalorimeter/LArCafJobs/src/LArNoiseBursts.cxx
@@ -77,14 +77,6 @@
 #include "TTree.h"
 #include "CLHEP/Vector/LorentzVector.h"
 
-/*
-#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventType.h"
-#include "EventInfo/TriggerInfo.h"
-*/
-
 #include "xAODEventInfo/EventInfo.h"
 
 #include "CaloEvent/CaloCellContainer.h"
diff --git a/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
index 7195106ef9093e2a43584c1a5465bb7dad3b7bd3..65709689123bab667f5b704e2ba6d82238cf2093 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
@@ -6,16 +6,14 @@
 atlas_subdir( LArG4Validation )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
+atlas_depends_on_subdirs( PRIVATE
                           GaudiKernel
-                          PRIVATE
                           Calorimeter/CaloDetDescr
                           Calorimeter/CaloIdentifier
                           Control/AthenaBaseComps
                           Control/AthenaKernel
                           Control/StoreGate
                           DetectorDescription/GeoModel/GeoAdaptors
-                          Event/EventInfo
                           Generators/GeneratorObjects
                           LArCalorimeter/LArSimEvent
                           MagneticField/MagFieldInterfaces
@@ -32,10 +30,9 @@ atlas_add_component( LArG4Validation
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
-                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel CaloDetDescrLib CaloIdentifier AthenaBaseComps StoreGateLib SGtests GeoAdaptors EventInfo GeneratorObjects LArSimEvent MagFieldInterfaces egammaEvent )
+                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel CaloDetDescrLib CaloIdentifier AthenaBaseComps StoreGateLib SGtests GeoAdaptors GeneratorObjects LArSimEvent MagFieldInterfaces egammaEvent )
 
 # Install files from the package:
-atlas_install_headers( LArG4Validation )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/*.xml )
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.cxx
index 4d1663a3b2907fc0d84cb5d92a49edddabad182d..6de274e23b6990636c068271213c91e410f2a0bf 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.cxx
@@ -1,9 +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
 */
 
 
-#include "LArG4Validation/AODReader.h"
+#include "AODReader.h"
 
 #include "GaudiKernel/IToolSvc.h"
 #include "egammaEvent/Electron.h"
diff --git a/LArCalorimeter/LArG4/LArG4Validation/LArG4Validation/AODReader.h b/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.h
similarity index 88%
rename from LArCalorimeter/LArG4/LArG4Validation/LArG4Validation/AODReader.h
rename to LArCalorimeter/LArG4/LArG4Validation/src/AODReader.h
index 760b9e004c8768b0c0c2692e7c3c2f7634b38bbf..c2a2119ab57d7ebf7499ac72f1a277b840b29f82 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/LArG4Validation/AODReader.h
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.h
@@ -1,9 +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
 */
 
-#ifndef _AODReader_h_
-#define _AODReader_h_
+#ifndef LARG4VALIDATION_AODREADER_H
+#define LARG4VALIDATION_AODREADER_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/AtlasBComponent.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/AtlasBComponent.cxx
index ced631c5c82f3aa0641290c43ae4a999566c47fb..eefd8027ea042d4ceb6e0854d8b53d9f2350aa46 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/AtlasBComponent.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/AtlasBComponent.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CLHEP/Units/SystemOfUnits.h"
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/AtlasBComponent.h b/LArCalorimeter/LArG4/LArG4Validation/src/AtlasBComponent.h
index e7df285fb6585a3c261020fff6134bd85447466d..6fa224368cde44c1e853f3972e664b1898890613 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/AtlasBComponent.h
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/AtlasBComponent.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CLHEP/GenericFunctions/AbsFunction.hh"
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/GeoXPEngine.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/GeoXPEngine.cxx
index 7b4080386e94876bb30c97a6a28ebbce574881b3..9e1a2e211aca73ff94eb0d0f73199b1cc7a2b0e9 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/GeoXPEngine.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/GeoXPEngine.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "GeoXPEngine.h"
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/GeoXPEngine.h b/LArCalorimeter/LArG4/LArG4Validation/src/GeoXPEngine.h
index 37b0468d4d31ca068ca1e6adc641297adcc414f9..7096ba24862ee7fa3b5460a491ae5ac2eddf9eb8 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/GeoXPEngine.h
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/GeoXPEngine.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //---------------------------------------------------------------------------//
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
index ca57b57ffb124bc3c06cf5ad8a8b18e574d14454..f138da8a0cf4cc1522957c41a06eeff306712e9e 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
@@ -1,8 +1,8 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "LArG4Validation/SingleTrackValidation.h"
+#include "SingleTrackValidation.h"
 #include "StoreGate/StoreGateSvc.h"
 
 // For MC Truth information:
@@ -31,8 +31,6 @@
 #include "LArSimEvent/LArHitContainer.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloIdentifier/LArID_Exception.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
 // To make it easier for us to access hit info
 #include "GeoAdaptors/GeoLArHit.h"
 
@@ -303,11 +301,9 @@ StatusCode SingleTrackValidation::execute() {
   StoreGateSvc *stg;
   sc=service("StoreGateSvc", stg);
     
-  const DataHandle<EventInfo> evt;
-  sc=stg->retrieve(evt);
-  if (sc.isFailure()) return StatusCode::SUCCESS;
-  int RunNum=evt->event_ID()->run_number();
-  int EvtNum=evt->event_ID()->event_number();
+  const EventContext& context = getContext();
+  int RunNum=context.eventID().run_number();
+  int EvtNum=context.eventID().event_number();
   double RunStr=double(RunNum);
   double EvtStr=double(EvtNum);
   m_c->EventNo=EvtStr;
diff --git a/LArCalorimeter/LArG4/LArG4Validation/LArG4Validation/SingleTrackValidation.h b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.h
similarity index 77%
rename from LArCalorimeter/LArG4/LArG4Validation/LArG4Validation/SingleTrackValidation.h
rename to LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.h
index b763016cc3a1696e976f5a3c46192a2033c5676c..70d2d924acf74fe1cc595028cf54ef596643fac6 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/LArG4Validation/SingleTrackValidation.h
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.h
@@ -1,9 +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
 */
 
-#ifndef _SingleTrackValidation_h_
-#define _SingleTrackValidation_h_
+#ifndef LARG4VALIDATION_SINGLETRACKVALIDATION_H
+#define LARG4VALIDATION_SINGLETRACKVALIDATION_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "TH1F.h"
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx
index c253d6abc0c76dfe5608df14f3cd2a3b015a312c..4fb45c6c33f034c7bdc11870c4d4cc4ff86ebc00 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx
@@ -1,5 +1,5 @@
-#include "LArG4Validation/SingleTrackValidation.h"
-#include "LArG4Validation/AODReader.h"
+#include "../SingleTrackValidation.h"
+#include "../AODReader.h"
 
 
 DECLARE_COMPONENT( SingleTrackValidation )