diff --git a/components/core/src/clp/ffi/ir_stream/ir_unit_deserialization_methods.hpp b/components/core/src/clp/ffi/ir_stream/ir_unit_deserialization_methods.hpp
index abe40bab7..451f627db 100644
--- a/components/core/src/clp/ffi/ir_stream/ir_unit_deserialization_methods.hpp
+++ b/components/core/src/clp/ffi/ir_stream/ir_unit_deserialization_methods.hpp
@@ -62,8 +62,7 @@ namespace clp::ffi::ir_stream {
  * @param user_gen_keys_schema_tree Schema tree for user-generated keys, used to construct the
  * KV-pair log event.
  * @param utc_offset UTC offset used to construct the KV-pair log event.
- * @return A result containing the deserialized log event or an error code indicating the
- * failure:
+ * @return A result containing the deserialized log event or an error code indicating the failure:
  * - std::errc::result_out_of_range if the IR stream is truncated.
  * - std::errc::protocol_error if the IR stream is corrupted.
  * - std::errc::protocol_not_supported if the IR stream contains an unsupported metadata format
diff --git a/components/core/tests/test-ffi_KeyValuePairLogEvent.cpp b/components/core/tests/test-ffi_KeyValuePairLogEvent.cpp
index 3fb396a25..18c7c4c18 100644
--- a/components/core/tests/test-ffi_KeyValuePairLogEvent.cpp
+++ b/components/core/tests/test-ffi_KeyValuePairLogEvent.cpp
@@ -322,8 +322,6 @@ TEST_CASE("ffi_KeyValuePairLogEvent_create", "[ffi]") {
         REQUIRE_NOTHROW(user_gen_keys_schema_tree->insert_node(locator));
     }
 
-    // This test case implicitly requires the auto-generated and user-generated schema trees to
-    // be identical. Adding this check to prevent this assumption is broken by future development.
     REQUIRE((*auto_gen_keys_schema_tree == *user_gen_keys_schema_tree));
 
     SECTION("Test empty ID-value pairs") {