diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json
index cebd9bab8..78d148084 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json
@@ -4,7 +4,7 @@
         "admin_state_up": true,
         "id": "9a7aff27-fd41-4ec1-ba4c-3eb92c629313",
         "protocol_port": 80,
-        "subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2",
+        "pool_id": "a5a8839d-1ac3-41f9-9aae-f375fa4da50a",
         "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
         "weight": 1
     }
diff --git a/api-ref/src/wadls/netconn-api/src/common.ent b/api-ref/src/wadls/netconn-api/src/common.ent
index ef3eb5c53..0f5d92cff 100644
--- a/api-ref/src/wadls/netconn-api/src/common.ent
+++ b/api-ref/src/wadls/netconn-api/src/common.ent
@@ -2127,18 +2127,6 @@ router.</para>
         <para>Pool name. Does not have to be unique.</para>
     </wadl:doc>
 </param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="session_persistence" style="plain" type="xsd:dict">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The session persistence algorithm, if any, to use. This algorithm is
-          a dictionary with the <code>type</code> and <code>cookie_name</code>
-          keys.
-        </para>
-    </wadl:doc>
-</param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
     name="members" style="plain" type="xsd:list">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -2361,94 +2349,6 @@ router.</para>
         <para>A list of references to TLS secrets.</para>
     </wadl:doc>
 </param>' >
-<!ENTITY listenerRequestParams '
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="listener" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>A <code>listener</code> object.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="default_pool_id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The ID of the default pool.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="name" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The listener name.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="description" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The listener description.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The ID of the tenant who owns the listener. Only administrative users can
-          specify a tenant ID other than their own.
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="connection_limit" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The connection limit.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="protocol" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The protocol of the listener, which is TCP, HTTP, or HTTPS.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="protocol_port" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>The port.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="loadbalancer_id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>The ID of the load balancer.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="default_tls_container_ref" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>A reference to a container of TLS secrets.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="sni_container_refs" style="plain" type="xsd:list">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>A list of references to TLS secrets.</para>
-    </wadl:doc>
-</param>' >
 <!-- Metering labels and rules -->
 <!ENTITY CreateMeteringLabelRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
@@ -2748,91 +2648,6 @@ router.</para>
         </para>
     </wadl:doc>
 </param>' >
-<!ENTITY hmCreateRequestParams '
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The ID of the tenant who owns the health monitor. Only administrative users can
-          specify a tenant ID other than their own.
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="type" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The type of probe that is sent by the load balancer to verify the
-          member state. A valid value is PING, TCP, HTTP, or HTTPS.
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="delay" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The time, in seconds, between sending probes to members.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="timeout" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>Time in seconds to timeout each probe.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="max_retries" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>Maximum consecutive health probe tries.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="http_method" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The HTTP method that the monitor uses for requests.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="url_path" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The path portion of URI that is probed if the type is HTTP or HTTPS.
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="expected_codes" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The expected HTTP codes for a passing HTTP(S) monitor.
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="admin_state_up" style="plain" type="xsd:boolean">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-       xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-       <para>
-        The administrative state of the health monitor, which is up
-        (<code>true</code>) or down (<code>false</code>).
-       </para>
-    </wadl:doc>
-</param>' >
 <!ENTITY hmUpdateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
     name="delay" style="plain" type="xsd:int">
@@ -2959,76 +2774,6 @@ router.</para>
         </para>
     </wadl:doc>
 </param>'>
-<!ENTITY memberResponseParams '
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The unique ID for the member.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The ID of the tenant who owns the member. Only administrative users can
-          specify a tenant ID other than their own.
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="subnet_id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>Subnet in which to access this member.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="address" style="plain" type="xsd:ip">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The IP address of the member.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="protocol_port" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The port where the application is hosted.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="weight" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>Weight of member.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="admin_state_up" style="plain" type="xsd:boolean">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>
-          The administrative state of the member, which is up
-          (<code>true</code>) or down (<code>false</code>).
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="status" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>
-          The status of the member. Indicates whether the member is operational.
-        </para>
-    </wadl:doc>
-</param>' >
 <!ENTITY memberCreatev2RequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
     name="tenant_id" style="plain" type="csapi:uuid">
@@ -3357,101 +3102,6 @@ router.</para>
     </wadl:doc>
 </param>' >
 <!-- pools  -->
-<!ENTITY poolResponseParams '
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The unique ID for the pool.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The ID of the tenant who owns the pool. Only administrative users can
-          specify a tenant ID other than their own.
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="vip_id" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The ID of the VIP with which the pool is associated.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="name" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>Human-readable name for the pool. Does not have to be unique.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="description" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>Human-readable description for the pool.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="subnet_id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The ID of the network to which pool members belong.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="protocol" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The protocol of the pool. A valid value is TCP, HTTP, or HTTPS.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="lb_method" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-      <para>
-        The load-balancer algorithm, which is round-robin, least-connections,
-        and so on, that is used to distribute traffic to the pool members.
-        This value, which must be supported, is dependent on the load-balancer
-        provider. The round-robin algorithm must be supported.
-      </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="members" style="plain" type="xsd:list">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>List of members that belong to the pool.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="admin_state_up" style="plain" type="xsd:boolean">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>The administrative state of the pool. A valid value is true (UP) or false (DOWN).</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="status" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>The status of the pool. Indicates whether the pool is operational.</para>
-    </wadl:doc>
-</param>' >
 <!ENTITY poolUpdateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
     name="name" style="plain" type="xsd:string">
@@ -3490,110 +3140,14 @@ router.</para>
     </wadl:doc>
 </param>' >
 <!-- health monitors -->
-<!ENTITY hmResponseParams '
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The unique ID for the VIP.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The ID of the tenant who owns the VIP. Only administrative users can
-          specify a tenant ID other than their own.
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="type" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The type of probe sent by the load balancer to verify the member state. A valid value is PING, TCP, HTTP, or HTTPS.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="delay" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The time, in seconds, between sending probes to members.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="timeout" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The maximum number of seconds for a monitor to wait for a connection
-          to be established before it times out. This value must be less than
-          the delay value.
-        </para>
-    </wadl:doc>
-</param>
-&max_retriesRequestParameter;
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="http_method" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The HTTP method that the monitor uses for requests.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="url_path" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>
-          The HTTP path of the request sent by the monitor to test the health
-          of a member. Must be a string beginning with a forward slash (/).
-        </para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="expected_codes" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The list of HTTP status codes expected in response from
-        the member to declare it healthy. Valid values include: a single value,
-        such as 200, a list, such as 200, 202, or a range, such as 200-204.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="admin_state_up" style="plain" type="xsd:boolean">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>The administrative state of the health monitor. A valid
-        value is true (UP) or false (DOWN).</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="status" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>
-          The status of the health monitor. Indicates whether the health
-          monitor is operational.
-        </para>
-    </wadl:doc>
-</param>' >
 <!ENTITY hmCreateRequestParams '
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
+<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
     name="tenant_id" style="plain" type="csapi:uuid">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
         <para>
-          The ID of the tenant who owns the VIP. Only administrative users can
+          The ID of the tenant who owns the health monitor. Only administrative users can
           specify a tenant ID other than their own.
         </para>
     </wadl:doc>
@@ -3669,63 +3223,14 @@ router.</para>
         </para>
     </wadl:doc>
 </param>'>
-<!ENTITY hmUpdateRequestParams '
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="delay" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The time, in seconds, between sending probes to members.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="timeout" style="plain" type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The maximum number of seconds for a monitor to wait for a connection to be established before it times out. This value must be less than the delay value.</para>
-    </wadl:doc>
-</param>
-&max_retriesRequestParameter;
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="http_method" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The HTTP method that the monitor uses for requests.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="url_path" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The HTTP path of the request sent by the monitor to test the health of a member. Must be a string beginning with a forward slash (/).</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="expected_codes" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The list of HTTP status codes expected in response from the member to declare it healthy. A valid value is a single value such as 200, a list such as 200, 202, or a range such as 200-204.</para>
-    </wadl:doc>
-</param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="admin_state_up" style="plain" type="xsd:boolean">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-        <para>The administrative state of the health monitor. A valid value is true (UP) or false (DOWN).</para>
-    </wadl:doc>
-</param>' >
 <!--associateHealthMonitortoPool -->
 <!ENTITY hmassociatepoolRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
     name="id" style="plain" type="csapi:uuid">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The UUID for the health monitor.</para>
+         xmlns:wadl="http://wadl.dev.java.net/2009/02"
+         xml:lang="EN">
+         <para>The UUID for the health monitor.</para>
     </wadl:doc>
 </param>'>
 <!-- members -->
@@ -3765,14 +3270,6 @@ router.</para>
         <para>The IP address of the member.</para>
     </wadl:doc>
 </param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="protocol" style="plain" type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xml:lang="EN">
-        <para>The protocol of the VIP address. A valid value is TCP, HTTP, or HTTPS.</para>
-    </wadl:doc>
-</param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
     name="protocol_port" style="plain" type="xsd:int">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"