diff --git a/Det/FTDet/CMakeLists.txt b/Det/FTDet/CMakeLists.txt
index a2856a26d6283248e05cc47491fcaf46e40d175c..9975bc1a0a7b45dade6f033b3c7f111f2e9890df 100644
--- a/Det/FTDet/CMakeLists.txt
+++ b/Det/FTDet/CMakeLists.txt
@@ -13,16 +13,16 @@ Det/FTDet
 ---------
 #]=======================================================================]
 
-if (USE_DD4HEP)
-  set(BUILD_TESTING false) # prevent headers build test
+#if (USE_DD4HEP)
+#  set(BUILD_TESTING false) # prevent headers build test
 
-  gaudi_add_header_only_library(FTDetLib
-    PUBLIC
-        Gaudi::GaudiKernel
-        LHCb::LHCbKernel
-)
+#  gaudi_add_header_only_library(FTDetLib
+#    PUBLIC
+#        Gaudi::GaudiKernel
+#        LHCb::LHCbKernel
+#)
 
-else()
+#else()
   
 gaudi_add_library(FTDetLib
     SOURCES
@@ -35,7 +35,7 @@ gaudi_add_library(FTDetLib
     LINK
         PUBLIC
             Gaudi::GaudiKernel
-            LHCb::DetDescLib
+            Run2Support::DetDescLib
             LHCb::LHCbKernel
 )
 
@@ -50,15 +50,16 @@ gaudi_add_module(FTDet
         src/component/XmlDeFTStationCnv.cpp
     LINK
         LHCb::LHCbAlgsLib
-        LHCb::DetDescCnvLib
-        LHCb::FTDetLib
+	#Run2Support::DetDescLib
+	Run2Support::DetDescCnvLib
+        Run2Support::FTDetLib
         LHCb::MCEvent
 )
 
 gaudi_add_dictionary(FTDetDict
     HEADERFILES dict/FTDetDict.h
     SELECTION dict/FTDetDict.xml
-    LINK LHCb::FTDetLib
+    LINK Run2Support::FTDetLib
 )
 
-endif()
+#endif()
diff --git a/Det/FTDet/include/FTDet/DeFTDetector.h b/Det/FTDet/include/FTDet/DeFTDetector.h
index a9034f7d24683ba46ce5ac75a8d23d33e74ae426..330dfa2747933ee74174fc54f73bbe37d1562cd1 100644
--- a/Det/FTDet/include/FTDet/DeFTDetector.h
+++ b/Det/FTDet/include/FTDet/DeFTDetector.h
@@ -18,14 +18,6 @@
 #include "DeFTQuarter.h"
 #include "DeFTStation.h"
 
-#ifdef USE_DD4HEP
-namespace DeFTDetectorLocation {
-  // FT location
-  inline const std::string Default = "/world/AfterMagnetRegion/T/FT:DetElement-Info-IOV";
-} // namespace DeFTDetectorLocation
-#  include "Detector/FT/DeFT.h"
-using DeFT = LHCb::Detector::DeFT;
-#else
 namespace DeFTDetectorLocation {
   // FT location defined in the XmlDDDB
   inline const std::string Default = "/dd/Structure/LHCb/AfterMagnetRegion/T/FT";
@@ -266,5 +258,3 @@ private:
 
 }; // end of class
 using DeFT = DeFTDetector;
-
-#endif
diff --git a/Det/FTDet/include/FTDet/DeFTLayer.h b/Det/FTDet/include/FTDet/DeFTLayer.h
index ea86eef2b9da5eaf4ec95635f94d60eef55ac1d6..cad653bafa3cf8aaae12df31248d1f55c02a479e 100644
--- a/Det/FTDet/include/FTDet/DeFTLayer.h
+++ b/Det/FTDet/include/FTDet/DeFTLayer.h
@@ -9,10 +9,6 @@
 * or submit itself to any jurisdiction.                                       *
 \*****************************************************************************/
 #pragma once
-#ifdef USE_DD4HEP
-#  include "Detector/FT/DeFTLayer.h"
-using DeFTLayer = LHCb::Detector::DeFTLayer;
-#else
 #  include "DetDesc/DetectorElement.h"
 #  include "Detector/FT/FTChannelID.h"
 #  include "FTDet/DeFTQuarter.h"
@@ -133,4 +129,3 @@ private:
   float          m_sizeX;       ///< Size of the layer in x
   float          m_sizeY;       ///< Size of the layer in y
 };
-#endif
diff --git a/Det/FTDet/include/FTDet/DeFTMat.h b/Det/FTDet/include/FTDet/DeFTMat.h
index 9ae569a1cc0a862d60b0251e89332a65cbac9a80..8f8e6925c2542832e939b1162bed9161bff304de 100644
--- a/Det/FTDet/include/FTDet/DeFTMat.h
+++ b/Det/FTDet/include/FTDet/DeFTMat.h
@@ -10,11 +10,6 @@
 \*****************************************************************************/
 #pragma once
 
-#ifdef USE_DD4HEP
-#  include "Detector/FT/DeFTMat.h"
-using DeFTMat = LHCb::Detector::DeFTMat;
-#else
-
 #  include "DetDesc/DetectorElement.h"
 #  include "DetDesc/IPVolume.h"
 #  include "Detector/FT/FTChannelID.h"
@@ -295,4 +290,3 @@ private:
   std::vector<double> m_matContractionParameterVector;
 
 }; // end of class
-#endif
diff --git a/Det/FTDet/include/FTDet/DeFTModule.h b/Det/FTDet/include/FTDet/DeFTModule.h
index e1489286fb7f77c2c0938350ca12fb1bb9233aeb..11d5379333122b666b0740a18d7a3852a68825ea 100644
--- a/Det/FTDet/include/FTDet/DeFTModule.h
+++ b/Det/FTDet/include/FTDet/DeFTModule.h
@@ -10,11 +10,6 @@
 \*****************************************************************************/
 #pragma once
 
-#ifdef USE_DD4HEP
-#  include "Detector/FT/DeFTModule.h"
-using DeFTModule = LHCb::Detector::DeFTModule;
-#else
-
 #  include "DetDesc/DetectorElement.h"
 #  include "Detector/FT/FTChannelID.h"
 #  include "FTDet/DeFTMat.h"
@@ -145,4 +140,3 @@ private:
 }; // end of class
 
 /// Find mat method
-#endif
diff --git a/Det/FTDet/include/FTDet/DeFTQuarter.h b/Det/FTDet/include/FTDet/DeFTQuarter.h
index 76d1b5d9125953886c35ffe0928b3ceae27f6bb4..1a2b97654f52fe318008b585b9aeca668afb77e5 100644
--- a/Det/FTDet/include/FTDet/DeFTQuarter.h
+++ b/Det/FTDet/include/FTDet/DeFTQuarter.h
@@ -10,10 +10,6 @@
 \*****************************************************************************/
 #pragma once
 
-#ifdef USE_DD4HEP
-#  include "Detector/FT/DeFTQuarter.h"
-using DeFTQuarter = LHCb::Detector::DeFTQuarter;
-#else
 #  include "DetDesc/DetectorElement.h"
 #  include "Detector/FT/FTChannelID.h"
 #  include "FTDet/DeFTModule.h"
@@ -98,4 +94,3 @@ private:
   float                                                 m_meanModuleDzdy{};
   float                                                 m_meanModuleDxdy{};
 }; // end of class
-#endif
diff --git a/Det/FTDet/include/FTDet/DeFTStation.h b/Det/FTDet/include/FTDet/DeFTStation.h
index a658fb0422e2a406272c4e1ce81aaec5911cc628..afa4e6e1da9b618277280bd3cadc141a8dfce601 100644
--- a/Det/FTDet/include/FTDet/DeFTStation.h
+++ b/Det/FTDet/include/FTDet/DeFTStation.h
@@ -9,10 +9,6 @@
 * or submit itself to any jurisdiction.                                       *
 \*****************************************************************************/
 #pragma once
-#ifdef USE_DD4HEP
-#  include "Detector/FT/DeFTStation.h"
-using DeFTStation = LHCb::Detector::DeFTStation;
-#else
 #  include "DetDesc/DetectorElement.h"
 #  include "Detector/FT/FTChannelID.h"
 #  include "FTDet/DeFTLayer.h"
@@ -86,4 +82,3 @@ private:
   unsigned int m_stationID; ///< station ID number
 
 }; // end of class
-#endif