diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc2f1c160..18f68829e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
     - Features:
       - ADDED: a new `ways` subsection in the `annotations` section containing way IDs along the found path, with sign meaning direction [#5325](https://github.com/Project-OSRM/osrm-backend/issues/5325)
     - API:
-      - FIXED: item type for `nodes` section of the `annotations` flatbuffers output format
+      - FIXED: item type for `nodes` section of the `annotations` flatbuffers output format [#5970](https://github.com/Project-OSRM/osrm-backend/issues/5970)
 
 # 5.24.0
   - Changes from 5.23.0
diff --git a/include/engine/guidance/assemble_geometry.hpp b/include/engine/guidance/assemble_geometry.hpp
index b4e5028fb..1c0be9502 100644
--- a/include/engine/guidance/assemble_geometry.hpp
+++ b/include/engine/guidance/assemble_geometry.hpp
@@ -56,11 +56,9 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade,
         reversed_source ? source_node.reverse_segment_id.id : source_node.forward_segment_id.id;
     const auto source_geometry_id = facade.GetGeometryIndex(source_node_id).id;
     const auto source_geometry = facade.GetUncompressedForwardGeometry(source_geometry_id);
-    // const auto source_osm_way_ids = facade.GetUncompressedForwardWayIDs(source_geometry_id);
 
     geometry.osm_node_ids.push_back(
         facade.GetOSMNodeIDOfNode(source_geometry(source_segment_start_coordinate)));
-    // geometry.osm_way_ids.push_back(source_osm_way_ids(source_segment_start_coordinate)));
 
     auto cumulative_distance = 0.;
     auto current_distance = 0.;
diff --git a/unit_tests/engine/offline_facade.cpp b/unit_tests/engine/offline_facade.cpp
index b5cab414e..0fe6c8a44 100644
--- a/unit_tests/engine/offline_facade.cpp
+++ b/unit_tests/engine/offline_facade.cpp
@@ -173,8 +173,8 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
 
     OSMWayReverseRange GetUncompressedReverseWayIDs(const EdgeID id) const override
     {
-        return boost::adaptors::reverse(
-            boost::adaptors::transform(GetUncompressedForwardWayIDs(id), std::negate<OSMWayIDDir>()));
+        return boost::adaptors::reverse(boost::adaptors::transform(GetUncompressedForwardWayIDs(id),
+                                                                   std::negate<OSMWayIDDir>()));
     }
 
     TurnPenalty GetWeightPenaltyForEdgeID(const unsigned /*id*/) const override
diff --git a/unit_tests/mocks/mock_datafacade.hpp b/unit_tests/mocks/mock_datafacade.hpp
index e5dc49b1d..3831b3a32 100644
--- a/unit_tests/mocks/mock_datafacade.hpp
+++ b/unit_tests/mocks/mock_datafacade.hpp
@@ -72,8 +72,8 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
     }
     OSMWayReverseRange GetUncompressedReverseWayIDs(const EdgeID id) const override
     {
-        return boost::adaptors::reverse(
-            boost::adaptors::transform(GetUncompressedForwardWayIDs(id), std::negate<OSMWayIDDir>()));
+        return boost::adaptors::reverse(boost::adaptors::transform(GetUncompressedForwardWayIDs(id),
+                                                                   std::negate<OSMWayIDDir>()));
     }
     WeightForwardRange GetUncompressedForwardWeights(const EdgeID /* id */) const override
     {