diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt
deleted file mode 100644
index 212e83ee62c19d37eab82aeb339952682808bdd5..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-################################################################################
-# Package: ExpressionEvaluation
-################################################################################
-
-# Declare the package name:
-atlas_subdir( ExpressionEvaluation )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthContainers
-                          Control/SGTools
-                          Control/StoreGate
-                          GaudiKernel
-                          Trigger/TrigAnalysis/TrigDecisionTool
-                          PRIVATE
-                          Event/xAOD/xAODBTagging
-                          Event/xAOD/xAODBase
-                          Event/xAOD/xAODCaloEvent
-                          Event/xAOD/xAODEgamma
-                          Event/xAOD/xAODEventInfo
-                          Event/xAOD/xAODEventShape
-                          Event/xAOD/xAODJet
-                          Event/xAOD/xAODMissingET
-                          Event/xAOD/xAODMuon
-                          Event/xAOD/xAODPFlow
-                          Event/xAOD/xAODParticleEvent
-                          Event/xAOD/xAODTau
-                          Event/xAOD/xAODTracking
-                          Event/xAOD/xAODTruth )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
-atlas_add_library( ExpressionEvaluationLib
-                   src/*.cxx
-                   Root/*.cxx
-                   PUBLIC_HEADERS ExpressionEvaluation
-                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers SGTools GaudiKernel StoreGateLib SGtests TrigDecisionToolLib
-                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} xAODBTagging xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODEventShape xAODJet xAODMissingET xAODMuon xAODPFlow xAODParticleEvent xAODTau xAODTracking xAODTruth )
-
-atlas_add_component( ExpressionEvaluation
-                     src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthContainers SGTools StoreGateLib SGtests GaudiKernel TrigDecisionToolLib xAODBTagging xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODEventShape xAODJet xAODMissingET xAODMuon xAODPFlow xAODParticleEvent xAODTau xAODTracking xAODTruth ExpressionEvaluationLib )
-
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx
index bfce78f9e644857a70564ada0e167de4f8e96106..ae1ea28ce021304b49b5d91f59eff3b7d49f4d57 100644
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx
+++ b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx
@@ -62,6 +62,7 @@
 #include "xAODPFlow/PFOContainer.h"
 #include "xAODParticleEvent/ParticleContainer.h"
 #include "xAODParticleEvent/CompositeParticleContainer.h"
+#include "xAODTracking/TrackMeasurementValidationContainer.h"
 
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
@@ -171,6 +172,7 @@ namespace ExpressionParsing {
     TRY_VECTOR(xAOD::PFOContainer);
     TRY_VECTOR(xAOD::ParticleContainer);
     TRY_VECTOR(xAOD::CompositeParticleContainer);
+    TRY_VECTOR(xAOD::TrackMeasurementValidationContainer);
 
     TRY_SCALAR(xAOD::EventInfo); 
     TRY_SCALAR(xAOD::EventShape);