diff --git a/FT/FTMonitors/src/FTClusterMonitor.cpp b/FT/FTMonitors/src/FTClusterMonitor.cpp
index f3a58ab359747f1ca93eda3823239640fdce6b25..7afc56b14a56734d35d2b92bebb358cdab99a3cd 100644
--- a/FT/FTMonitors/src/FTClusterMonitor.cpp
+++ b/FT/FTMonitors/src/FTClusterMonitor.cpp
@@ -16,17 +16,12 @@
 #include "GaudiKernel/PhysicalConstants.h"
 #include "GaudiKernel/SystemOfUnits.h"
 #include "LHCbAlgs/Consumer.h"
-#include <DetDesc/GenericConditionAccessorHolder.h>
 #include <Gaudi/Accumulators/Histogram.h>
 #include <GaudiKernel/GaudiException.h>
 
 #include "Detector/FT/FTChannelID.h"
 #include "Detector/FT/FTConstants.h"
 
-#if __GNUC__ < 12
-#  pragma GCC diagnostic ignored "-Wsubobject-linkage"
-#endif
-
 #include "ClusterMonitor.h"
 #include "FTMonitoring.h"
 #include "FillingSchemeProvider.h"
@@ -43,8 +38,9 @@ using ODIN            = LHCb::ODIN;
 namespace GA          = Gaudi::Accumulators;
 namespace FTConstants = LHCb::Detector::FT;
 
-class FTClusterMonitor : public LHCb::Algorithm::Consumer<void( const FTLiteClusters&, const DeFT&, const ODIN& ),
-                                                          LHCb::DetDesc::usesBaseAndConditions<GaudiHistoAlg, DeFT>> {
+class FTClusterMonitor
+    : public LHCb::Algorithm::Consumer<void( const FTLiteClusters&, const DeFT&, const ODIN& ),
+                                       LHCb::Algorithm::Traits::usesBaseAndConditions<GaudiHistoAlg, DeFT>> {
 public:
   FTClusterMonitor( const std::string& name, ISvcLocator* pSvcLocator );
 
diff --git a/FT/FTMonitors/src/FTDigitMonitor.cpp b/FT/FTMonitors/src/FTDigitMonitor.cpp
index ec58eceb413b0efc57dfed59d92f57dc4a570c7e..98dc5d8cd37b41e5b522bbd3ea5d6be9903b9a38 100644
--- a/FT/FTMonitors/src/FTDigitMonitor.cpp
+++ b/FT/FTMonitors/src/FTDigitMonitor.cpp
@@ -22,15 +22,11 @@
 #include "GaudiKernel/SystemOfUnits.h"
 #include "LHCbAlgs/Consumer.h"
 
-#include <DetDesc/GenericConditionAccessorHolder.h>
 #include <Gaudi/Accumulators/Histogram.h>
 #include <GaudiKernel/GaudiException.h>
 #include <boost/range/irange.hpp>
 #include <optional>
 
-#if __GNUC__ < 12
-#  pragma GCC diagnostic ignored "-Wsubobject-linkage"
-#endif
 #include "TAEHandler.h"
 
 namespace FTConstants = LHCb::Detector::FT;
@@ -41,7 +37,7 @@ namespace FTConstants = LHCb::Detector::FT;
  */
 class FTDigitMonitor
     : public LHCb::Algorithm::Consumer<void( const LHCb::FTDigit::FTDigits&, const DeFT&, const LHCb::ODIN& ),
-                                       LHCb::DetDesc::usesBaseAndConditions<GaudiHistoAlg, DeFT>> {
+                                       LHCb::Algorithm::Traits::usesBaseAndConditions<GaudiHistoAlg, DeFT>> {
 public:
   FTDigitMonitor( const std::string& name, ISvcLocator* pSvcLocator );
 
diff --git a/FT/FTMonitors/src/FTNZSClusterMonitor.cpp b/FT/FTMonitors/src/FTNZSClusterMonitor.cpp
index 0dc4b146266a1fca0468bb70a92fcc61865aadfb..d1e64407844bc2015d539cbfbc15ae04991cea49 100644
--- a/FT/FTMonitors/src/FTNZSClusterMonitor.cpp
+++ b/FT/FTMonitors/src/FTNZSClusterMonitor.cpp
@@ -15,7 +15,6 @@
 #include "GaudiAlg/GaudiHistoAlg.h"
 #include "GaudiKernel/SystemOfUnits.h"
 #include "LHCbAlgs/Consumer.h"
-#include <DetDesc/GenericConditionAccessorHolder.h>
 #include <Gaudi/Accumulators/Histogram.h>
 #include <GaudiKernel/GaudiException.h>
 #include <optional>
@@ -26,9 +25,6 @@
 #include "Event/FTLiteCluster.h"
 #include "FTDet/DeFTDetector.h"
 
-#if __GNUC__ < 12
-#  pragma GCC diagnostic ignored "-Wsubobject-linkage"
-#endif
 #include "ClusterMonitor.h"
 #include "FTMonitoring.h"
 #include "FillingSchemeProvider.h"
@@ -47,7 +43,7 @@ namespace FTConstants = LHCb::Detector::FT;
 
 class FTNZSClusterMonitor
     : public LHCb::Algorithm::Consumer<void( const FTLiteClusters&, const FTLiteClusters&, const DeFT&, const ODIN& ),
-                                       LHCb::DetDesc::usesBaseAndConditions<GaudiHistoAlg, DeFT>> {
+                                       LHCb::Algorithm::Traits::usesBaseAndConditions<GaudiHistoAlg, DeFT>> {
 public:
   FTNZSClusterMonitor( const std::string& name, ISvcLocator* pSvcLocator );