diff --git a/src/nbi/service/rest_server/nbi_plugins/ietf_hardware/YangHandler.py b/src/nbi/service/rest_server/nbi_plugins/ietf_hardware/YangHandler.py
index ca67bcea1c08c12ab0d0bfbbc58ee5698f1c37b5..4534294857e0c7972f4764927fe6d23bc656ad5f 100644
--- a/src/nbi/service/rest_server/nbi_plugins/ietf_hardware/YangHandler.py
+++ b/src/nbi/service/rest_server/nbi_plugins/ietf_hardware/YangHandler.py
@@ -68,12 +68,6 @@ class YangHandler:
         # compose device iterating through the components
  
         hardware = self._yang_context.create_data_path('/ietf-hardware:hardware')
-        network_elements = hardware.create_path('network-elements')
-            
-        network_element = network_elements.create_path('network-element[uuid="{:s}"]'.format(device.device_id.device_uuid.uuid))
-        network_element.create_path('uuid', device.device_id.device_uuid.uuid)
-        network_element.create_path('name', device.name)
-        components = network_element.create_path('components')
         physical_index = 1
         
         for component in device.components:
@@ -119,9 +113,9 @@ class YangHandler:
             component_new.create_path('mfg-name', attributes["mfg-name"])
             if attributes["id"]:
                 component_new.create_path('parent-rel-pos', attributes["id"])
-
+            
             component_new.create_path('uri', component.name)
-
+   
 
             component_new.create_path('uuid', component.component_uuid.uuid)
 
diff --git a/src/nbi/service/rest_server/nbi_plugins/ietf_hardware/__init__.py b/src/nbi/service/rest_server/nbi_plugins/ietf_hardware/__init__.py
index 84a0dceea4befef86662a042fb03b019677dbf6f..4a0cedcc4df9a198621e2585bafef1768ad1f8ca 100644
--- a/src/nbi/service/rest_server/nbi_plugins/ietf_hardware/__init__.py
+++ b/src/nbi/service/rest_server/nbi_plugins/ietf_hardware/__init__.py
@@ -18,5 +18,4 @@ from nbi.service.rest_server.RestServer import RestServer
 URL_PREFIX = "/restconf/data/device=<path:device_uuid>/ietf-hardware:hardware"
 
 def register_ietf_hardware(rest_server: RestServer):
-    rest_server.add_resource(Hardware, URL_PREFIX)
-    
\ No newline at end of file
+    rest_server.add_resource(Hardware, URL_PREFIX)
\ No newline at end of file