diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 10f7756defcb531c9980bca17fe1b0dd5abdc7db..7dffdb0df8b702c12f2b465e264f2eaa0d02b0e9 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -236,7 +236,7 @@ Set(DEPENDENCIES
     Base
     CbmBase
     CbmData
-#    CbmSimSteer
+    CbmSimSteer
 #    CbmGeoSetup
     CbmMuchBase
     CbmTrdBase
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 4f7590f2037cf6ae96852714043ff3b0905ed921..1cc5edfcd17c3be0fe66a73a5635573c580317db 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -29,6 +29,7 @@
 #include "CbmMuchStation.h"
 #include "CbmMvdDetector.h"
 #include "CbmMvdStationPar.h"
+#include "CbmSetup.h"
 // TODO: include of CbmSetup.h creates problems on Mac
 // #include "CbmSetup.h"
 #include "CbmMCDataObject.h"
@@ -111,11 +112,13 @@ CbmL1::~CbmL1()
 
 void CbmL1::CheckDetectorPresence()
 {
-  Bool_t IsMuch       = 0;
-  Bool_t IsTrd        = 0;
-  Bool_t IsTof        = 0;
-  Bool_t IsSts        = 0;
-  Bool_t IsMvd        = 0;
+  Bool_t IsMuch = CbmSetup::Instance()->IsActive(ECbmModuleId::kMuch);
+  Bool_t IsTrd  = CbmSetup::Instance()->IsActive(ECbmModuleId::kTrd);
+  Bool_t IsTof  = CbmSetup::Instance()->IsActive(ECbmModuleId::kTof);
+  //Bool_t IsSts        = CbmSetup::Instance()->IsActive(ECbmModuleId::kSts);
+  Bool_t IsMvd = CbmSetup::Instance()->IsActive(ECbmModuleId::kMvd);
+
+  /*
   TObjArray* topNodes = gGeoManager->GetTopNode()->GetNodes();
 
   for (Int_t iTopNode = 0; iTopNode < topNodes->GetEntriesFast(); iTopNode++) {
@@ -124,9 +127,10 @@ void CbmL1::CheckDetectorPresence()
     if (TString(topNode->GetName()).Contains("much")) IsMuch = 1;
     if (TString(topNode->GetName()).Contains("trd")) IsTrd = 1;
     if (TString(topNode->GetName()).Contains("tof")) IsTof = 1;
-    if (TString(topNode->GetName()).Contains("sts")) IsSts = 1;
+    //if (TString(topNode->GetName()).Contains("sts")) IsSts = 1;
     if (TString(topNode->GetName()).Contains("mvd")) IsMvd = 1;
   }
+  */
 
   fUseMUCH = (fUseMUCH && IsMuch);
   fUseTRD  = fUseTRD && IsTrd;
@@ -460,7 +464,7 @@ InitStatus CbmL1::Init()
           if (NULL == fChannelInfo) break;
           float z = fChannelInfo->GetZ();
           float x = fChannelInfo->GetX();
-          float y = fChannelInfo->GetY();
+          //float y = fChannelInfo->GetY();
 
           if (station < 0) continue;