diff --git a/api-ref/src/wadls/netconn-api/src/metering-labels.wadl b/api-ref/src/wadls/netconn-api/src/metering-labels.wadl
index ab232eb4b..ab40abfd4 100644
--- a/api-ref/src/wadls/netconn-api/src/metering-labels.wadl
+++ b/api-ref/src/wadls/netconn-api/src/metering-labels.wadl
@@ -14,14 +14,6 @@
     <resources base="https://servers.api.openstack.com/"
         xml:id="metering-labels-v2.0">
         <resource id="version" path="//v2.0">
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID for the tenant or
-                            account in a multi-tenancy
-                            cloud.</para></wadl:doc>
-                </param>
             <resource id="metering_labels" path="metering-labels">
                 <method href="#listMeteringLabels"/>
                 <method href="#createMeteringLabel"/>
@@ -57,7 +49,6 @@
                     <method href="#deleteMeteringLabelRule"/>
                 </resource>
             </resource>
-            </resource>
         </resource>
     </resources>
     <method name="GET" id="listMeteringLabels">
diff --git a/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl
index 0d25e146e..67c192bb2 100644
--- a/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl
@@ -22,14 +22,6 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-layer3-ext-v2.0">
         <resource id="version" path="//v2.0">
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID for the tenant or
-                            account in a multi-tenancy
-                        cloud.</para></wadl:doc>
-                </param>
                 <resource id="Routers" type="#RouterList"
                     path="routers">
                     <method href="#createRouter"/>
@@ -77,7 +69,6 @@
                         <method href="#deleteFloatingIp"/>
                     </resource>
                 </resource>
-            </resource>
         </resource>
     </resources>
     <resource_type id="RouterList">
diff --git a/api-ref/src/wadls/netconn-api/src/os-lbaas-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-lbaas-ext.wadl
index ecf205169..688538ead 100644
--- a/api-ref/src/wadls/netconn-api/src/os-lbaas-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-lbaas-ext.wadl
@@ -22,14 +22,6 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-lbaas-v2.0">
         <resource id="version" path="//v2.0">
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID for the tenant or
-                            account in a multi-tenancy
-                        cloud.</para></wadl:doc>
-                </param>
                 <resource id="lb-vips" path="lb/vips">
                     <method href="#listVIPs"/>
                     <method href="#createVIP"/>
@@ -107,7 +99,6 @@
                         <method href="#deleteMember"/>
                     </resource>
                 </resource>
-            </resource>
         </resource>
     </resources>
 
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
index 8c51b78ba..41d2951cf 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
@@ -22,14 +22,6 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-networks-multi-provider-ext-v2.0">
         <resource id="version" path="//v2.0">
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID for the tenant or
-                            account in a multi-tenancy
-                        cloud.</para></wadl:doc>
-                </param>
                 <resource id="Networks" path="networks">
                     <method href="#listMultiNetworks"/>
                     <method href="#createMultiNetwork"/>
@@ -45,7 +37,6 @@
                         <method href="#showMultiNetwork"/>
                     </resource>
                 </resource>
-            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl
index 929e99d10..d830a1b08 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl
@@ -22,14 +22,6 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-networks-provider-ext-v2.0">
         <resource id="version" path="//v2.0">
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID for the tenant or
-                            account in a multi-tenancy
-                        cloud.</para></wadl:doc>
-                </param>
                 <resource id="Networks" path="networks">
                     <method href="#listNetworks"/>
                     <method href="#createNetwork"/>
@@ -47,7 +39,6 @@
                         <method href="#deleteNetwork"/>
                     </resource>
                 </resource>
-            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks.wadl b/api-ref/src/wadls/netconn-api/src/os-networks.wadl
index c65574f3f..f2ccc6e62 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-networks.wadl
@@ -33,14 +33,6 @@
                     <method href="#getExtension"/>
                 </resource>
             </resource>
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID for the tenant or
-                            account in a multi-tenancy
-                        cloud.</para></wadl:doc>
-                </param>
                 <resource id="Networks" type="#NetworkList"
                     path="networks">
                     <method href="#createNetwork"/>
@@ -59,7 +51,6 @@
                         <method href="#deleteNetwork"/>
                     </resource>
                 </resource>
-            </resource>
         </resource>
     </resources>
     <resource_type id="NetworkList">
diff --git a/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl
index 8d06f9f0c..f43b7670a 100644
--- a/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl
@@ -22,14 +22,6 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-ports-binding-ext-v2.0">
         <resource id="version" path="//v2.0">
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID for the tenant or
-                            account in a multi-tenancy
-                        cloud.</para></wadl:doc>
-                </param>
                 <resource id="Ports" path="ports">
                     <method href="#listPorts"/>
                     <method href="#createPort"/>
@@ -46,7 +38,6 @@
                         <method href="#updatePort"/>
                     </resource>
                 </resource>
-            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
diff --git a/api-ref/src/wadls/netconn-api/src/os-ports.wadl b/api-ref/src/wadls/netconn-api/src/os-ports.wadl
index ab5c4e2e5..55b15d77b 100644
--- a/api-ref/src/wadls/netconn-api/src/os-ports.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-ports.wadl
@@ -23,14 +23,6 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-ports-v2.0">
         <resource id="version" path="//v2.0">
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID for the tenant or
-                            account in a multi-tenancy
-                        cloud.</para></wadl:doc>
-                </param>
                 <resource id="Ports" path="ports">
                     <method href="#listPorts"/>
                     <method href="#createPort"/>
@@ -49,7 +41,6 @@
                         <method href="#removePort"/>
                     </resource>
                 </resource>
-            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
diff --git a/api-ref/src/wadls/netconn-api/src/os-quotas.wadl b/api-ref/src/wadls/netconn-api/src/os-quotas.wadl
index 449011ca9..fe8b9e0e2 100644
--- a/api-ref/src/wadls/netconn-api/src/os-quotas.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-quotas.wadl
@@ -23,21 +23,12 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-quotas-v2.0">
         <resource id="version" path="//v2.0">
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID for the tenant or
-                            account in a multi-tenancy
-                        cloud.</para></wadl:doc>
-                </param>
                 <resource id="Quotas" path="quotas">
                     <method href="#listQuotas"/>
                     <method href="#showQuota"/>
                     <method href="#updateQuota"/>
                     <method href="#resetQuota"/>
                 </resource>
-            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
diff --git a/api-ref/src/wadls/netconn-api/src/os-subnets.wadl b/api-ref/src/wadls/netconn-api/src/os-subnets.wadl
index 4572a7496..79f0d0083 100644
--- a/api-ref/src/wadls/netconn-api/src/os-subnets.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-subnets.wadl
@@ -23,13 +23,6 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-subnets-v2">
         <resource id="version" type="#VersionDetails" path="//v2.0">
-            <resource path="{tenant_id}" id="tenant_id">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://www.w3.org/1999/xhtml"
-                        xml:lang="EN" title="Tenant ID">The tenant ID
-                        in a multi-tenancy cloud.</wadl:doc>
-                </param>
                 <resource id="Subnets" type="#SubnetList"
                     path="subnets">
                     <method href="#listSubnets"/>
@@ -50,7 +43,6 @@
                         <method href="#removeSubnet"/>
                     </resource>
                 </resource>
-            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
diff --git a/api-ref/src/wadls/netconn-api/src/security-groups.wadl b/api-ref/src/wadls/netconn-api/src/security-groups.wadl
index 62da4cbe1..c2bc40c0c 100644
--- a/api-ref/src/wadls/netconn-api/src/security-groups.wadl
+++ b/api-ref/src/wadls/netconn-api/src/security-groups.wadl
@@ -14,13 +14,6 @@
     <resources base="https://servers.api.openstack.com/"
         xml:id="security-groups-v2.0">
         <resource id="version" path="//v2.0">
-            <resource path="{tenant_id}" id="tenant_id">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://www.w3.org/1999/xhtml"
-                        xml:lang="EN" title="Tenant ID">The tenant ID
-                        in a multi-tenancy cloud.</wadl:doc>
-                </param>
                 <resource id="security_groups" path="security-groups">
                     <method href="#listSecGroups"/>
                     <method href="#createSecGroup"/>
@@ -54,7 +47,6 @@
                         <method href="#deleteSecGroupRule"/>
                     </resource>
                 </resource>
-            </resource>
         </resource>
     </resources>
     <method name="GET" id="listSecGroups">