diff --git a/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py b/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py
index 340d2986ad9abe19359067d58a493b84ad4d0b12..a1621e15ebd3ab404e83fe76c16cf1b3f7de9fb7 100644
--- a/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py
+++ b/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from __future__ import print_function
 from InDetRecExample import TrackingCommon as TrackingCommon
@@ -7,6 +7,8 @@ print("EMCommonRefitter.py")
 
 
 def getGSFTrackFitter():
+
+    # setup Rot and error scaling
     egRotCreator = TrackingCommon.getInDetRotCreator(
         name='egRotCreator',
         private=True)
@@ -15,23 +17,19 @@ def getGSFTrackFitter():
         TrackingCommon.getRIO_OnTrackErrorScalingCondAlg,
         'RIO_OnTrackErrorScalingCondAlg')
 
-    # get Rk propagator
+    # setup Rk propagator
     from TrkExRungeKuttaPropagator.TrkExRungeKuttaPropagatorConf import (
         Trk__RungeKuttaPropagator as Propagator)
 
     egTrkPropagator = Propagator(name='egTrkPropagator')
     egTrkPropagator.AccuracyParameter = 0.0001
 
-    # Setup the Navigator (default)
-    from TrkDetDescrSvc.AtlasTrackingGeometrySvc import (
-        AtlasTrackingGeometrySvc)
-
-    from TrkExTools.TrkExToolsConf import Trk__Navigator
-    egTrkNavigator = Trk__Navigator(
+    # setup Navigator
+    egTrkNavigator = TrackingCommon.getInDetNavigator(
         name='egTrkNavigator',
-        TrackingGeometrySvc=AtlasTrackingGeometrySvc)
+        private=True)
 
-    # Set up the GSF
+    # setup the GSF
     from TrkGaussianSumFilter.TrkGaussianSumFilterConf import (
         Trk__GsfMaterialMixtureConvolution)