diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IVertexFinder.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IVertexFinder.h
index 353a12f184d1ac43abb8189c18c6763981d8e5fc..3dc98dde8870994b65c4ca8493b0942f7767124b 100755
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IVertexFinder.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IVertexFinder.h
@@ -55,35 +55,28 @@ public:
   virtual ~IVertexFinder(){};
   static const InterfaceID& interfaceID() { return IID_IVertexFinder; }
 
-  /*
-   * For MT we have 2 sets , one with EventContext and one without
-   * Implementation really need to overload only one
-   * The clients can call either
+  /** Find vertex from Trk::TrackCollection.
+   * @param EventContext
+   * @param  input track container
+   * @return a pair of newly created container and auxiliary store
    */
-
   virtual std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*>
-  findVertex(const EventContext& ctx, const TrackCollection* trackTES) const
-  {
-
-    (void)(ctx); // We do not use ctx
-    return findVertex(trackTES);
-  }
+  findVertex(const EventContext& ctx,
+             const TrackCollection* trackTES) const = 0;
 
   /** Find vertex from xAOD::TrackParticleContainer.
    * @param EventContext
-   * @param trackParticles input track container
+   * @param input track particle container
    * @return a pair of newly created container and auxiliary store
    */
   virtual std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*>
   findVertex(const EventContext& ctx,
-             const xAOD::TrackParticleContainer* trackParticles) const
-  {
-    (void)(ctx); // We do not use ctx
-    return findVertex(trackParticles);
-  }
+             const xAOD::TrackParticleContainer* trackParticles) const = 0;
 
   /* 
-   * Non Event context aware methods
+   * Non Event context aware methods.
+   * Can be remove when all clients move to EventContext 
+   * aware calls
    */
 
   virtual std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*>