diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.json
index baf2acc06..d12c6ddb6 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.json
@@ -1,17 +1,7 @@
 {
     "subnet": {
         "network_id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
-        "dns_nameservers": [],
-        "allocation_pools": [
-            {
-                "start": "10.0.0.2",
-                "end": "10.0.0.254"
-            }
-        ],
-        "host_routes": [],
         "ip_version": 4,
-        "gateway_ip": "10.0.0.1",
-        "cidr": "10.0.0.1",
-        "id": "cd065bcb-33aa-4eb2-a15d-4fc11bb5fb11"
+        "cidr": "10.0.0.1"
     }
 }
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.xml
index a994b67f5..72b021a9d 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.xml
@@ -1,19 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<subnet xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <name>test_subnet_1</name>
+<subnet>
     <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
-    <dns_nameservers quantum:type="list"/>
-    <allocation_pools>
-        <allocation_pool>
-            <start>10.0.0.2</start>
-            <end>10.0.0.254</end>
-        </allocation_pool>
-    </allocation_pools>
-    <host_routes quantum:type="list"/>
-    <ip_version quantum:type="int">4</ip_version>
-    <gateway_ip>10.0.0.1</gateway_ip>
+    <ip_version>4</ip_version>
     <cidr>10.0.0.1</cidr>
-    <id>cd065bcb-33aa-4eb2-a15d-4fc11bb5fb11</id>
 </subnet>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.json
index 3761d3def..a01f8be91 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.json
@@ -17,4 +17,4 @@
         "cidr": "192.168.199.0/24",
         "id": "3b80198d-4f7b-4f77-9ef5-774d54e17126"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.xml
index c44a757c9..7204df804 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.xml
@@ -1,20 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<subnet xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<subnet>
     <name>test_subnet_1</name>
-    <enable_dhcp quantum:type="bool">True</enable_dhcp>
+    <enable_dhcp>True</enable_dhcp>
     <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
     <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
-    <dns_nameservers quantum:type="list"/>
+    <dns_nameservers/>
     <allocation_pools>
         <allocation_pool>
             <start>192.0.0.2</start>
             <end>192.255.255.254</end>
         </allocation_pool>
     </allocation_pools>
-    <host_routes quantum:type="list"/>
-    <ip_version quantum:type="int">4</ip_version>
+    <host_routes/>
+    <ip_version>4</ip_version>
     <gateway_ip>192.0.0.1</gateway_ip>
     <cidr>192.0.0.0/8</cidr>
     <id>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</id>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-resp.json
deleted file mode 100644
index cd7bea646..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-resp.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "port": {
-        "state": "DOWN",
-        "id": "98017ddc-efc8-4c25-a915-774b2a633855",
-        "attachment": {
-            "id": "test_interface_identifier"
-        }
-    }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-resp.xml
deleted file mode 100644
index 495105dd6..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<port id="98017ddc-efc8-4c25-a915-774b2a633855" state="DOWN">
-    <attachment id="test_interface_identifier"/>
-</port>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-resp.json
deleted file mode 100644
index 68902770c..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-resp.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "port": {
-        "state": "DOWN",
-        "id": "98017ddc-efc8-4c25-a915-774b2a633855"
-    }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-resp.xml
deleted file mode 100644
index 4e2196804..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<port id="98017ddc-efc8-4c25-a915-774b2a633855" state="DOWN"/>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.json
deleted file mode 100644
index 3b9cabb04..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "subnet": {
-        "name": "",
-        "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc",
-        "tenant_id": "c1210485b2424d48804aad5d39c61b8f",
-        "allocation_pools": [
-            {
-                "start": "10.0.3.20",
-                "end": "10.0.3.150"
-            }
-        ],
-        "gateway_ip": "10.0.3.1",
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "id": "9436e561-47bf-436a-b1f1-fe23a926e031",
-        "enable_dhcp": true
-    }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.xml
deleted file mode 100644
index c8bd357d2..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<port state="ACTIVE"/>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-resp.json
deleted file mode 100644
index 3c87a4278..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-resp.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "subnet": {
-        "allocation_pools": [
-            {
-                "end": "10.0.3.254",
-                "start": "10.0.3.2"
-            }
-        ],
-        "cidr": "10.0.3.0/24",
-        "dns_nameservers": [],
-        "enable_dhcp": true,
-        "gateway_ip": "10.0.3.1",
-        "host_routes": [],
-        "id": "91e47a57-7508-46fe-afc9-fc454e8580e1",
-        "ip_version": 4,
-        "name": "sample_subnet",
-        "network_id": "1a6f6006-9e0b-4f99-984c-96787ae66363",
-        "tenant_id": "f667b69e4d6749749ef3bcba7251d9ce"
-    }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-resp.xml
deleted file mode 100644
index f67ae20f2..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<port id="98017ddc-efc8-4c25-a915-774b2a633855"/>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.json
index 108c769ab..507e440cc 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.json
@@ -17,4 +17,4 @@
         "cidr": "192.0.0.0/8",
         "id": "54d6f61d-db07-451c-9ab3-b9609b6b6f0b"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.xml
index 1ca8acf38..7204df804 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.xml
@@ -1,20 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<subnet xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<subnet>
     <name>test_subnet_1</name>
-    <enable_dhcp quantum:type="bool">True</enable_dhcp>
+    <enable_dhcp>True</enable_dhcp>
     <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
     <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
-    <dns_nameservers quantum:type="list"/>
+    <dns_nameservers/>
     <allocation_pools>
         <allocation_pool>
             <start>192.0.0.2</start>
             <end>192.255.255.254</end>
         </allocation_pool>
     </allocation_pools>
-    <host_routes quantum:type="list"/>
-    <ip_version quantum:type="long">4</ip_version>
+    <host_routes/>
+    <ip_version>4</ip_version>
     <gateway_ip>192.0.0.1</gateway_ip>
     <cidr>192.0.0.0/8</cidr>
     <id>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</id>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.json
index 211e9ca63..0481b471b 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.json
@@ -2,4 +2,4 @@
     "subnet": {
         "name": "my_subnet"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.json
index 371837e23..0364c5219 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.json
@@ -1,6 +1,6 @@
 {
     "subnet": {
-        "name": "private-subnet",
+        "name": "my_subnet",
         "enable_dhcp": true,
         "network_id": "db193ab3-96e3-4cb3-8fc5-05f4296d0324",
         "tenant_id": "26a7980765d0414dbc1fc1f88cdb7e6e",
@@ -17,4 +17,4 @@
         "cidr": "10.0.0.0/24",
         "id": "08eae331-0402-425a-923c-34f7cfe39c1b"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.xml
index 067c5975a..1575b85d1 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.xml
@@ -1,20 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<subnet xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<subnet>
     <name>my_subnet</name>
-    <enable_dhcp quantum:type="bool">True</enable_dhcp>
+    <enable_dhcp>True</enable_dhcp>
     <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
     <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
-    <dns_nameservers quantum:type="list"/>
+    <dns_nameservers/>
     <allocation_pools>
         <allocation_pool>
             <start>192.0.0.2</start>
             <end>192.255.255.254</end>
         </allocation_pool>
     </allocation_pools>
-    <host_routes quantum:type="list"/>
-    <ip_version quantum:type="long">4</ip_version>
+    <host_routes/>
+    <ip_version>4</ip_version>
     <gateway_ip>192.0.0.1</gateway_ip>
     <cidr>192.0.0.0/8</cidr>
     <id>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</id>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.json
index 99d08221e..f9f7ea91c 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.json
@@ -37,4 +37,4 @@
             "tenant_id": "d19231fc08ec4bc4829b668040d34512"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.xml
index a486adec3..b00267fcf 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.xml
@@ -1,39 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<subnets xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<subnets>
     <subnet>
         <name>test_subnet_1</name>
-        <enable_dhcp quantum:type="bool">True</enable_dhcp>
+        <enable_dhcp>True</enable_dhcp>
         <network_id>a3775a7d-9f8b-4148-be81-c84bbd0837ce</network_id>
         <tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
-        <dns_nameservers quantum:type="list"/>
+        <dns_nameservers/>
         <allocation_pools>
             <allocation_pool>
                 <start>10.0.0.2</start>
                 <end>10.255.255.254</end>
             </allocation_pool>
         </allocation_pools>
-        <host_routes quantum:type="list"/>
-        <ip_version quantum:type="int">4</ip_version>
+        <host_routes/>
+        <ip_version>4</ip_version>
         <gateway_ip>10.0.0.1</gateway_ip>
         <cidr>10.0.0.0/8</cidr>
         <id>bd3fd365-fe19-431a-be63-07017a09316c</id>
     </subnet>
     <subnet>
         <name>test_subnet_2</name>
-        <enable_dhcp quantum:type="bool">True</enable_dhcp>
+        <enable_dhcp>True</enable_dhcp>
         <network_id>a3775a7d-9f8b-4148-be81-c84bbd0837ce</network_id>
         <tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
-        <dns_nameservers quantum:type="list"/>
+        <dns_nameservers/>
         <allocation_pools>
             <allocation_pool>
                 <start>192.168.0.2</start>
                 <end>192.168.255.254</end>
             </allocation_pool>
         </allocation_pools>
-        <host_routes quantum:type="list"/>
-        <ip_version quantum:type="int">4</ip_version>
+        <host_routes/>
+        <ip_version>4</ip_version>
         <gateway_ip>192.168.0.1</gateway_ip>
         <cidr>192.168.0.0/16</cidr>
         <id>86e7c838-fb75-402b-9dbf-d68166e3f5fe</id>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-resp.json
deleted file mode 100644
index d62874637..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-resp.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "subnet": {
-        "name": "",
-        "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc",
-        "tenant_id": "c1210485b2424d48804aad5d39c61b8f",
-        "allocation_pools": [
-            {
-                "start": "10.10.0.2",
-                "end": "10.10.0.254"
-            }
-        ],
-        "gateway_ip": "10.10.0.1",
-        "ip_version": 4,
-        "cidr": "10.10.0.0/24",
-        "id": "4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861",
-        "enable_dhcp": false
-    }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-resp.xml
deleted file mode 100644
index e0c5d6e17..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ports>
-    <port id="98017ddc-efc8-4c25-a915-774b2a633855" state="ACTIVE"/>
-    <port id="b832be00-6553-4f69-af33-acd554e36d08" state="ACTIVE"/>
-</ports>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.json
index 9c5af9960..2c5ba82ab 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.json
@@ -37,4 +37,4 @@
             "id": "54d6f61d-db07-451c-9ab3-b9609b6b6f0b"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.xml
index af5a089c8..a97d48798 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.xml
@@ -1,39 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<subnets xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<subnets>
     <subnet>
         <name>private-subnet</name>
-        <enable_dhcp quantum:type="bool">True</enable_dhcp>
+        <enable_dhcp>True</enable_dhcp>
         <network_id>db193ab3-96e3-4cb3-8fc5-05f4296d0324</network_id>
         <tenant_id>26a7980765d0414dbc1fc1f88cdb7e6e</tenant_id>
-        <dns_nameservers quantum:type="list"/>
+        <dns_nameservers/>
         <allocation_pools>
             <allocation_pool>
                 <start>10.0.0.2</start>
                 <end>10.0.0.254</end>
             </allocation_pool>
         </allocation_pools>
-        <host_routes quantum:type="list"/>
-        <ip_version quantum:type="long">4</ip_version>
+        <host_routes/>
+        <ip_version>4</ip_version>
         <gateway_ip>10.0.0.1</gateway_ip>
         <cidr>10.0.0.0/24</cidr>
         <id>08eae331-0402-425a-923c-34f7cfe39c1b</id>
     </subnet>
     <subnet>
         <name>my_subnet</name>
-        <enable_dhcp quantum:type="bool">True</enable_dhcp>
+        <enable_dhcp>True</enable_dhcp>
         <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
         <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
-        <dns_nameservers quantum:type="list"/>
+        <dns_nameservers/>
         <allocation_pools>
             <allocation_pool>
                 <start>192.0.0.2</start>
                 <end>192.255.255.254</end>
             </allocation_pool>
         </allocation_pools>
-        <host_routes quantum:type="list"/>
-        <ip_version quantum:type="long">4</ip_version>
+        <host_routes/>
+        <ip_version>4</ip_version>
         <gateway_ip>192.0.0.1</gateway_ip>
         <cidr>192.0.0.0/8</cidr>
         <id>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</id>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.json
index d34bb607a..0bb8460b6 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.json
@@ -11,4 +11,4 @@
             "network_id": "64239a54-dcc4-4b39-920b-b37c2144effa"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets_get_resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/subnets_get_resp.json
deleted file mode 100644
index 11696e624..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets_get_resp.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "subnets": [
-        {
-            "name": "",
-            "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc",
-            "tenant_id": "c1210485b2424d48804aad5d39c61b8f",
-            "allocation_pools": [
-                {
-                    "start": "10.10.0.2",
-                    "end": "10.10.0.254"
-                }
-            ],
-            "gateway_ip": "10.10.0.1",
-            "ip_version": 4,
-            "cidr": "10.10.0.0/24",
-            "id": "4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861",
-            "enable_dhcp": true
-        },
-        {
-            "name": "",
-            "network_id": "afc75773-640e-403c-9fff-62ba98db1f19",
-            "tenant_id": "ed680f49ff714162ab3612d7876ffce5",
-            "allocation_pools": [
-                {
-                    "start": "10.0.0.2",
-                    "end": "10.0.0.254"
-                }
-            ],
-            "gateway_ip": "10.0.0.1",
-            "ip_version": 4,
-            "cidr": "10.0.0.0/24",
-            "id": "e12f0c45-46e3-446a-b207-9474b27687a6",
-            "enable_dhcp": true
-        }
-    ]
-}
\ No newline at end of file