diff --git a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
index 2a59f115f4f4e91ee1e5c483b7ee5a6fbacf44f4..49a72b2021bced7076021106087ea5d838ea9084 100644
--- a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
+++ b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
@@ -581,6 +581,7 @@ def getInDetTrackSelectorToolxAOD():
 
 ############################################################################
 # setup up JVA tools
+# Currently not used - moved into TauRecConfigured.py and added directly to topSequence
 def setupTauJVFTool():
     from AthenaCommon.AppMgr import ToolSvc
 
@@ -623,8 +624,8 @@ def setupTauJVFTool():
                                           MaxZ0SinTheta = 3.0 *mm,
                                           #OutputLevel=2
                                           )
-    #jetTrackAlg.Tools = [ToolSvc.JetTrackSelectionTool , ToolSvc.TrackVertexAssociationTool ]                                          
-    jetTrackAlg.Tools = [ToolSvc.TrackVertexAssociationTool ]                                          
+    #jetTrackAlg.Tools = [ToolSvc.JetTrackSelectionTool , ToolSvc.TrackVertexAssociationTool ]
+    jetTrackAlg.Tools = [ ToolSvc.TrackVertexAssociationTool ]
     
     from AthenaCommon.AlgSequence import AlgSequence
     topSequence = AlgSequence()    
@@ -637,8 +638,8 @@ def getTauVertexFinder(doUseTJVA=False):
     if _name in cached_instances:
         return cached_instances[_name]
     
-    if doUseTJVA:
-        setupTauJVFTool()
+    #if doUseTJVA:
+    #    setupTauJVFTool()
     
     # Algorithm that overwrites numTrack() and charge() of all tauJets in the container
     from tauRecTools.tauRecToolsConf import TauVertexFinder
diff --git a/Reconstruction/tauRec/python/TauRecConfigured.py b/Reconstruction/tauRec/python/TauRecConfigured.py
index 2598cf77d713dfcfe491d2f166cf4e7b8efba1bb..fa695b266aa48addfa1d0ce288bfd5126a64dc57 100644
--- a/Reconstruction/tauRec/python/TauRecConfigured.py
+++ b/Reconstruction/tauRec/python/TauRecConfigured.py
@@ -71,13 +71,28 @@ class TauRecConfigured ( Configured ) :
         topSequence.SGInputLoader.Load = [ ('xAOD::JetContainer','AntiKt4LCTopoJets'), ('xAOD::VertexContainer', 'PrimaryVertices'),
                                            ('xAOD::TrackParticleContainer','InDetTrackParticles'), ('CaloCellContainer','AllCalo') ]
 
-        topSequence += self.TauProcessorAlgHandle()
-
-        # separate algorithm, from CaloRec
-        #if self.doPi0Clus:
-        #    import tauRec.Pi0ClusterMakerHolder as pi0alg
-        #    topSequence += pi0alg.getTauPi0ClusterMaker()
+        from AthenaCommon.AppMgr import ToolSvc
+        from JetRec.JetRecConf import JetAlgorithm
+        jetTrackAlg = JetAlgorithm("JetTrackAlg_forTaus")
+        from JetRecTools.JetRecToolsConf import TrackVertexAssociationTool
+        TauTVATool = TrackVertexAssociationTool(TrackParticleContainer = "InDetTrackParticles",
+                                                TrackVertexAssociation="JetTrackVtxAssoc_forTaus",
+                                                VertexContainer= "PrimaryVertices",
+                                                MaxTransverseDistance = 2.5 *mm,
+                                                #MaxLongitudinalDistance = 2 *mm,
+                                                MaxZ0SinTheta = 3.0 *mm,
+                                                #OutputLevel=2
+                                                )
+        ToolSvc += TauTVATool
+        jetTrackAlg.Tools = [ TauTVATool ]
+        topSequence += jetTrackAlg
+
+        # Can I move this to different script?
+        #import tauRec.TauAlgorithmsHolder as taualgs
+        # add tauJVF tool to topSequence
+        #taualgs.setupTauJVFTool
 
+        topSequence += self.TauProcessorAlgHandle()
 
     def WrapTauRecToolExecHandles(self, tools=[]):
 
diff --git a/Reconstruction/tauRec/python/TauRecRunConfigured.py b/Reconstruction/tauRec/python/TauRecRunConfigured.py
index f05b03889d8186e6eae6c29e2f88b7e2c2c7f9c1..e3479818d58ef06f395d32ca14b1537fcbcfed0b 100644
--- a/Reconstruction/tauRec/python/TauRecRunConfigured.py
+++ b/Reconstruction/tauRec/python/TauRecRunConfigured.py
@@ -37,7 +37,7 @@ class TauRecRunConfigured ( Configured ) :
                                                   Key_pi0ClusterOutputContainer="TauNeutralParticleFlowObjects",
                                                   Key_hadronicPFOOutputContainer="TauHadronicParticleFlowObjects",
                                                   Key_vertexOutputContainer = "TauSecondaryVertices",
-                                                  Key_chargedPFOOutputContainer = 'TauChargedParticleFlowObjects'
+                                                  Key_chargedPFOOutputContainer = "TauChargedParticleFlowObjects"
                                                   )
                                                                                                 
         Configured.__init__(self, ignoreExistingDataObject=ignoreExistingDataObject)
diff --git a/Reconstruction/tauRec/share/tauRec_jobOptions.py b/Reconstruction/tauRec/share/tauRec_jobOptions.py
index 1e02637f27e5e626510b5dd680595da520a46540..bd750979f5a236068328487dd2f001ce6b8fd964 100644
--- a/Reconstruction/tauRec/share/tauRec_jobOptions.py
+++ b/Reconstruction/tauRec/share/tauRec_jobOptions.py
@@ -27,18 +27,11 @@ _doPi0Clus = True
 from tauRec.TauRecBuilder import TauRecCoreBuilder
 TauRecCoreBuilder(doPi0Clus=_doPi0Clus, doTJVA=_doTJVA)
 
-
 #include("tauRec/Pi0ClusterMaker_Crakow_jobOptions.py")
 if _doPi0Clus:
     include("tauRec/Pi0ClusterMaker_jobOptions.py")
 
-from tauRec.TauRecBuilder import TauRecPi0EflowProcessor
-TauRecPi0EflowProcessor(doPi0Clus=_doPi0Clus)
-
 from tauRec.TauRecRunner import TauRecRunner
 TauRecRunner(doPi0Clus=_doPi0Clus, doTJVA=_doTJVA)
 
-#from tauRec.TauRecBuilder import TauRecVariablesProcessor
-#TauRecVariablesProcessor(doPi0Clus=_doPi0Clus)
-