diff --git a/ALICE3/Core/FastTracker.cxx b/ALICE3/Core/FastTracker.cxx
index b03a58e6c9e..d43bf10fc6d 100644
--- a/ALICE3/Core/FastTracker.cxx
+++ b/ALICE3/Core/FastTracker.cxx
@@ -22,6 +22,7 @@
 #include <TObject.h>
 
 #include <fstream>
+#include <map>
 #include <string>
 #include <vector>
 
@@ -66,20 +67,6 @@ void FastTracker::addDeadPhiRegionInLayer(const std::string& layerName, float ph
   layers[layerIdx].addDeadPhiRegion(phiStart, phiEnd);
 }
 
-DetLayer FastTracker::GetLayer(int layer, bool ignoreBarrelLayers) const
-{
-  int layerIdx = layer;
-  if (ignoreBarrelLayers) {
-    for (int il = 0, trackingLayerIdx = 0; trackingLayerIdx <= layer; il++) {
-      if (layers[il].isInert())
-        continue;
-      trackingLayerIdx++;
-      layerIdx = il;
-    }
-  }
-  return layers[layerIdx];
-}
-
 int FastTracker::GetLayerIndex(const std::string& name) const
 {
   int i = 0;
@@ -339,7 +326,7 @@ void FastTracker::AddGenericDetector(std::string filename, o2::ccdb::BasicCCDBMa
           LOG(fatal) << "Cannot open dead phi regions file " << deadPhiRegions;
           return;
         }
-        TGraph* g = (TGraph*)infile.Get(infile.GetListOfKeys()->At(0)->GetName());
+        TGraph* g = reinterpret_cast<TGraph*>(infile.Get(infile.GetListOfKeys()->At(0)->GetName()));
         infile.Close();
         addedLayer->setDeadPhiRegions(g);
       }
diff --git a/ALICE3/Core/FastTracker.h b/ALICE3/Core/FastTracker.h
index dd88d381424..d4d88cb13d9 100644
--- a/ALICE3/Core/FastTracker.h
+++ b/ALICE3/Core/FastTracker.h
@@ -48,7 +48,7 @@ class FastTracker
   /// \param phiStart Start angle of the dead region (in radians)
   /// \param phiEnd End angle of the dead region (in radians)
   void addDeadPhiRegionInLayer(const std::string& layerName, float phiStart, float phiEnd);
-  DetLayer GetLayer(const int layer, bool ignoreBarrelLayers = true) const;
+  DetLayer GetLayer(const int layer) const { return layers[layer]; }
   std::vector<DetLayer> GetLayers() const { return layers; }
   int GetLayerIndex(const std::string& name) const;
   size_t GetNLayers() const { return layers.size(); }