diff --git a/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfNmdaBaseServiceImpl.java b/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfNmdaBaseServiceImpl.java
index 5bf92138dc..4b84cdf73b 100755
--- a/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfNmdaBaseServiceImpl.java
+++ b/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfNmdaBaseServiceImpl.java
@@ -227,9 +227,7 @@ private NormalizedMetadata leafMetadata(YangInstanceIdentifier path, final Effec
         final Deque<ImmutableNormalizedMetadata.Builder> builders = new ArrayDeque<>(args.size());
 
         // Step one: open builders
-        for (PathArgument arg : args) {
-            builders.push(new BuilderEntry(arg, ImmutableNormalizedMetadata.builder()).builder());
-        }
+        builders.push(ImmutableNormalizedMetadata.builder());
 
         // Step two: set the top builder's metadata
         Optional.ofNullable(builders.peek())
@@ -278,11 +276,4 @@ private ChoiceNode getFilterSpecChoiceNode(final YangInstanceIdentifier filterYI
                 .withChild(subtreeFilter)
                 .build();
     }
-
-    private record BuilderEntry(PathArgument identifier, ImmutableNormalizedMetadata.Builder builder) {
-        BuilderEntry {
-            requireNonNull(identifier);
-            requireNonNull(builder);
-        }
-    }
 }