diff --git a/Alignment/Humboldt/tests/options/input_and_conds.py b/Alignment/Humboldt/tests/options/input_and_conds.py
index 9875b318ae3dd2be86c5fb4c75471250aa58f245..51400d0701decdd61cc5c6d22b8786802543f8f3 100644
--- a/Alignment/Humboldt/tests/options/input_and_conds.py
+++ b/Alignment/Humboldt/tests/options/input_and_conds.py
@@ -21,7 +21,7 @@ if UseDD4Hep:
     from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
     dx = 1.092
     dy = 0.474
-    condval = "!alignment{ position: [%f * mm, %f * mm, 0 * mm], rotation: [0,0,0]}" % (
+    condval = "!alignment { position: [%f * mm, %f * mm, 0 * mm], rotation: [0,0,0]}" % (
         dx, dy)
     DD4hepSvc().ConditionsOverride = {
         "/world/BeforeMagnetRegion/VP/MotionVPLeft:alignment_delta": condval,
diff --git a/Alignment/TAlignment/src/AlignConditionHelpers.h b/Alignment/TAlignment/src/AlignConditionHelpers.h
index 236e4cddd9aada3e74963b494a1974d4c2cdd191..c9f73185faa1f2c021af137657be1909eb01c9e1 100644
--- a/Alignment/TAlignment/src/AlignConditionHelpers.h
+++ b/Alignment/TAlignment/src/AlignConditionHelpers.h
@@ -27,9 +27,7 @@ namespace LHCb::Alignment::ConditionHelpers {
         return T( cond );
       } else {
         using DT = std::decay_t<T>;
-        if constexpr ( std::is_same_v<DT, YAML::Node> ) {
-          return LHCb::Detector::utils::json2yaml( cond.get<nlohmann::json>() );
-        } else if constexpr ( !detail::PassAsAny<DT>::value ) {
+        if constexpr ( !detail::PassAsAny<DT>::value ) {
           return cond.get<DT>();
         } else {
           const DT* p = nullptr;
diff --git a/Calibration/Pi0Calibration/src/Pi0CalibrationAlg.cpp b/Calibration/Pi0Calibration/src/Pi0CalibrationAlg.cpp
index c64af87f45f9ced3bddee66ecf171ced36f086b6..652162f8629dae1e855c542258c04412f77049eb 100644
--- a/Calibration/Pi0Calibration/src/Pi0CalibrationAlg.cpp
+++ b/Calibration/Pi0Calibration/src/Pi0CalibrationAlg.cpp
@@ -34,8 +34,6 @@
 
 #include <boost/filesystem.hpp>
 
-#include <yaml-cpp/yaml.h>
-
 #include <fstream>
 #include <iostream>
 #include <map>
diff --git a/Calibration/Pi0Calibration/src/Pi0LambdaMap.cpp b/Calibration/Pi0Calibration/src/Pi0LambdaMap.cpp
index f110e260b9702f72af05dc7783dc38802f223022..e65baed04e91a0bd4aa1445da1c4a0d34a9cc5a6 100644
--- a/Calibration/Pi0Calibration/src/Pi0LambdaMap.cpp
+++ b/Calibration/Pi0Calibration/src/Pi0LambdaMap.cpp
@@ -42,8 +42,6 @@ using namespace boost;
 using namespace boost::filesystem;
 using namespace Calibration::Pi0Calibration;
 
-#include "yaml-cpp/yaml.h"
-
 Pi0LambdaMap::Pi0LambdaMap( const std::vector<unsigned int>& indices ) {
   for ( auto index : indices ) m_lambdas[index] = std::make_pair( -1., -1. );
 }
diff --git a/Calibration/Pi0Calibration/src/Pi0MMap2Histo.cpp b/Calibration/Pi0Calibration/src/Pi0MMap2Histo.cpp
index cc97c1b4b60e61503aae74d407275590dcf93d24..7ef7a959309572b677e29f1e8c97580f854d971b 100644
--- a/Calibration/Pi0Calibration/src/Pi0MMap2Histo.cpp
+++ b/Calibration/Pi0Calibration/src/Pi0MMap2Histo.cpp
@@ -34,8 +34,6 @@
 
 #include <boost/filesystem.hpp>
 
-#include <yaml-cpp/yaml.h>
-
 #include <cstdint>
 #include <iostream>
 #include <map>