diff --git a/reco/L1/L1Algo/L1Algo.h b/reco/L1/L1Algo/L1Algo.h
index 86f1b1fc208def8c908ba304667fdace76b4051b..2853070b7c0ad35e2608071bf8f9455d309a8835 100644
--- a/reco/L1/L1Algo/L1Algo.h
+++ b/reco/L1/L1Algo/L1Algo.h
@@ -19,17 +19,10 @@ class L1AlgoDraw;
 //#define XXX               // time debug
 //#define COUNTERS          // diff counters (hits, doublets, ... )
 
-// =====>dispatched<===== // #define MERGE_CLONES
-
-// =====>dispatched<===== // #define HitErrors
 //#define GLOBAL
 //#define mCBM
 
-// =====>dispatched<===== // #define LAST_ITERATION kAllSecIter
 #define FIND_GAPED_TRACKS  // use triplets with gaps
-// =====>dispatched<===== // #define USE_RL_TABLE
-//#endif
-
 
 #include <array>
 #include <iomanip>
diff --git a/reco/L1/L1Algo/L1TrackExtender.cxx b/reco/L1/L1Algo/L1TrackExtender.cxx
index bfd01b3a607f20292bf4015ff1de4db5dcc39754..df3b68aa7a99af2b6e84e753327160bf6f1ce3bc 100644
--- a/reco/L1/L1Algo/L1TrackExtender.cxx
+++ b/reco/L1/L1Algo/L1TrackExtender.cxx
@@ -88,11 +88,11 @@ void L1Algo::BranchFitterFast(const L1Branch& t, L1TrackPar& T, const bool dir,
   T.C10  = sta0.XYInfo.C10;
   T.C11  = sta0.XYInfo.C11;
 
-#ifdef HitErrors
-  T.C00 = hit0.dx * hit0.dx;
-  T.C10 = hit0.dxy;
-  T.C11 = hit0.dy * hit0.dy;
-#endif
+  if constexpr (L1Constants::control::kIfSaveHitErrorsInTrackExtender) {
+    T.C00 = hit0.dx * hit0.dx;
+    T.C10 = hit0.dxy;
+    T.C11 = hit0.dy * hit0.dy;
+  }
 
   T.C20 = T.C21 = 0;
   T.C30 = T.C31 = T.C32 = 0;
@@ -146,16 +146,12 @@ void L1Algo::BranchFitterFast(const L1Branch& t, L1TrackPar& T, const bool dir,
 
     L1UMeasurementInfo info = sta.frontInfo;
 
-#ifdef HitErrors
-    info.sigma2 = hit.du * hit.du;
-#endif
+    if constexpr (L1Constants::control::kIfSaveHitErrorsInTrackExtender) { info.sigma2 = hit.du * hit.du; }
     L1Filter(T, info, u);
 
     info = sta.backInfo;
 
-#ifdef HitErrors
-    info.sigma2 = hit.dv * hit.dv;
-#endif
+    if constexpr (L1Constants::control::kIfSaveHitErrorsInTrackExtender) { info.sigma2 = hit.dv * hit.dv; }
     L1Filter(T, info, v);
 
     FilterTime(T, hit.t, hit.dt);
@@ -325,16 +321,12 @@ void L1Algo::FindMoreHits(L1Branch& t, L1TrackPar& T, const bool dir,
 
     L1UMeasurementInfo info = sta.frontInfo;
 
-#ifdef HitErrors
-    info.sigma2 = hit.du * hit.du;
-#endif
+    if constexpr (L1Constants::control::kIfSaveHitErrorsInTrackExtender) { info.sigma2 = hit.du * hit.du; }
     L1Filter(T, info, u);
 
     info = sta.backInfo;
 
-#ifdef HitErrors
-    info.sigma2 = hit.dv * hit.dv;
-#endif
+    if constexpr (L1Constants::control::kIfSaveHitErrorsInTrackExtender) { info.sigma2 = hit.dv * hit.dv; }
     L1Filter(T, info, v);
 
     FilterTime(T, hit.t, hit.dt);