diff --git a/docs/guide/src/docbkx/idmdevguide.xml b/docs/guide/src/docbkx/idmdevguide.xml
index 406bbf2c20..294439ce83 100644
--- a/docs/guide/src/docbkx/idmdevguide.xml
+++ b/docs/guide/src/docbkx/idmdevguide.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book [<!-- Some useful entities borrowed from HTML -->
-    <!ENTITY ndash  "–">
-    <!ENTITY mdash  "—">
-    <!ENTITY hellip "…">
+    <!ENTITY ndash  "&#x2013;">
+    <!ENTITY mdash  "&#x2014;">
+    <!ENTITY hellip "&#x2026;">
 
     <!-- Useful for describing APIs -->
     <!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
@@ -60,37 +60,44 @@
     </copyright>
     <releaseinfo>API v1.0</releaseinfo>
     <productname>Cloud Identity</productname>
-    <pubdate>2011-04-11</pubdate>
+    <pubdate>2011-04-14</pubdate>
     <legalnotice role="apache2">
         <annotation>
             <remark>Copyright details are filled in by the template.</remark>
         </annotation>
     </legalnotice>
     <abstract>
-      <para> This document is intended for software developers interested in developing applications
-        which utilizes Organization Identity Management System as the authentication engine. It includes
-        details on how to integrate with IdM. </para>
+      <para>
+          This document is intended for software developers interested
+          in developing applications which utilize the Cloud Identity
+          Service for authentication. This document also includes
+          details on how to integrate services with the Cloud Identity
+          Service.
+      </para>
     </abstract>
   </info>
   <chapter>
     <title>Overview</title>
-    <para>The IdM Service allows Rackspace Applications to obtain tokens that can be used to access
-      resources in the Rackspace Cloud. This document is intended for: </para>
-    <variablelist>
-      <varlistentry>
-        <term>Service Developers</term>
-        <listitem>
-          <para> Service developers are interested in writing client for Rackspace IdM service.
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    <para> This Guide assumes the reader is familiar with RESTful web services, HTTP/1.1, and JSON
-      and/or XML serialization formats. </para>
+    <para>
+        The Cloud Identity Service allows applications to obtain
+        tokens that can be used to access OpenStack resources.  This
+        document is intended for software developers interested in
+        developing applications which utilize the Cloud Identity
+        Service for authentication. This document also includes
+        details on how to integrate services with the Cloud Identity
+        Service.
+    </para>
+    <para>
+        This Guide assumes the reader is familiar with RESTful web
+        services, HTTP/1.1, and JSON and/or XML serialization formats.
+    </para>
   </chapter>
   <chapter>
     <title>Concepts</title>
-    <para> The IdM system has several key concepts that are important to understand: </para>
+    <para>
+        The Cloud Identity Service has several key concepts that are
+        important to understand:
+    </para>
     <section>
       <title>Token</title>
       <para>
@@ -104,30 +111,20 @@
       <title>Tenant</title>
       <para>
           Depending on the operator, a tenant may map to a customer,
-          account, organization, or project. Users are always placed
-          under a tenant.
+          account, organization, or project.
       </para>
     </section>
     <section>
       <title>User</title>
       <para>
-          Individuals under a tenant.  Users have a login and may be
-          assigned tokens to access resources.
+          Users have a login and may be assigned tokens to access
+          resources.
       </para>
     </section>
     <section>
-        <title>Tenant Group</title>
+        <title>Group</title>
         <para>
-            A group of users under a tenant. Tenant groups are managed
-            by tenants. They are used to organize and assign
-            privileges to group of related users. For example a tenant
-            may add administrator privileges to users in the "admin" group.
-        </para>
-    </section>
-    <section>
-        <title>Global Group</title>
-        <para>
-            A global group of users. Global groups are managed by
+            A group of users. Global groups are managed by
             operators. They are used to organize and assign privileges
             to a group of related users. For example, an operator may
             create a "delinquent" group, which will assign limited
@@ -754,7 +751,7 @@ Host: idm.api.openstack.org/v1.1/
             <tr>
               <td colspan="1"> &POST; </td>
               <td colspan="1">/token</td>
-              <td colspan="4">Authenticate to generate a token and a service catalog.</td>
+              <td colspan="4">Authenticate to generate a token.</td>
             </tr>
           </tbody>
         </informaltable>
@@ -869,25 +866,25 @@ Host: idm.api.openstack.org/v1.1/
       <example>
         <title>XML Tenant Create Request</title>
         <programlisting language="xml">
-<xi:include href="samples/customer.xml" parse="text"/>
+<xi:include href="samples/tenant.xml" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>JSON Tenant Create Request</title>
         <programlisting language="javascript">
-<xi:include href="samples/customer.json" parse="text"/>
+<xi:include href="samples/tenant.json" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>XML Tenant Create Response</title>
         <programlisting language="xml">
-<xi:include href="samples/customer.xml" parse="text"/>
+<xi:include href="samples/tenant.xml" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>JSON Tenant Create Response</title>
         <programlisting language="javascript">
-<xi:include href="samples/customer.json" parse="text"/>
+<xi:include href="samples/tenant.json" parse="text"/>
 </programlisting>
       </example>
        </section>
@@ -917,13 +914,13 @@ Host: idm.api.openstack.org/v1.1/
         <example>
           <title>XML Tenants Response</title>
           <programlisting language="xml">
-<xi:include href="samples/customers.xml" parse="text"/>
+<xi:include href="samples/tenants.xml" parse="text"/>
 </programlisting>
         </example>
         <example>
           <title>JSON Tenants Response</title>
           <programlisting language="javascript">
-<xi:include href="samples/customers.json" parse="text"/>
+<xi:include href="samples/tenants.json" parse="text"/>
 </programlisting>
         </example>
       </section>
@@ -948,13 +945,13 @@ Host: idm.api.openstack.org/v1.1/
         <example>
           <title>XML Tenant Response</title>
           <programlisting language="xml">
-<xi:include href="samples/customer.xml" parse="text"/>
+<xi:include href="samples/tenant.xml" parse="text"/>
 </programlisting>
         </example>
         <example>
           <title>JSON Tenant Response</title>
           <programlisting language="javascript">
-<xi:include href="samples/customer.json" parse="text"/>
+<xi:include href="samples/tenant.json" parse="text"/>
 </programlisting>
         </example>
       </section>
@@ -978,25 +975,25 @@ Host: idm.api.openstack.org/v1.1/
       <example>
         <title>XML Tenant Update Request</title>
         <programlisting language="xml">
-<xi:include href="samples/customerlock.xml" parse="text"/>
+<xi:include href="samples/tenantlock.xml" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>JSON Tenant Update Request</title>
         <programlisting language="javascript">
-<xi:include href="samples/customerlock.json" parse="text"/>
+<xi:include href="samples/tenantlock.json" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>XML Tenant Update Response</title>
         <programlisting language="xml">
-<xi:include href="samples/updatedcustomer.xml" parse="text"/>
+<xi:include href="samples/updatedtenant.xml" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>JSON Tenant Update Response</title>
         <programlisting language="javascript">
-<xi:include href="samples/updatedcustomer.json" parse="text"/>
+<xi:include href="samples/updatedtenant.json" parse="text"/>
 </programlisting>
       </example>
        </section>     
@@ -1020,834 +1017,5 @@ Host: idm.api.openstack.org/v1.1/
             &NO_REQUEST;       
         </section>
     </section>
-    <section>
-      <title>User Operations</title>
-      <section>
-        <title>Create a User</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1"> &POST; </td>
-              <td colspan="4">/tenants/<parameter>tenantId</parameter>/users</td>
-              <td colspan="3">Create a new user. If a blank password is passed in, the API generates
-                a random password for the user.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>The Id attribute and Password element are required in this request. If a
-          blank password is passed in the Password element, the API will generate a random password
-          for the user.</simpara>
-        <simpara>&CODES;<returnvalue>201</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-            (<errorcode>400</errorcode>), passwordValidation(<errorcode>400</errorcode>), forbidden
-            (<errorcode>403</errorcode>), itemNotFound (<errorcode>404</errorcode>),
-            usernameConflict(<errorcode>409</errorcode>), emailConflict(<errorcode>409</errorcode>),
-          idmFault (<errorcode>500</errorcode>),
-          serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-        <example>
-          <title>XML User Request</title>
-          <programlisting language="xml">
-<xi:include href="samples/adduser.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON User Request</title>
-          <programlisting language="javascript">
-<xi:include href="samples/adduser.json" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>XML User Response</title>
-          <programlisting language="xml">
-<xi:include href="samples/adduserresponse.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON User Response</title>
-          <programlisting language="javascript">
-<xi:include href="samples/addeduser.json" parse="text"/>
-</programlisting>
-        </example>
-      </section>
-      <section>
-        <title>Get a User</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1"> &GET; </td>
-              <td colspan="4"
-                  >/tenants/<parameter>tenantId</parameter>/users/<parameter>userId</parameter></td>
-              <td colspan="3">Get a user. </td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-            (<errorcode>400</errorcode>), forbidden (<errorcode>403</errorcode>), itemNotFound
-            (<errorcode>404</errorcode>), idmFault (<errorcode>500</errorcode>),
-            serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-        &NO_REQUEST;
-        <example>
-          <title>XML User Response</title>
-          <programlisting language="xml">
-<xi:include href="samples/getuser.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON User Response</title>
-          <programlisting language="javascript">
-<xi:include href="samples/getuser.json" parse="text"/>
-</programlisting>
-        </example>
-      </section>
-      <section>
-        <title>Update a User</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1"> &PUT; </td>
-              <td colspan="4"
-                  >/tenants/<parameter>tenantId</parameter>/users/<parameter>userId</parameter></td>
-              <td colspan="3">Update a user. </td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-            (<errorcode>400</errorcode>), forbidden(<errorcode>403</errorcode>), itemNotFound
-            (<errorcode>404</errorcode>), emailConflict (409), idmFault
-          (<errorcode>500</errorcode>), serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-        <example>
-          <title>XML User Request</title>
-          <programlisting language="xml">
-<xi:include href="samples/updateuser.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON User Request</title>
-          <programlisting language="javascript">
-<xi:include href="samples/updateuser.json" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>XML User Response</title>
-          <programlisting language="xml">
-<xi:include href="samples/updateduser.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON User Response</title>
-          <programlisting language="javascript">
-<xi:include href="samples/updateduser.json" parse="text"/>
-</programlisting>
-        </example>
-      </section>
-      <section>
-        <title>Delete User</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1">&DELETE; </td>
-              <td colspan="4"
-                  >/tenants/<parameter>tenantId</parameter>/users/<parameter>userId</parameter></td>
-              <td colspan="3">Delete a user. </td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>204</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-            (<errorcode>400</errorcode>), forbidden(<errorcode>403</errorcode>), itemNotFound
-            (<errorcode>404</errorcode>), idmFault (<errorcode>500</errorcode>),
-            serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-        &NO_REQUEST;
-      </section>
-      <section>
-        <title>Get Users</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1"> &GET; </td>
-              <td colspan="4"
-                  >/tenants/<parameter>tenantId</parameter>/users</td>
-              <td colspan="3"> Gets a list of users.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized
-        (<errorcode>401</errorcode>), badRequest
-        (<errorcode>400</errorcode>), forbidden
-        (<errorcode>403</errorcode>), overLimit
-        (<errorcode>413</errorcode>), itemNotFound
-        (<errorcode>404</errorcode>), idmFault
-        (<errorcode>500</errorcode>), serviceUnavailable
-        (<errorcode>503</errorcode>)</simpara>
-        &NO_REQUEST;
-        <example>
-          <title>XML User List Response</title>
-          <programlisting language="xml">
-<xi:include href="samples/users.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON User List Response</title>
-          <programlisting language="javascript">
-<xi:include href="samples/users.json" parse="text"/>
-</programlisting>
-        </example>
-      </section>
-      <section>
-        <title>Set a User's Password</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1">&PUT;</td>
-              <td colspan="4"
-                  >/tenants/<parameter>tenantId</parameter>/users/<parameter>userId</parameter>/password</td>
-              <td colspan="3">Set a user's password. </td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-            (<errorcode>400</errorcode>), forbidden(<errorcode>403</errorcode>), itemNotFound
-            (<errorcode>404</errorcode>), idmFault (<errorcode>500</errorcode>),
-            serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-        <example>
-          <title>XML Set User Password Reqeust</title>
-          <programlisting language="xml">
-<xi:include href="samples/user_api_key.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON Set User Password Request</title>
-          <programlisting language="javascript">
-<xi:include href="samples/user_api_key.json" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>XML Set User Password Response</title>
-          <programlisting language="xml">
-<xi:include href="samples/user_api_key.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON Set User Password Response</title>
-          <programlisting language="javascript">
-<xi:include href="samples/user_api_key.json" parse="text"/>
-</programlisting>
-        </example>
-      </section>
-      <section>
-        <title>Enable / Disable a User</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1"> &PUT; </td>
-              <td colspan="4"
-                  >/tenants/<parameter>tenantId</parameter>/users/<parameter>userId</parameter>/enabled</td>
-              <td colspan="3"> Set a user's lock</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-            (<errorcode>400</errorcode>), forbidden(<errorcode>403</errorcode>), itemNotFound
-            (<errorcode>404</errorcode>), idmFault (<errorcode>500</errorcode>),
-            serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-        <example>
-          <title>XML User Enable Request</title>
-          <programlisting language="xml">
-<xi:include href="samples/userWithOnlyLock.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON User Enable Request</title>
-          <programlisting language="javascript">
-<xi:include href="samples/userWithOnlyLock.json" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>XML User Enable Response</title>
-          <programlisting language="xml">
-<xi:include href="samples/userWithOnlyLock.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON User Enable Response</title>
-          <programlisting language="javascript">
-<xi:include href="samples/userWithOnlyLock.json" parse="text"/>
-</programlisting>
-        </example>
-      </section>
-      <section>
-          <title>Get Groups for a User</title>
-          <informaltable rules="all">
-              &LONG_URI_REFHEAD;
-              <tbody>
-                  <tr>
-                      <td colspan="1"> &GET; </td>
-                      <td colspan="4">/tenants/<parameter>tenantId</parameter>/users/<parameter>userId</parameter>/groups</td>
-              <td colspan="3">Get groups for a user.</td>
-                  </tr>
-              </tbody>
-          </informaltable>
-          <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
-          <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-          (<errorcode>400</errorcode>), forbidden (<errorcode>403</errorcode>), itemNotFound
-          (<errorcode>404</errorcode>), idmFault (<errorcode>500</errorcode>),
-          serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-          &NO_REQUEST;
-          <example>
-              <title>XML User Response</title>
-              <programlisting language="xml">
-<xi:include href="samples/userGroups.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON User Response</title>
-          <programlisting language="javascript">
-<xi:include href="samples/userGroups.json" parse="text"/>
-</programlisting>
-        </example>
-      </section>
-  </section>
-    <section>
-        <title>Tenant Groups</title>
-        <section>
-            <title>Create Tenant Group</title>
-            <informaltable rules="all">
-                &LONG_URI_REFHEAD;
-                <tbody>
-                    <tr>
-                        <td colspan="1">&POST;</td>
-                        <td colspan="4"
-                            >/tenant/<parameter>tenantId</parameter>/groups</td>
-                        <td colspan="3">Creates a tenant group.</td>
-                    </tr>
-                </tbody>
-            </informaltable>
-            <simpara>&CODES;<returnvalue>201</returnvalue></simpara>
-            <simpara>
-                &ERROR_CODES;
-                unauthorized (<errorcode>401</errorcode>), forbidden
-                (<returnvalue>403</returnvalue>), userDisabled(<returnvalue>403</returnvalue>),
-                badRequest (<errorcode>400</errorcode>), groupConflict(<returnvalue>409</returnvalue>),
-                idmFault(<returnvalue>500</returnvalue>),
-                serviceUnavailable(<returnvalue>503</returnvalue>)
-            </simpara>
-            <example>
-                <title>XML Tenant Group Create Request</title>
-                <programlisting language="xml">
-<xi:include href="samples/group-create.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Tenant Group Create Request</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group-create.json" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>XML Tenant Group Create Response</title>
-                <programlisting language="xml">
-<xi:include href="samples/group.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Tenant Group Create Response</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group.json" parse="text"/>
-                </programlisting>
-            </example>
-        </section>
-        <section>
-            <title>Get Tenant Groups</title>
-            <informaltable rules="all">
-                &LONG_URI_REFHEAD;
-                <tbody>
-                    <tr>
-                        <td colspan="1">&GET;</td>
-                        <td colspan="4"
-                            >/tenant/<parameter>tenantId</parameter>/groups</td>
-                        <td colspan="3">Get a list of tenant groups.</td>
-                    </tr>
-                </tbody>
-            </informaltable>
-            <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
-            <simpara>
-                &ERROR_CODES;
-                unauthorized (<errorcode>401</errorcode>), forbidden
-                (<returnvalue>403</returnvalue>), overLimit
-                (<returnvalue>413</returnvalue>), userDisabled
-                (<returnvalue>403</returnvalue>), badRequest
-                (<errorcode>400</errorcode>), idmFault
-                (<returnvalue>500</returnvalue>), serviceUnavailable
-                (<returnvalue>503</returnvalue>)
-            </simpara>
-            &NO_REQUEST;
-            <example>
-                <title>XML Tenant Groups Response</title>
-                <programlisting language="xml">
-<xi:include href="samples/groups.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Tenant Groups Response</title>
-                <programlisting language="javascript">
-<xi:include href="samples/groups.json" parse="text"/>
-                </programlisting>
-            </example>
-        </section>
-        <section>
-            <title>Get a Tenant Group</title>
-            <informaltable rules="all">
-                &LONG_URI_REFHEAD;
-                <tbody>
-                    <tr>
-                        <td colspan="1">&GET;</td>
-                        <td colspan="4"
-                            >/tenant/<parameter>tenantId</parameter>/groups/<parameter>groupId</parameter></td>
-                        <td colspan="3">Get a tenant group.</td>
-                    </tr>
-                </tbody>
-            </informaltable>
-            <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
-            <simpara>
-                &ERROR_CODES;
-                unauthorized (<errorcode>401</errorcode>), forbidden
-                (<returnvalue>403</returnvalue>), userDisabled(<returnvalue>403</returnvalue>),
-                badRequest (<errorcode>400</errorcode>), itemNotFound(<errorcode>404</errorcode>),
-                idmFault(<returnvalue>500</returnvalue>),
-                serviceUnavailable(<returnvalue>503</returnvalue>)
-            </simpara>
-            &NO_REQUEST;
-            <example>
-                <title>XML Tenant Group Response</title>
-                <programlisting language="xml">
-<xi:include href="samples/group.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Tenant Groups Response</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group.json" parse="text"/>
-                </programlisting>
-            </example>
-        </section>
-      <section>
-        <title>Update a Tenant Group</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1">&PUT;</td>
-              <td colspan="4">/tenant/<parameter>tenantId</parameter>/groups/<parameter>groupId</parameter></td>
-              <td colspan="3">Update a tenant group.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>),
-            forbidden(<errorcode>403</errorcode>), itemNotFound(<errorcode>404</errorcode>),
-          badRequest (<errorcode>400</errorcode>), idmFault (<errorcode>500</errorcode>),
-            serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-            <example>
-                <title>XML Tenant Group Update Request</title>
-                <programlisting language="xml">
-<xi:include href="samples/group-updated.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Tenant Group Update Request</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group-updated.json" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>XML Tenant Group Update Response</title>
-                <programlisting language="xml">
-<xi:include href="samples/group-updated.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Tenant Group Update Response</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group-updated.json" parse="text"/>
-                </programlisting>
-            </example>
-      </section>
-      <section>
-          <title>Delete a Tenant Group</title>
-          <informaltable rules="all">
-            &LONG_URI_REFHEAD;
-            <tbody>
-              <tr>
-                <td colspan="1">&DELETE;</td>
-                <td colspan="4">/tenant/<parameter>tenantId</parameter>/groups/<parameter>groupId</parameter></td>
-                <td colspan="3">Delete a tenant group.</td>
-              </tr>
-            </tbody>
-          </informaltable>
-          <simpara>&CODES;<returnvalue>204</returnvalue></simpara>
-          <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-            (<errorcode>400</errorcode>), forbidden (<errorcode>403</errorcode>), itemNotFound
-            (<errorcode>404</errorcode>), idmFault (<errorcode>500</errorcode>),
-            serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-            &NO_REQUEST;
-      </section>
-      <section>
-        <title>Get Users in Tenant Group</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1"> &GET; </td>
-              <td colspan="4"
-                  >/tenants/<parameter>tenantId</parameter>/groups/<parameter>groupId</parameter>/users</td>
-              <td colspan="3"> Gets a list of users in a tenant group.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized
-        (<errorcode>401</errorcode>), badRequest
-        (<errorcode>400</errorcode>), forbidden
-        (<errorcode>403</errorcode>), overLimit
-        (<errorcode>413</errorcode>), itemNotFound
-        (<errorcode>404</errorcode>), idmFault
-        (<errorcode>500</errorcode>), serviceUnavailable
-        (<errorcode>503</errorcode>)</simpara>
-        &NO_REQUEST;
-        <example>
-          <title>XML Tenant Group User List Response</title>
-          <programlisting language="xml">
-<xi:include href="samples/users.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON Tenant Group User List Response</title>
-          <programlisting language="javascript">
-<xi:include href="samples/users.json" parse="text"/>
-</programlisting>
-        </example>
-      </section>
-      <section>
-        <title>Add a User to a Tenant Group</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1">&PUT;</td>
-              <td colspan="4">/tenants/<parameter>tenantId</parameter>/groups/<parameter>groupId</parameter>/users</td>
-              <td colspan="3">Add a user to a tenant group.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized
-        (<errorcode>401</errorcode>), badRequest
-        (<errorcode>400</errorcode>), forbidden
-        (<errorcode>403</errorcode>), itemNotFound
-        (<errorcode>404</errorcode>), usernameConflict
-        (<errorcode>409</errorcode>), emailConflict
-        (<errorcode>409</errorcode>), idmFault
-        (<errorcode>500</errorcode>), serviceUnavailable
-        (<errorcode>503</errorcode>)</simpara>
-          &NO_REQUEST;
-      </section>
-      <section>
-        <title>Remove a User from a Tenant Group</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1">&DELETE;</td>
-              <td colspan="4">/tenants/<parameter>tenantId</parameter>/groups/<parameter>groupId</parameter>/users</td>
-              <td colspan="3">Remove a user from a tenant group.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>204</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized
-        (<errorcode>401</errorcode>), badRequest
-        (<errorcode>400</errorcode>), forbidden
-        (<errorcode>403</errorcode>), itemNotFound
-        (<errorcode>404</errorcode>), usernameConflict
-        (<errorcode>409</errorcode>), emailConflict
-        (<errorcode>409</errorcode>), idmFault
-        (<errorcode>500</errorcode>), serviceUnavailable
-        (<errorcode>503</errorcode>)</simpara>
-          &NO_REQUEST;
-      </section>
-    </section>
-    <section>
-        <title>Global Groups</title>
-        <section>
-            <title>Create a Group</title>
-            <informaltable rules="all">
-                &LONG_URI_REFHEAD;
-                <tbody>
-                    <tr>
-                        <td colspan="1">&POST;</td>
-                        <td colspan="4">/groups</td>
-                        <td colspan="3">Creates a group.</td>
-                    </tr>
-                </tbody>
-            </informaltable>
-            <simpara>&CODES;<returnvalue>201</returnvalue></simpara>
-            <simpara>
-                &ERROR_CODES;
-                unauthorized (<errorcode>401</errorcode>), forbidden
-                (<returnvalue>403</returnvalue>), userDisabled(<returnvalue>403</returnvalue>),
-                badRequest (<errorcode>400</errorcode>), groupConflict(<returnvalue>409</returnvalue>),
-                idmFault(<returnvalue>500</returnvalue>),
-                serviceUnavailable(<returnvalue>503</returnvalue>)
-            </simpara>
-            <example>
-                <title>XML Group Create Request</title>
-                <programlisting language="xml">
-<xi:include href="samples/group-create.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Group Create Request</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group-create.json" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>XML Group Create Response</title>
-                <programlisting language="xml">
-<xi:include href="samples/group-create.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Group Create Response</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group-create.json" parse="text"/>
-                </programlisting>
-            </example>
-        </section>
-        <section>
-            <title>Get Groups</title>
-            <informaltable rules="all">
-                &LONG_URI_REFHEAD;
-                <tbody>
-                    <tr>
-                        <td colspan="1">&GET;</td>
-                        <td colspan="4">/groups</td>
-                        <td colspan="3">Get a list of groups.</td>
-                    </tr>
-                </tbody>
-            </informaltable>
-            <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
-            <simpara>
-                &ERROR_CODES;
-                unauthorized (<errorcode>401</errorcode>), forbidden
-                (<returnvalue>403</returnvalue>), overLimit
-                (<returnvalue>413</returnvalue>), userDisabled
-                (<returnvalue>403</returnvalue>), badRequest
-                (<errorcode>400</errorcode>), idmFault
-                (<returnvalue>500</returnvalue>), serviceUnavailable
-                (<returnvalue>503</returnvalue>)
-            </simpara>
-            &NO_REQUEST;
-            <example>
-                <title>XML Groups Response</title>
-                <programlisting language="xml">
-<xi:include href="samples/groups-nt.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Groups Response</title>
-                <programlisting language="javascript">
-<xi:include href="samples/groups-nt.json" parse="text"/>
-                </programlisting>
-            </example>
-        </section>
-        <section>
-            <title>Get a Group</title>
-            <informaltable rules="all">
-                &LONG_URI_REFHEAD;
-                <tbody>
-                    <tr>
-                        <td colspan="1">&GET;</td>
-                        <td colspan="4">/groups/<parameter>groupId</parameter></td>
-                        <td colspan="3">Get a group.</td>
-                    </tr>
-                </tbody>
-            </informaltable>
-            <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
-            <simpara>
-                &ERROR_CODES;
-                unauthorized (<errorcode>401</errorcode>), forbidden
-                (<returnvalue>403</returnvalue>), userDisabled(<returnvalue>403</returnvalue>),
-                badRequest (<errorcode>400</errorcode>), itemNotFound(<errorcode>404</errorcode>),
-                idmFault(<returnvalue>500</returnvalue>),
-                serviceUnavailable(<returnvalue>503</returnvalue>)
-            </simpara>
-            &NO_REQUEST;
-            <example>
-                <title>XML Group Response</title>
-                <programlisting language="xml">
-<xi:include href="samples/group-create.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Groups Response</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group-create.json" parse="text"/>
-                </programlisting>
-            </example>
-        </section>
-      <section>
-        <title>Update a Group</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1">&PUT;</td>
-              <td colspan="4">/groups/<parameter>groupId</parameter></td>
-              <td colspan="3">Update a group.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>),
-            forbidden(<errorcode>403</errorcode>), itemNotFound(<errorcode>404</errorcode>),
-          badRequest (<errorcode>400</errorcode>), idmFault (<errorcode>500</errorcode>),
-            serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-            <example>
-                <title>XML Group Update Request</title>
-                <programlisting language="xml">
-<xi:include href="samples/group-updated-nt.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Group Update Request</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group-updated-nt.json" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>XML Group Update Response</title>
-                <programlisting language="xml">
-<xi:include href="samples/group-updated-nt.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>JSON Group Update Response</title>
-                <programlisting language="javascript">
-<xi:include href="samples/group-updated-nt.json" parse="text"/>
-                </programlisting>
-            </example>
-      </section>
-      <section>
-          <title>Delete a Group</title>
-          <informaltable rules="all">
-            &LONG_URI_REFHEAD;
-            <tbody>
-              <tr>
-                <td colspan="1">&DELETE;</td>
-                <td colspan="4">/groups/<parameter>groupId</parameter></td>
-                <td colspan="3">Delete a group.</td>
-              </tr>
-            </tbody>
-          </informaltable>
-          <simpara>&CODES;<returnvalue>204</returnvalue></simpara>
-          <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-            (<errorcode>400</errorcode>), forbidden (<errorcode>403</errorcode>), itemNotFound
-            (<errorcode>404</errorcode>), idmFault (<errorcode>500</errorcode>),
-            serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-            &NO_REQUEST;
-      </section>
-      <section>
-        <title>Get Users in a Group</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1"> &GET; </td>
-              <td colspan="4">/groups/<parameter>groupId</parameter>/users</td>
-              <td colspan="3"> Gets a list of users in a group.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
-            (<errorcode>400</errorcode>), forbidden(<errorcode>403</errorcode>), itemNotFound
-            (<errorcode>404</errorcode>), idmFault (<errorcode>500</errorcode>),
-            serviceUnavailable(<errorcode>503</errorcode>)</simpara>
-        &NO_REQUEST;
-        <example>
-          <title>XML Group User List Response</title>
-          <programlisting language="xml">
-<xi:include href="samples/users.xml" parse="text"/>
-</programlisting>
-        </example>
-        <example>
-          <title>JSON Group User List Response</title>
-          <programlisting language="javascript">
-<xi:include href="samples/users.json" parse="text"/>
-</programlisting>
-        </example>
-      </section>
-      <section>
-        <title>Add a User to a Group</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1">&PUT;</td>
-              <td colspan="4">/groups/<parameter>groupId</parameter>/users</td>
-              <td colspan="3">Add a user to a group.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>200</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized
-        (<errorcode>401</errorcode>), badRequest
-        (<errorcode>400</errorcode>), forbidden
-        (<errorcode>403</errorcode>), itemNotFound
-        (<errorcode>404</errorcode>), usernameConflict
-        (<errorcode>409</errorcode>), emailConflict
-        (<errorcode>409</errorcode>), idmFault
-        (<errorcode>500</errorcode>), serviceUnavailable
-        (<errorcode>503</errorcode>)</simpara>
-          &NO_REQUEST;
-      </section>
-      <section>
-        <title>Remove a User from a Group</title>
-        <informaltable rules="all">
-          &LONG_URI_REFHEAD;
-          <tbody>
-            <tr>
-              <td colspan="1">&DELETE;</td>
-              <td colspan="4">/groups/<parameter>groupId</parameter>/users</td>
-              <td colspan="3">Remove a user from a group.</td>
-            </tr>
-          </tbody>
-        </informaltable>
-        <simpara>&CODES;<returnvalue>204</returnvalue></simpara>
-        <simpara>&ERROR_CODES; unauthorized
-        (<errorcode>401</errorcode>), badRequest
-        (<errorcode>400</errorcode>), forbidden
-        (<errorcode>403</errorcode>), itemNotFound
-        (<errorcode>404</errorcode>), usernameConflict
-        (<errorcode>409</errorcode>), emailConflict
-        (<errorcode>409</errorcode>), idmFault
-        (<errorcode>500</errorcode>), serviceUnavailable
-        (<errorcode>503</errorcode>)</simpara>
-          &NO_REQUEST;
-      </section>
-    </section>
   </chapter>
 </book>
diff --git a/docs/guide/src/docbkx/samples/add-baseurl-input.xml b/docs/guide/src/docbkx/samples/add-baseurl-input.xml
deleted file mode 100644
index ddbe52dae8..0000000000
--- a/docs/guide/src/docbkx/samples/add-baseurl-input.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURL xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    id="111114"
-    userType="NAST"
-    serviceName="cloudFiles"
-    region="DFW"
-    publicURL="https://storage.clouddrive.com/v1"
-    internalURL="https://storage-snet.clouddrive.com/v1"
-    adminURL="https://storage-snet.clouddrive.com/v1"
-    default="true"/>
diff --git a/docs/guide/src/docbkx/samples/add-baseurlRef-input.xml b/docs/guide/src/docbkx/samples/add-baseurlRef-input.xml
deleted file mode 100644
index 7dd65a082d..0000000000
--- a/docs/guide/src/docbkx/samples/add-baseurlRef-input.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURLRef xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    id="111114"
-    href="https://storage-snet.clouddrive.com/v1"
-    v1Default="true"/>
diff --git a/docs/guide/src/docbkx/samples/addclient.json b/docs/guide/src/docbkx/samples/addclient.json
deleted file mode 100644
index 7a279e23d2..0000000000
--- a/docs/guide/src/docbkx/samples/addclient.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ 
-  "customerId": "RCN-000-000-000",
-  "name": "Test Application2"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addclient.xml b/docs/guide/src/docbkx/samples/addclient.xml
deleted file mode 100644
index 85cf6b7269..0000000000
--- a/docs/guide/src/docbkx/samples/addclient.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<client xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    name="Test Application2" 
-    customerId="RCN-000-000-000">
-</client>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addedclient.json b/docs/guide/src/docbkx/samples/addedclient.json
deleted file mode 100644
index 76555364aa..0000000000
--- a/docs/guide/src/docbkx/samples/addedclient.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{  
-  "credentials": {
-    "clientSecret": "3af738fbeiwu23"
-  },
-  "clientId": "ab4820dhcb39347",
-  "customerId": "RCN-000-000-000",
-  "name": "Test Application2",
-  "inum": "@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001",
-  "status": "ACTIVE",
-  "locked": false,
-  "softDeleted": false
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addedclient.xml b/docs/guide/src/docbkx/samples/addedclient.xml
deleted file mode 100644
index f4631ad00d..0000000000
--- a/docs/guide/src/docbkx/samples/addedclient.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<client xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="false" 
-    locked="false" 
-    status="ACTIVE"
-    inum="@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001"
-    name="Test Application2" 
-    customerId="RCN-000-000-000" 
-    clientId="ab4820dhcb39347">
-    <credentials clientSecret="3af738fbeiwu23" />
-</client>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addeduser.json b/docs/guide/src/docbkx/samples/addeduser.json
deleted file mode 100644
index 0566f29b95..0000000000
--- a/docs/guide/src/docbkx/samples/addeduser.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"user":
-    {
-      "password": "P@ssword1",
-      "id": "jqsmith",
-      "tenantId": "12234",
-      "email": "john.smith@example.org",
-      "enabled" : true
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/addfirstuserresponse.json b/docs/guide/src/docbkx/samples/addfirstuserresponse.json
deleted file mode 100644
index 651152516c..0000000000
--- a/docs/guide/src/docbkx/samples/addfirstuserresponse.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "password": "P@ssword1",
-  "username": "jqsmith",
-  "tenantId": "12234",
-  "email": "john.smith@example.org",
-  "enabled" : true
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addfirstuserresponse.xml b/docs/guide/src/docbkx/samples/addfirstuserresponse.xml
deleted file mode 100644
index 0b4f225951..0000000000
--- a/docs/guide/src/docbkx/samples/addfirstuserresponse.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    email="john.smith@example.org"
-    tenantId="1234" 
-    username="jqsmith"
-    enabled="true"
-    password="C@n+f001me!" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/adduser.json b/docs/guide/src/docbkx/samples/adduser.json
deleted file mode 100644
index 3bf8ca3b58..0000000000
--- a/docs/guide/src/docbkx/samples/adduser.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"user":
-    {
-      "password": "P@ssword1",
-      "id": "jqsmith",
-      "tenantId": "12234",
-      "email": "john.smith@example.org"
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/adduser.xml b/docs/guide/src/docbkx/samples/adduser.xml
deleted file mode 100644
index 60816acdcc..0000000000
--- a/docs/guide/src/docbkx/samples/adduser.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      email="john.smith@example.org" tenantId="1234"
-      id="jqsmith" password="C@n+f001me!"/>
diff --git a/docs/guide/src/docbkx/samples/adduserresponse.xml b/docs/guide/src/docbkx/samples/adduserresponse.xml
deleted file mode 100644
index add18f5277..0000000000
--- a/docs/guide/src/docbkx/samples/adduserresponse.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      email="john.smith@example.org"
-      tenantId="1234" id="jqsmith"
-      enabled="true" password="C@n+f001me!"/>
diff --git a/docs/guide/src/docbkx/samples/auth.json b/docs/guide/src/docbkx/samples/auth.json
index fe368811e7..c472187366 100644
--- a/docs/guide/src/docbkx/samples/auth.json
+++ b/docs/guide/src/docbkx/samples/auth.json
@@ -15,34 +15,5 @@
           "username": "jqsmith",
           "tenantId": "1234",
       }
-      "serviceCatalog" : {
-          "cloudFiles" : [
-              {
-                  "region" : "DFW",
-                  "publicURL" : "https://storage.clouddrive.com/v1/MossoCloudFS_blah-blah",
-                  "internalURL" : "https://storage-snet.clouddrive.com/v1/MossoCloudFS_blah-blah"
-              },
-              {
-                  "region" : "ORD",
-                  "publicURL" : "https://otherstorage.clouddrive.com/v1/MossoCloudFS_blah-blah",
-                  "internalURL" : "https://otherstorage-snet.clouddrive.com/v1/MossoCloudFS_blah-blah"
-              }
-          ],
-          "cloudFilesCDN" : [
-              {
-                  "region" : "DFW",
-                  "publicURL" : "https://cdn.clouddrive.com/v1/MossoCloudFS_blah-blah"
-              },
-              {
-                  "region" : "ORD",
-                  "publicURL" : "https://othercdn.clouddrive.com/v1/MossoCloudFS_blah-blah"
-              }
-          ],
-          "cloudServers" : [
-              {
-                  "publicURL" : "https://servers.api.rackspacecloud.com/v1.0/322781"
-              }
-          ]
-      }
   }
 }
diff --git a/docs/guide/src/docbkx/samples/auth.xml b/docs/guide/src/docbkx/samples/auth.xml
index 3558798ca1..b091c7af85 100644
--- a/docs/guide/src/docbkx/samples/auth.xml
+++ b/docs/guide/src/docbkx/samples/auth.xml
@@ -7,28 +7,4 @@
 	        <group tenantId="1245" name="Admin"/>
 	    </groups>
 	</user>
-    <serviceCatalog>
-        <service name="cloudFiles">
-            <endpoint
-                region="DFW"
-                publicURL="https://storage.clouddrive.com/v1/MossoCloudFS_blah-blah"
-                internalURL="https://storage-snet.clouddrive.com/v1/MossoCloudFS_blah-blah"/>
-            <endpoint
-                region="ORD"
-                publicURL="https://otherstorage.clouddrive.com/v1/MossoCloudFS_blah-blah"
-                internalURL="https://otherstorage-snet.clouddrive.com/v1/MossoCloudFS_blah-blah"/>
-        </service>
-        <service name="cloudFilesCDN">
-            <endpoint
-                region="DFW"
-                publicURL="https://cdn.clouddrive.com/v1/MossoCloudFS_blah-blah"/>
-            <endpoint
-                region="ORD"
-                publicURL="https://othercdn.clouddrive.com/v1/MossoCloudFS_blah-blah"/>
-        </service>
-        <service name="cloudServers">
-            <endpoint
-                publicURL="https://servers.api.rackspacecloud.com/v1.0/322781"/>
-        </service>
-    </serviceCatalog>
 </auth>
diff --git a/docs/guide/src/docbkx/samples/bad_request.json b/docs/guide/src/docbkx/samples/bad_request.json
deleted file mode 100644
index 257969914a..0000000000
--- a/docs/guide/src/docbkx/samples/bad_request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Bad Request!",
-  "details": "Error Details...",
-  "code": 400
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/bad_request.xml b/docs/guide/src/docbkx/samples/bad_request.xml
deleted file mode 100644
index 275a40b69f..0000000000
--- a/docs/guide/src/docbkx/samples/bad_request.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<badRequest xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="400">
-	<message>Bad Request!</message>
-	<details>Error Details...</details>
-</badRequest>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/baseURLRefs.json b/docs/guide/src/docbkx/samples/baseURLRefs.json
deleted file mode 100644
index 30e56d45cf..0000000000
--- a/docs/guide/src/docbkx/samples/baseURLRefs.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "baseURLRefs" : [
-  {
-  "id" : 1,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/1",
-  "v1Default" : true
-  },
-  {
-  "id" : 2,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/2"
-  },
-  {
-  "id" : 3,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/3",
-  "v1Default" : true
-  },
-  {
-  "id" : 4,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/4"
-  },
-  {
-  "id" : 5,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/5",
-  "v1Default" : true
-  }
- ]
-}
diff --git a/docs/guide/src/docbkx/samples/baseURLRefs.xml b/docs/guide/src/docbkx/samples/baseURLRefs.xml
deleted file mode 100644
index a33c34e872..0000000000
--- a/docs/guide/src/docbkx/samples/baseURLRefs.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURLRefs xmlns="http://docs.rackspacecloud.com/auth/api/v1.1">
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/1"
-        id="1" 
-        v1Default="true" />
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/2"
-        id="2" />
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/3"
-        id="3" 
-        v1Default="true" />
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/4"
-        id="4" />
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/5"
-        id="5" 
-        v1Default="true" />
-</baseURLRefs>
diff --git a/docs/guide/src/docbkx/samples/base_url_ref_response.json b/docs/guide/src/docbkx/samples/base_url_ref_response.json
deleted file mode 100644
index 65bc55c300..0000000000
--- a/docs/guide/src/docbkx/samples/base_url_ref_response.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "id": 111111,
-   "href": "https://idm.rackspace.com/v1.0/baseurls/111111",
-   "v1Default": true
-}
diff --git a/docs/guide/src/docbkx/samples/base_url_ref_response.xml b/docs/guide/src/docbkx/samples/base_url_ref_response.xml
deleted file mode 100644
index ab90847a15..0000000000
--- a/docs/guide/src/docbkx/samples/base_url_ref_response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURLRef xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    id="111111" 
-    href="https://idm.rackspace.com/v1.0/baseurls/111111" 
-    v1Default="true" />
diff --git a/docs/guide/src/docbkx/samples/base_url_response.json b/docs/guide/src/docbkx/samples/base_url_response.json
deleted file mode 100644
index 41ca4de6aa..0000000000
--- a/docs/guide/src/docbkx/samples/base_url_response.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "id": 111111,
-   "userType": "NAST",
-   "serviceName": "cloudFiles",
-   "region": "DFW",
-   "publicURL": "https://storage.clouddrive.com/v1",
-   "internalURL": "https://storage-snet.clouddrive.com/v1",
-   "adminURL": null,
-   "default": true
-}
diff --git a/docs/guide/src/docbkx/samples/base_url_response.xml b/docs/guide/src/docbkx/samples/base_url_response.xml
deleted file mode 100644
index 8310eec4bd..0000000000
--- a/docs/guide/src/docbkx/samples/base_url_response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Response xmlns="http://10.127.7.164/v1.0/baseurls/111111"
-    adminURL="https://storage-snet.clouddrive.com/v1"
-    default="true"
-    id="111111"
-    internalURL="https://storage-snet.clouddrive.com/v1"
-    publicURL="https://storage.clouddrive.com/v1"
-    region="DFW"
-    serviceName="cloudFiles"
-    userType="NAST"/>
-   
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/base_urls_response.json b/docs/guide/src/docbkx/samples/base_urls_response.json
deleted file mode 100644
index 284bccdb2a..0000000000
--- a/docs/guide/src/docbkx/samples/base_urls_response.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{"baseURL": [
-      {
-      "id": 111111,
-      "userType": "NAST",
-      "serviceName": "cloudFiles",
-      "region": "DFW",
-      "publicURL": "https://storage.clouddrive.com/v1",
-      "internalURL": "https://storage-snet.clouddrive.com/v1",
-      "adminURL": null,
-      "default": true
-   },
-      {
-      "id": 222222,
-      "userType": "MOSSO",
-      "serviceName": "cloudServers",
-      "region": null,
-      "publicURL": "https://servers.api.rackspacecloud.com/v1.0",
-      "internalURL": null,
-      "adminURL": null,
-      "default": true
-   }
-]}
diff --git a/docs/guide/src/docbkx/samples/base_urls_response.xml b/docs/guide/src/docbkx/samples/base_urls_response.xml
deleted file mode 100644
index eb52f45f15..0000000000
--- a/docs/guide/src/docbkx/samples/base_urls_response.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURLs xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <baseURL 
-        id="111111" 
-        userType="NAST" 
-        serviceName="cloudFiles" 
-        region="DFW" 
-        publicURL="https://storage.clouddrive.com/v1" 
-        internalURL="https://storage-snet.clouddrive.com/v1" 
-        default="true"/>
-    <baseURL 
-        id="222222" 
-        userType="MOSSO" 
-        serviceName="cloudServers" 
-        publicURL="https://servers.api.rackspacecloud.com/v1.0" 
-        default="true"/>
-</baseURLs>
diff --git a/docs/guide/src/docbkx/samples/client-credentials-response.json b/docs/guide/src/docbkx/samples/client-credentials-response.json
deleted file mode 100644
index 96f07aaa14..0000000000
--- a/docs/guide/src/docbkx/samples/client-credentials-response.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "clientSecret" : "eca2d413a1790dc6473842ab5a49387a29996757"
-}
diff --git a/docs/guide/src/docbkx/samples/client-credentials-response.xml b/docs/guide/src/docbkx/samples/client-credentials-response.xml
deleted file mode 100644
index dd881ca525..0000000000
--- a/docs/guide/src/docbkx/samples/client-credentials-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<clientCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-	clientSecret="c582fe94dda4c0da19bf234c504db0b63df96daa" />
diff --git a/docs/guide/src/docbkx/samples/client.json b/docs/guide/src/docbkx/samples/client.json
deleted file mode 100644
index faef1dd086..0000000000
--- a/docs/guide/src/docbkx/samples/client.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{ "permissions": {
-    "permission": [
-      {
-        "resourceId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]},
-  "clientId": "ab4820dhcb39347",
-  "customerId": "RCN-000-000-000",
-  "name": "Test Application2",
-  "inum": "@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001",
-  "status": "ACTIVE",
-  "locked": false,
-  "softDeleted": false
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/client.xml b/docs/guide/src/docbkx/samples/client.xml
deleted file mode 100644
index e2a621bcf2..0000000000
--- a/docs/guide/src/docbkx/samples/client.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<client xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="false" 
-    locked="false" 
-    status="ACTIVE"
-    iname="@Rackspace*Rackspace*ControlPanel" 
-    inum="@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001"
-    name="Test Application2" 
-    customerId="RCN-000-000-000" 
-    clientId="ab4820dhcb39347">
-    <permissions>
-        <permission clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            resourceId="addCustomer" />
-    </permissions>
-</client>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientGroup.json b/docs/guide/src/docbkx/samples/clientGroup.json
deleted file mode 100644
index 75e8185962..0000000000
--- a/docs/guide/src/docbkx/samples/clientGroup.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tenantId" : "1234",
-    "name" : "Admin"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientGroup.xml b/docs/guide/src/docbkx/samples/clientGroup.xml
deleted file mode 100644
index 55ef045676..0000000000
--- a/docs/guide/src/docbkx/samples/clientGroup.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<group xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    tenantId="1234"
-    name="Admin" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientGroups.json b/docs/guide/src/docbkx/samples/clientGroups.json
deleted file mode 100644
index b8c62c93e3..0000000000
--- a/docs/guide/src/docbkx/samples/clientGroups.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"group": [
-    {
-        "tenantId" : "1234",
-        "name" : "Admin"
-    }]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientGroups.xml b/docs/guide/src/docbkx/samples/clientGroups.xml
deleted file mode 100644
index e761dc94a9..0000000000
--- a/docs/guide/src/docbkx/samples/clientGroups.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<groups xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <group xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-        tenantId="1234"
-        name="Admin" />
-</groups>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.json b/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.json
deleted file mode 100644
index 410afe9970..0000000000
--- a/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ 
-  "softDeleted": "true"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.xml b/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.xml
deleted file mode 100644
index 8c73be4845..0000000000
--- a/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<client xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="true" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/client_credentials.json b/docs/guide/src/docbkx/samples/client_credentials.json
deleted file mode 100644
index 3de72a8fa2..0000000000
--- a/docs/guide/src/docbkx/samples/client_credentials.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "clientSecret": "cncv9823823bfb"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/client_credentials.xml b/docs/guide/src/docbkx/samples/client_credentials.xml
deleted file mode 100644
index c9eba3bd38..0000000000
--- a/docs/guide/src/docbkx/samples/client_credentials.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<clientCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	clientSecret="cncv9823823bfb" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientname_conflict.json b/docs/guide/src/docbkx/samples/clientname_conflict.json
deleted file mode 100644
index 9b0640156d..0000000000
--- a/docs/guide/src/docbkx/samples/clientname_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Clientname already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientname_conflict.xml b/docs/guide/src/docbkx/samples/clientname_conflict.xml
deleted file mode 100644
index 0694d96e85..0000000000
--- a/docs/guide/src/docbkx/samples/clientname_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<clientnameConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>Clientname already taken.</message>
-	<details>Error Details...</details>
-</clientnameConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clients.json b/docs/guide/src/docbkx/samples/clients.json
deleted file mode 100644
index 3c5193eb2b..0000000000
--- a/docs/guide/src/docbkx/samples/clients.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "client": [
-    {
-      "clientId": "ab4820dhcb39347",
-      "customerId": "RCN-000-000-000",
-      "name": "Test Application2",
-      "inum": "@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001",
-      "status": "ACTIVE",
-      "locked": false,
-      "softDeleted": false
-    },
-    {
-      "clientId": "632h389cv902bde",
-      "customerId": "RCN-000-000-000",
-      "name": "Test Application2",
-      "inum": "@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0002",
-      "status": "ACTIVE",
-      "locked": false,
-      "softDeleted": false
-    }
-  ]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clients.xml b/docs/guide/src/docbkx/samples/clients.xml
deleted file mode 100644
index 2d870f9b20..0000000000
--- a/docs/guide/src/docbkx/samples/clients.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<clients xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-	<client 
-	   softDeleted="false" 
-	   locked="false" 
-	   status="ACTIVE"
-	   inum="@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001"
-	   name="Test Application2" 
-	   customerId="RCN-000-000-000" 
-	   clientId="ab4820dhcb39347">
-	</client>
-	<client 
-	   softDeleted="false" 
-	   locked="false" 
-	   status="ACTIVE"
-	   inum="@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0002"
-	   name="Test Application2" 
-	   customerId="RCN-000-000-000" 
-	   clientId="632h389cv902bde">
-	</client>
-</clients>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/customer_conflict.json b/docs/guide/src/docbkx/samples/customer_conflict.json
deleted file mode 100644
index 4fd3a6a823..0000000000
--- a/docs/guide/src/docbkx/samples/customer_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "CustomerId already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/customer_conflict.xml b/docs/guide/src/docbkx/samples/customer_conflict.xml
deleted file mode 100644
index 5641ad3438..0000000000
--- a/docs/guide/src/docbkx/samples/customer_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<customerIdConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>CustomerId already taken.</message>
-	<details>Error Details...</details>
-</customerIdConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/definedpermissions.json b/docs/guide/src/docbkx/samples/definedpermissions.json
deleted file mode 100644
index f725235c9e..0000000000
--- a/docs/guide/src/docbkx/samples/definedpermissions.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "defined": {
-    "permission": [
-      {
-        "permissionId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      },
-      {
-        "permissionId": "getCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/definedpermissions.xml b/docs/guide/src/docbkx/samples/definedpermissions.xml
deleted file mode 100644
index b8b28a5b3a..0000000000
--- a/docs/guide/src/docbkx/samples/definedpermissions.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<permissions xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <defined>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="addCustomer"/>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="getCustomer"/>
-    </defined>
-</permissions>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/email_conflict.json b/docs/guide/src/docbkx/samples/email_conflict.json
deleted file mode 100644
index aa9ba6efdc..0000000000
--- a/docs/guide/src/docbkx/samples/email_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Email Address already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/email_conflict.xml b/docs/guide/src/docbkx/samples/email_conflict.xml
deleted file mode 100644
index c30052bc13..0000000000
--- a/docs/guide/src/docbkx/samples/email_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<emailConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>Email Address already taken.</message>
-	<details>Error Details...</details>
-</emailConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/feed.xml b/docs/guide/src/docbkx/samples/feed.xml
deleted file mode 100644
index 15603de1b0..0000000000
--- a/docs/guide/src/docbkx/samples/feed.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<feed xmlns="http://www.w3.org/2005/Atom" 
-      xml:lang="en-US">
-<entry>
- <title>User, "mkovacs" was modified.</title>
- <summary>User, "mkovacs" was modified.</summary>
- <link rel="actual"
-    href="/customers/RCN-000-000-000/users/mkovacs" />
- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
- <updated>2003-12-13T18:30:02Z</updated>
-</entry>
-<entry>
- <title>User, "hueyly" was created.</title>
- <summary>User, "hueyly" was created.</summary>
- <link rel="actual"
-    href="/customers/RCN-000-000-000/users/hueyly" />
- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-920474efa234</id>
- <updated>2003-12-13T18:29:20Z</updated>
-</entry>
-</feed>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/forbidden.json b/docs/guide/src/docbkx/samples/forbidden.json
deleted file mode 100644
index 48b23ea56c..0000000000
--- a/docs/guide/src/docbkx/samples/forbidden.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Forbidden",
-  "details": "Error Details...",
-  "code": 403
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/forbidden.xml b/docs/guide/src/docbkx/samples/forbidden.xml
deleted file mode 100644
index 231238058e..0000000000
--- a/docs/guide/src/docbkx/samples/forbidden.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<forbidden xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="403">
-	<message>Forbidden</message>
-	<details>Error Details...</details>
-</forbidden>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/forgot_password.json b/docs/guide/src/docbkx/samples/forgot_password.json
deleted file mode 100644
index e8d2114aa7..0000000000
--- a/docs/guide/src/docbkx/samples/forgot_password.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "customParams" : [ 
-            { 
-                "name": "%%FirstName%%",
-                "value": "Steve"
-            },
-            { 
-                "name": "%%LastName%%",
-                "value": "Smith"
-            }
-        ],
-    "templateUrl": "http://cp.rackspace.com/files/passwordRecovery.txt",
-    "callbackUrl": "http://cp.rackspace.com/passwordRecovery.html", 
-    "from": "Rackspace Control Panel",
-    "replyTo": "cpsupport@rackspace.com",
-    "subject": "Rackspace Password Reset"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/forgot_password.xml b/docs/guide/src/docbkx/samples/forgot_password.xml
deleted file mode 100644
index 53a7a1a8c1..0000000000
--- a/docs/guide/src/docbkx/samples/forgot_password.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<passwordRecovery xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    templateUrl="http://cp.rackspace.com/files/passwordRecovery.txt" 
-    callbackUrl="http://cp.rackspace.com/passwordRecovery.html" 
-    from="Rackspace Control Panel"
-    replyTo="cpsupport@rackspace.com" 
-    subject="Rackspace Password Reset">
-    <customParams>
-        <customParam name="%%FirstName%%" value="Steve" />
-        <customParam name="%%LastName%%" value="Smith" />
-    </customParams>
-</passwordRecovery>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/getuser-with-mosso-id.json b/docs/guide/src/docbkx/samples/getuser-with-mosso-id.json
deleted file mode 100644
index 4ba14bbc9f..0000000000
--- a/docs/guide/src/docbkx/samples/getuser-with-mosso-id.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   "username": "qauser",
-   "customerId": "RCN-QATestingCustomer",
-   "customerInum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999",
-   "email": "quauser@example.com",
-   "personId": "RPN-qauser-000-10001",
-   "firstName": "qauser",
-   "middleName": "none",
-   "lastName": "Tester",
-   "displayName": "qauser",
-   "prefLanguage": "en-us",
-   "inum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001",
-   "status": "ACTIVE",
-   "locked": false,
-   "softDeleted": false,
-   "country": "USA",
-   "timeZone": "America/Chicago",
-   "mossoId": 999112358,
-   "nastId": "nastid-qauser"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/getuser-with-mosso-id.xml b/docs/guide/src/docbkx/samples/getuser-with-mosso-id.xml
deleted file mode 100644
index 26c12ede2b..0000000000
--- a/docs/guide/src/docbkx/samples/getuser-with-mosso-id.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    username="qauser" 
-    customerId="RCN-QATestingCustomer"
-    customerInum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999" 
-    email="quauser@example.com"
-    personId="RPN-qauser-000-10001" 
-    firstName="qauser" 
-    middleName="none"
-    lastName="Tester" 
-    displayName="qauser" 
-    prefLanguage="en-us"
-    inum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001" 
-    status="ACTIVE" 
-    locked="false" 
-    softDeleted="false" 
-    country="USA"
-    timeZone="America/Chicago" 
-    mossoId="999112358" 
-    nastId="nastid-qauser"/>
diff --git a/docs/guide/src/docbkx/samples/getuser-with-nast-id.json b/docs/guide/src/docbkx/samples/getuser-with-nast-id.json
deleted file mode 100644
index 4ba14bbc9f..0000000000
--- a/docs/guide/src/docbkx/samples/getuser-with-nast-id.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   "username": "qauser",
-   "customerId": "RCN-QATestingCustomer",
-   "customerInum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999",
-   "email": "quauser@example.com",
-   "personId": "RPN-qauser-000-10001",
-   "firstName": "qauser",
-   "middleName": "none",
-   "lastName": "Tester",
-   "displayName": "qauser",
-   "prefLanguage": "en-us",
-   "inum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001",
-   "status": "ACTIVE",
-   "locked": false,
-   "softDeleted": false,
-   "country": "USA",
-   "timeZone": "America/Chicago",
-   "mossoId": 999112358,
-   "nastId": "nastid-qauser"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/getuser-with-nast-id.xml b/docs/guide/src/docbkx/samples/getuser-with-nast-id.xml
deleted file mode 100644
index 26c12ede2b..0000000000
--- a/docs/guide/src/docbkx/samples/getuser-with-nast-id.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    username="qauser" 
-    customerId="RCN-QATestingCustomer"
-    customerInum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999" 
-    email="quauser@example.com"
-    personId="RPN-qauser-000-10001" 
-    firstName="qauser" 
-    middleName="none"
-    lastName="Tester" 
-    displayName="qauser" 
-    prefLanguage="en-us"
-    inum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001" 
-    status="ACTIVE" 
-    locked="false" 
-    softDeleted="false" 
-    country="USA"
-    timeZone="America/Chicago" 
-    mossoId="999112358" 
-    nastId="nastid-qauser"/>
diff --git a/docs/guide/src/docbkx/samples/getuser-with-username.json b/docs/guide/src/docbkx/samples/getuser-with-username.json
deleted file mode 100644
index 4ba14bbc9f..0000000000
--- a/docs/guide/src/docbkx/samples/getuser-with-username.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   "username": "qauser",
-   "customerId": "RCN-QATestingCustomer",
-   "customerInum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999",
-   "email": "quauser@example.com",
-   "personId": "RPN-qauser-000-10001",
-   "firstName": "qauser",
-   "middleName": "none",
-   "lastName": "Tester",
-   "displayName": "qauser",
-   "prefLanguage": "en-us",
-   "inum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001",
-   "status": "ACTIVE",
-   "locked": false,
-   "softDeleted": false,
-   "country": "USA",
-   "timeZone": "America/Chicago",
-   "mossoId": 999112358,
-   "nastId": "nastid-qauser"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/getuser-with-username.xml b/docs/guide/src/docbkx/samples/getuser-with-username.xml
deleted file mode 100644
index 5e92fb9c74..0000000000
--- a/docs/guide/src/docbkx/samples/getuser-with-username.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    username="qauser" 
-    customerId="RCN-QATestingCustomer"
-    customerInum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999" 
-    email="quauser@example.com"
-    personId="RPN-qauser-000-10001" 
-    firstName="qauser" 
-    middleName="none"
-    lastName="Tester" 
-    displayName="qauser" 
-    prefLanguage="en-us"
-    inum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001"
-    status="ACTIVE" 
-    locked="false" 
-    softDeleted="false" 
-    country="USA"
-    timeZone="America/Chicago" 
-    mossoId="999112358" 
-    nastId="nastid-qauser"/>
diff --git a/docs/guide/src/docbkx/samples/getuser.json b/docs/guide/src/docbkx/samples/getuser.json
deleted file mode 100644
index b9d00949d9..0000000000
--- a/docs/guide/src/docbkx/samples/getuser.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"user":
-    {
-      "groups": {
-        "values": [
-          {
-            "tenantId" : "1234",
-            "id": "Admin"
-          }
-        ]},
-      "id": "jqsmith",
-      "tenantId": "1234",
-      "email": "john.smith@example.org",
-      "enabled": true
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/getuser.xml b/docs/guide/src/docbkx/samples/getuser.xml
deleted file mode 100644
index 095db4efab..0000000000
--- a/docs/guide/src/docbkx/samples/getuser.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      enabled="true" email="john.smith@example.org"
-      tenantId="1234" id="jqsmith">
-	<groups>
-		<group tenantId="1234" id="Admin"/>
-	</groups>
-</user>
diff --git a/docs/guide/src/docbkx/samples/globalgroup.json b/docs/guide/src/docbkx/samples/globalgroup.json
deleted file mode 100644
index 8c524d61d6..0000000000
--- a/docs/guide/src/docbkx/samples/globalgroup.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"group":
-    {
-        "name" : "Admin",
-        "description" : "A description ..."
-    }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/globalgroup.xml b/docs/guide/src/docbkx/samples/globalgroup.xml
deleted file mode 100644
index 387611c9f9..0000000000
--- a/docs/guide/src/docbkx/samples/globalgroup.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<group xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    name="Admin"
-    description="A description..." />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/globalgroups.json b/docs/guide/src/docbkx/samples/globalgroups.json
deleted file mode 100644
index 523bb2229d..0000000000
--- a/docs/guide/src/docbkx/samples/globalgroups.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"groups": [
-    {
-        "name" : "Admin",
-        "description" : "A description ..."
-    },
-    {
-        "name" : "Technical",
-        "description" : "Another description ..."
-    }]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/globalgroups.xml b/docs/guide/src/docbkx/samples/globalgroups.xml
deleted file mode 100644
index c272f37059..0000000000
--- a/docs/guide/src/docbkx/samples/globalgroups.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<groups xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <group
-        name="Admin" 
-        description="A description..."/>
-    <group
-        name="Technical" 
-        description="Another description..."/>
-</groups>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/grantedpermissions.json b/docs/guide/src/docbkx/samples/grantedpermissions.json
deleted file mode 100644
index 8269646e4b..0000000000
--- a/docs/guide/src/docbkx/samples/grantedpermissions.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "granted": {
-    "permission": [
-      {
-        "permissionId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      },
-      {
-        "permissionId": "getCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/grantedpermissions.xml b/docs/guide/src/docbkx/samples/grantedpermissions.xml
deleted file mode 100644
index 07ca960d87..0000000000
--- a/docs/guide/src/docbkx/samples/grantedpermissions.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<permissions xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <granted>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="addCustomer"/>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="getCustomer"/>
-    </granted>
-</permissions>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/group-create.json b/docs/guide/src/docbkx/samples/group-create.json
deleted file mode 100644
index 4f5a15f75f..0000000000
--- a/docs/guide/src/docbkx/samples/group-create.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"group":
-    {
-        "id" : "Admin",
-        "description" : "A Description of the group..."
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/group-create.xml b/docs/guide/src/docbkx/samples/group-create.xml
deleted file mode 100644
index fbba3c61cb..0000000000
--- a/docs/guide/src/docbkx/samples/group-create.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<group xmlns="http://docs.openstack.org/idm/api/v1.0"
-       id="Admin">
-    <description>A Description of the group...</description>
-</group>
diff --git a/docs/guide/src/docbkx/samples/group-updated-nt.json b/docs/guide/src/docbkx/samples/group-updated-nt.json
deleted file mode 100644
index 004fa36863..0000000000
--- a/docs/guide/src/docbkx/samples/group-updated-nt.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"group":
-    {
-        "id" : "Admin",
-        "description" : "A New description of the group..."
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/group-updated-nt.xml b/docs/guide/src/docbkx/samples/group-updated-nt.xml
deleted file mode 100644
index 1e10d24a50..0000000000
--- a/docs/guide/src/docbkx/samples/group-updated-nt.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<group xmlns="http://docs.openstack.org/idm/api/v1.0"
-       id="Admin">
-    <description>A New description of the group...</description>
-</group>
diff --git a/docs/guide/src/docbkx/samples/group-updated.json b/docs/guide/src/docbkx/samples/group-updated.json
deleted file mode 100644
index da20dac5b4..0000000000
--- a/docs/guide/src/docbkx/samples/group-updated.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"group":
-    {
-        "tenantId" : "1234",
-        "id" : "Admin",
-        "description" : "A New description of the group..."
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/group-updated.xml b/docs/guide/src/docbkx/samples/group-updated.xml
deleted file mode 100644
index 991a6b1e8e..0000000000
--- a/docs/guide/src/docbkx/samples/group-updated.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<group xmlns="http://docs.openstack.org/idm/api/v1.0"
-       tenantId="1234" id="Admin">
-    <description>A New description of the group...</description>
-</group>
diff --git a/docs/guide/src/docbkx/samples/group.json b/docs/guide/src/docbkx/samples/group.json
deleted file mode 100644
index 22efc41f68..0000000000
--- a/docs/guide/src/docbkx/samples/group.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"group":
-    {
-        "tenantId" : "1234",
-        "id" : "Admin",
-        "description" : "A Description of the group..."
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/group.xml b/docs/guide/src/docbkx/samples/group.xml
deleted file mode 100644
index ba3063ae4f..0000000000
--- a/docs/guide/src/docbkx/samples/group.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<group xmlns="http://docs.openstack.org/idm/api/v1.0"
-       tenantId="1234" id="Admin">
-    <description>A Description of the group...</description>
-</group>
diff --git a/docs/guide/src/docbkx/samples/groups-nt.json b/docs/guide/src/docbkx/samples/groups-nt.json
deleted file mode 100644
index b183edac5c..0000000000
--- a/docs/guide/src/docbkx/samples/groups-nt.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"groups": {
-    "values" : [
-        {
-            "id" : "Admin",
-            "description" : "A description ..."
-        },
-        {
-            "id" : "Technical",
-            "description" : "Another description ..."
-        }]
-}
-}
diff --git a/docs/guide/src/docbkx/samples/groups-nt.xml b/docs/guide/src/docbkx/samples/groups-nt.xml
deleted file mode 100644
index 7dd515aa9a..0000000000
--- a/docs/guide/src/docbkx/samples/groups-nt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<groups xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <group id="Admin">
-        <description>A Description of the group...</description>
-    </group>
-    <group id="Technical">
-        <description>Another description...</description>
-    </group>
-</groups>
diff --git a/docs/guide/src/docbkx/samples/groups.json b/docs/guide/src/docbkx/samples/groups.json
deleted file mode 100644
index 1c6f6c0352..0000000000
--- a/docs/guide/src/docbkx/samples/groups.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"groups": {
-    "values" : [
-        {
-            "tenantId" : "1234",
-            "id" : "Admin",
-            "description" : "A description ..."
-        },
-        {
-            "tenantId" : "1234",
-            "id" : "Technical",
-            "description" : "Another description ..."
-        }
-    ]
-}
-}
diff --git a/docs/guide/src/docbkx/samples/groups.xml b/docs/guide/src/docbkx/samples/groups.xml
deleted file mode 100644
index 3f5ba19aa8..0000000000
--- a/docs/guide/src/docbkx/samples/groups.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<groups xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <group tenantId="1234" id="Admin">
-        <description>A Description of the group...</description>
-    </group>
-    <group tenantId="1234" id="Technical">
-        <description>Another description...</description>
-    </group>
-</groups>
diff --git a/docs/guide/src/docbkx/samples/methodnotallowedfault.json b/docs/guide/src/docbkx/samples/methodnotallowedfault.json
deleted file mode 100644
index ad9cec4b2a..0000000000
--- a/docs/guide/src/docbkx/samples/methodnotallowedfault.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Method Not Allowed",
-  "details": "Error Details...",
-  "code": 405
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/methodnotallowedfault.xml b/docs/guide/src/docbkx/samples/methodnotallowedfault.xml
deleted file mode 100644
index 0106857212..0000000000
--- a/docs/guide/src/docbkx/samples/methodnotallowedfault.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<methodNotAllowed xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="405">
-	<message>Method Not Allowed</message>
-	<details>Error Details...</details>
-</methodNotAllowed>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/missing_username.json b/docs/guide/src/docbkx/samples/missing_username.json
deleted file mode 100644
index a257f72ea0..0000000000
--- a/docs/guide/src/docbkx/samples/missing_username.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "What username?",
-  "details": "Error Details...",
-  "code": 400
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/missing_username.xml b/docs/guide/src/docbkx/samples/missing_username.xml
deleted file mode 100644
index 9d1330fc21..0000000000
--- a/docs/guide/src/docbkx/samples/missing_username.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<missingUsername xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="400">
-	<message>What username?</message>
-	<details>Error Details...</details>
-</missingUsername>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/mosso-id-authentication-response.json b/docs/guide/src/docbkx/samples/mosso-id-authentication-response.json
deleted file mode 100644
index e071f01c46..0000000000
--- a/docs/guide/src/docbkx/samples/mosso-id-authentication-response.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"token": {
-   "id": "DFW-c6dfc4456f6545f8b8265ff5b6bda775",
-   "expires_in": 16110
-}}
diff --git a/docs/guide/src/docbkx/samples/mosso-id-authentication-response.xml b/docs/guide/src/docbkx/samples/mosso-id-authentication-response.xml
deleted file mode 100644
index 6bce8a033e..0000000000
--- a/docs/guide/src/docbkx/samples/mosso-id-authentication-response.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<cloudAuth xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <token id="DFW-c6dfc4456f6545f8b8265ff5b6bda775" 
-        expires_in="16640"/>
-	<serviceCatalog xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-	    <service name="cloudFiles">
-	        <endpoint region="DFW" 
-	            v1Default="true" 
-	            publicURL="https://storage.clouddrive.com/v1/KovacsNastId" 
-	            internalURL="https://storage-snet.clouddrive.com/v1/KovacsNastId"/>
-	   </service>
-	   <service name="cloudServers">
-	        <endpoint v1Default="false" 
-	            publicURL="https://servers.api.rackspacecloud.com/v1.0/90000"/>
-	   </service>
-	</serviceCatalog>
-</cloudAuth>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/mossoCredentials.xml b/docs/guide/src/docbkx/samples/mossoCredentials.xml
deleted file mode 100644
index 1735233127..0000000000
--- a/docs/guide/src/docbkx/samples/mossoCredentials.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<mossoCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"  
-    mossoId="999112358"  
-    key="qauser-000-001" />
diff --git a/docs/guide/src/docbkx/samples/nastCredentials.xml b/docs/guide/src/docbkx/samples/nastCredentials.xml
deleted file mode 100644
index b478c3e651..0000000000
--- a/docs/guide/src/docbkx/samples/nastCredentials.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nastCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    nastId="nastid-qauser" 
-    key="qauser-000-001" />
diff --git a/docs/guide/src/docbkx/samples/password_recovery.json b/docs/guide/src/docbkx/samples/password_recovery.json
deleted file mode 100644
index 4650969a83..0000000000
--- a/docs/guide/src/docbkx/samples/password_recovery.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "customParams": {
-    "param": [
-      {
-        "name": "FirstName",
-        "value": "Steve"
-      }
-    ]
-  },
-  "callbackUrl": "http://www.someurl.com",
-  "templateUrl": "http://www.someurl.com",
-  "from": "email@email.com",
-  "replyTo": "replay@email.com",
-  "subject": "Password Recovery"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_recovery.xml b/docs/guide/src/docbkx/samples/password_recovery.xml
deleted file mode 100644
index d13922e7c1..0000000000
--- a/docs/guide/src/docbkx/samples/password_recovery.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordRecovery xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    subject="Password Recovery" 
-    replyTo="replay@email.com" 
-    from="email@email.com"
-    templateUrl="http://www.someurl.com" 
-    callbackUrl="http://www.someurl.com">
-    <customParams>
-        <params value="Steve" name="FirstName" />
-    </customParams>
-</passwordRecovery>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule.json b/docs/guide/src/docbkx/samples/password_rule.json
deleted file mode 100644
index fe03ec4a1f..0000000000
--- a/docs/guide/src/docbkx/samples/password_rule.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": 1,
-  "name": "Mininum Legth",
-  "message": "Password must be at least 7 characters long."
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule.xml b/docs/guide/src/docbkx/samples/password_rule.xml
deleted file mode 100644
index 7803822873..0000000000
--- a/docs/guide/src/docbkx/samples/password_rule.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordRule xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	message="Password must be at least 7 characters long." 
-	name="Mininum Legth"
-	id="1" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule_result.json b/docs/guide/src/docbkx/samples/password_rule_result.json
deleted file mode 100644
index 1c538dcebe..0000000000
--- a/docs/guide/src/docbkx/samples/password_rule_result.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "passed": true,
-  "ruleId": 1,
-  "ruleName": "Minimum Length",
-  "ruleMessage": "Password must be at least 7 characters long."
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule_result.xml b/docs/guide/src/docbkx/samples/password_rule_result.xml
deleted file mode 100644
index 3e17ddab44..0000000000
--- a/docs/guide/src/docbkx/samples/password_rule_result.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordRuleResult xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	ruleMessage="Password must be at least 7 characters long." 
-	ruleName="Minimum Length"
-	ruleId="1" 
-	passed="true" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule_results.json b/docs/guide/src/docbkx/samples/password_rule_results.json
deleted file mode 100644
index 4a811cf40a..0000000000
--- a/docs/guide/src/docbkx/samples/password_rule_results.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "passwordRuleResult": [
-    {
-      "passed": true,
-      "ruleId": 1,
-      "ruleName": "Minimum Length",
-      "ruleMessage": "Password must be at least 7 characters long."
-    },
-    {
-      "passed": true,
-      "ruleId": 2,
-      "ruleName": "Lowercase Character",
-      "ruleMessage": "Password must contain a lowercase character."
-    }
-  ]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule_results.xml b/docs/guide/src/docbkx/samples/password_rule_results.xml
deleted file mode 100644
index 8a48eb7006..0000000000
--- a/docs/guide/src/docbkx/samples/password_rule_results.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordRuleResults 
-    xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <passwordRuleResults 
-        ruleMessage="Password must be at least 7 characters."
-        ruleName="Minimum Length" 
-        ruleId="1" 
-        passed="true" />
-    <passwordRuleResults 
-        ruleMessage="Password must contain a lowercase."
-        ruleName="Lowercase Character" 
-        ruleId="2" 
-        passed="true" />
-</passwordRuleResults>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rules.json b/docs/guide/src/docbkx/samples/password_rules.json
deleted file mode 100644
index d65c3f9fcc..0000000000
--- a/docs/guide/src/docbkx/samples/password_rules.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "passwordRule": [
-    {
-      "id": 1,
-      "name": "Mininum Legth",
-      "message": "Password must be at least 7 characters long."
-    },
-    {
-      "id": 2,
-      "name": "Lowercase Character",
-      "message": "Password must contain a lowercase character."
-    }
-  ]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rules.xml b/docs/guide/src/docbkx/samples/password_rules.xml
deleted file mode 100644
index e6375876c2..0000000000
--- a/docs/guide/src/docbkx/samples/password_rules.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<passwordRules 
-    xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <passwordRule 
-        message="Password must be at least 7 characters."
-        name="Mininum Legth" 
-        id="1" />
-    <passwordRule 
-        message="Password must contain a lowercase." 
-        name="Lowercase Character" 
-        id="2" />
-</passwordRules>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_validation.json b/docs/guide/src/docbkx/samples/password_validation.json
deleted file mode 100644
index 3d4d86be14..0000000000
--- a/docs/guide/src/docbkx/samples/password_validation.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{"passwordRuleResults":{
-    "passwordRuleResults":[
-        {
-            "passed":true,
-            "ruleId":1,"ruleName":
-            "Mininumn Length",
-            "ruleMessage":"The password must be at least 7 characters long"
-        },
-        {
-            "passed":false,
-            "ruleId":2,"ruleName":
-            "Uppercase Rule","ruleMessage":
-            "The password must contain an uppercase charater"
-        }
-     ]},
-     "validPassword":false
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_validation.xml b/docs/guide/src/docbkx/samples/password_validation.xml
deleted file mode 100644
index a7619130f3..0000000000
--- a/docs/guide/src/docbkx/samples/password_validation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<passwordValidation xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	validPassword="true">
-	<passwordRuleResults>
-		<passwordRuleResults 
-		  ruleMessage="Password must be at least 7 characters long."
-		  ruleName="Minimum Length" 
-		  ruleId="1" 
-		  passed="true" />
-		<passwordRuleResults 
-		  ruleMessage="Password must contain a lowercase character."
-		  ruleName="Lowercase Character" 
-		  ruleId="2" 
-		  passed="true" />
-	</passwordRuleResults>
-</passwordValidation>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/passwordrotation.json b/docs/guide/src/docbkx/samples/passwordrotation.json
deleted file mode 100644
index 828289bbab..0000000000
--- a/docs/guide/src/docbkx/samples/passwordrotation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "enabled": true,
-  "duration": "60"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/passwordrotation.xml b/docs/guide/src/docbkx/samples/passwordrotation.xml
deleted file mode 100644
index d4316dc4b7..0000000000
--- a/docs/guide/src/docbkx/samples/passwordrotation.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<passwordRotationPolicy xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    enabled="true"
-    duration="90"
-</passwordRotationPolicy>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/passwordvalidationfault.json b/docs/guide/src/docbkx/samples/passwordvalidationfault.json
deleted file mode 100644
index 29b70594f4..0000000000
--- a/docs/guide/src/docbkx/samples/passwordvalidationfault.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Password Failed Validation",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/passwordvalidationfault.xml b/docs/guide/src/docbkx/samples/passwordvalidationfault.xml
deleted file mode 100644
index efe6c3e879..0000000000
--- a/docs/guide/src/docbkx/samples/passwordvalidationfault.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordValidationFault xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>Password Failed Validation</message>
-	<details>Error Details...</details>
-</passwordValidationFault>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/permission.json b/docs/guide/src/docbkx/samples/permission.json
deleted file mode 100644
index cb7b261cd2..0000000000
--- a/docs/guide/src/docbkx/samples/permission.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "value": "POST /customers",
-  "permissionId": "addCustomer",
-  "customerId": "RCN-000-000-000",
-  "clientId": "IDM",
-  "type": "application/text"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/permission.xml b/docs/guide/src/docbkx/samples/permission.xml
deleted file mode 100644
index d8157aa1a6..0000000000
--- a/docs/guide/src/docbkx/samples/permission.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<permission xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    type="application/text" 
-    clientId="IDM" 
-    customerId="RCN-000-000-000"
-    permissionId="addCustomer">POST /customers</permission>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/permissions.json b/docs/guide/src/docbkx/samples/permissions.json
deleted file mode 100644
index aef0cd9d11..0000000000
--- a/docs/guide/src/docbkx/samples/permissions.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "granted": {
-    "permission": [
-      {
-        "permissionId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      },
-      {
-        "permissionId": "getCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]
-  },
-  "defined": {
-    "permission": [
-      {
-        "permissionId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      },
-      {
-        "permissionId": "getCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/permissions.xml b/docs/guide/src/docbkx/samples/permissions.xml
deleted file mode 100644
index 84c2de6066..0000000000
--- a/docs/guide/src/docbkx/samples/permissions.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<permissions xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <granted>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="addCustomer"/>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="getCustomer"/>
-    </granted>
-    <defined>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="addCustomer"/>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="getCustomer"/>
-    </defined>
-</permissions>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/reset_user_password.json b/docs/guide/src/docbkx/samples/reset_user_password.json
deleted file mode 100644
index 38cb9e1f0e..0000000000
--- a/docs/guide/src/docbkx/samples/reset_user_password.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "password": "7ud$dnF"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/reset_user_password.xml b/docs/guide/src/docbkx/samples/reset_user_password.xml
deleted file mode 100644
index 187b91221a..0000000000
--- a/docs/guide/src/docbkx/samples/reset_user_password.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<userPassword xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    password="7ud$dnF" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/resourceId_conflict.json b/docs/guide/src/docbkx/samples/resourceId_conflict.json
deleted file mode 100644
index 7eaf859be8..0000000000
--- a/docs/guide/src/docbkx/samples/resourceId_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "ResourceId already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/resourceId_conflict.xml b/docs/guide/src/docbkx/samples/resourceId_conflict.xml
deleted file mode 100644
index 1710f51ce8..0000000000
--- a/docs/guide/src/docbkx/samples/resourceId_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<resourceIdConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>ResourceId already taken.</message>
-	<details>Error Details...</details>
-</resourceIdConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/role.json b/docs/guide/src/docbkx/samples/role.json
deleted file mode 100644
index bc4bb59da1..0000000000
--- a/docs/guide/src/docbkx/samples/role.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-      "name": "Admin",
-      "type": "RackspaceDefined"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/role.xml b/docs/guide/src/docbkx/samples/role.xml
deleted file mode 100644
index 3c91848d8c..0000000000
--- a/docs/guide/src/docbkx/samples/role.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<role type="RackspaceDefined" 
-	  name="Admin" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/roles.json b/docs/guide/src/docbkx/samples/roles.json
deleted file mode 100644
index 465f36b107..0000000000
--- a/docs/guide/src/docbkx/samples/roles.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "role": [
-    {
-      "name": "Admin",
-      "type": "RackspaceDefined"
-    },
-    {
-      "name": "HR",
-      "type": "CustomerDefined"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/roles.xml b/docs/guide/src/docbkx/samples/roles.xml
deleted file mode 100644
index e8b57c0a04..0000000000
--- a/docs/guide/src/docbkx/samples/roles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<roles xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <role type="RackspaceDefined" 
-        name="Admin" />
-    <role type="CustomerDefined" 
-        name="HR" />
-</roles>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/service-catalog-response.json b/docs/guide/src/docbkx/samples/service-catalog-response.json
deleted file mode 100644
index 6e6f6533a4..0000000000
--- a/docs/guide/src/docbkx/samples/service-catalog-response.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{"service": [
-      {
-      "endpoint": [      {
-         "region": "DFW",
-         "v1Default": true,
-         "publicURL": "https://storage.clouddrive.com/v1/KovacsNastId",
-         "internalURL": "https://storage-snet.clouddrive.com/v1/KovacsNastId",
-         "adminURL": null
-      }],
-      "name": "cloudFiles"
-   },
-      {
-      "endpoint": [      {
-         "region": null,
-         "v1Default": false,
-         "publicURL": "https://servers.api.rackspacecloud.com/v1.0/90000",
-         "internalURL": null,
-         "adminURL": null
-      }],
-      "name": "cloudServers"
-   }
-]}
diff --git a/docs/guide/src/docbkx/samples/service-catalog-response.xml b/docs/guide/src/docbkx/samples/service-catalog-response.xml
deleted file mode 100644
index 0cdb9222de..0000000000
--- a/docs/guide/src/docbkx/samples/service-catalog-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<serviceCatalog xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <service name="cloudFiles">
-        <endpoint region="DFW" 
-            v1Default="true" 
-            publicURL="https://storage.clouddrive.com/v1/KovacsNastId" 
-            internalURL="https://storage-snet.clouddrive.com/v1/KovacsNastId"/>
-   </service>
-   <service name="cloudServers">
-        <endpoint v1Default="false" 
-            publicURL="https://servers.api.rackspacecloud.com/v1.0/90000"/>
-   </service>
-</serviceCatalog>
diff --git a/docs/guide/src/docbkx/samples/customer.json b/docs/guide/src/docbkx/samples/tenant.json
similarity index 100%
rename from docs/guide/src/docbkx/samples/customer.json
rename to docs/guide/src/docbkx/samples/tenant.json
diff --git a/docs/guide/src/docbkx/samples/customer.xml b/docs/guide/src/docbkx/samples/tenant.xml
similarity index 100%
rename from docs/guide/src/docbkx/samples/customer.xml
rename to docs/guide/src/docbkx/samples/tenant.xml
diff --git a/docs/guide/src/docbkx/samples/customerlock.json b/docs/guide/src/docbkx/samples/tenantlock.json
similarity index 100%
rename from docs/guide/src/docbkx/samples/customerlock.json
rename to docs/guide/src/docbkx/samples/tenantlock.json
diff --git a/docs/guide/src/docbkx/samples/customerlock.xml b/docs/guide/src/docbkx/samples/tenantlock.xml
similarity index 100%
rename from docs/guide/src/docbkx/samples/customerlock.xml
rename to docs/guide/src/docbkx/samples/tenantlock.xml
diff --git a/docs/guide/src/docbkx/samples/customers.json b/docs/guide/src/docbkx/samples/tenants.json
similarity index 100%
rename from docs/guide/src/docbkx/samples/customers.json
rename to docs/guide/src/docbkx/samples/tenants.json
diff --git a/docs/guide/src/docbkx/samples/customers.xml b/docs/guide/src/docbkx/samples/tenants.xml
similarity index 100%
rename from docs/guide/src/docbkx/samples/customers.xml
rename to docs/guide/src/docbkx/samples/tenants.xml
diff --git a/docs/guide/src/docbkx/samples/token.json b/docs/guide/src/docbkx/samples/token.json
deleted file mode 100644
index a25f1530f9..0000000000
--- a/docs/guide/src/docbkx/samples/token.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "id": "309487987f0892397a9439875900b",
-  "expiresIn": 3600
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/token.xml b/docs/guide/src/docbkx/samples/token.xml
deleted file mode 100644
index 98b78611d2..0000000000
--- a/docs/guide/src/docbkx/samples/token.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<token xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    expires_in="3600" 
-    id="309487987f0892397a9439875900b" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/unauthorized.json b/docs/guide/src/docbkx/samples/unauthorized.json
deleted file mode 100644
index e969fc0ec9..0000000000
--- a/docs/guide/src/docbkx/samples/unauthorized.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Oh no you don't.",
-  "details": "Error Details...",
-  "code": 401
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/unauthorized.xml b/docs/guide/src/docbkx/samples/unauthorized.xml
deleted file mode 100644
index 6dad6bca2c..0000000000
--- a/docs/guide/src/docbkx/samples/unauthorized.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<unauthorized xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="401">
-	<message>Oh no you don't.</message>
-	<details>Error Details...</details>
-</unauthorized>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/unavailable.json b/docs/guide/src/docbkx/samples/unavailable.json
deleted file mode 100644
index b91a23e7d5..0000000000
--- a/docs/guide/src/docbkx/samples/unavailable.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "The IdM Service is Unavailable at the moment.",
-  "details": "Error Details...",
-  "code": 503
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/unavailable.xml b/docs/guide/src/docbkx/samples/unavailable.xml
deleted file mode 100644
index ebd9f106d8..0000000000
--- a/docs/guide/src/docbkx/samples/unavailable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<serviceUnavailable xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="503">
-	<message>The IdM Service is Unavailable at the moment.</message>
-	<details>Error Details...</details>
-</serviceUnavailable>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/updatedcustomer.json b/docs/guide/src/docbkx/samples/updatedtenant.json
similarity index 100%
rename from docs/guide/src/docbkx/samples/updatedcustomer.json
rename to docs/guide/src/docbkx/samples/updatedtenant.json
diff --git a/docs/guide/src/docbkx/samples/updatedcustomer.xml b/docs/guide/src/docbkx/samples/updatedtenant.xml
similarity index 100%
rename from docs/guide/src/docbkx/samples/updatedcustomer.xml
rename to docs/guide/src/docbkx/samples/updatedtenant.xml
diff --git a/docs/guide/src/docbkx/samples/updateduser.json b/docs/guide/src/docbkx/samples/updateduser.json
deleted file mode 100644
index 73a67c6a7b..0000000000
--- a/docs/guide/src/docbkx/samples/updateduser.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"user":
-    {
-      "id": "jqsmith",
-      "tenantId": "1234",
-      "email": "john.smith@somenewemail.org",
-      "enabled": true
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/updateduser.xml b/docs/guide/src/docbkx/samples/updateduser.xml
deleted file mode 100644
index c11bc8fc7e..0000000000
--- a/docs/guide/src/docbkx/samples/updateduser.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      email="john.smith@somenewemail.org" tenantId="1234"
-      id="jqsmith" enabled="true"/>
diff --git a/docs/guide/src/docbkx/samples/updateuser.json b/docs/guide/src/docbkx/samples/updateuser.json
deleted file mode 100644
index 2e431d9a4e..0000000000
--- a/docs/guide/src/docbkx/samples/updateuser.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"user":
-    {
-      "email": "john.smith@somenewemail.org",
-      "id": "jqsmith"
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/updateuser.xml b/docs/guide/src/docbkx/samples/updateuser.xml
deleted file mode 100644
index 7d1988e450..0000000000
--- a/docs/guide/src/docbkx/samples/updateuser.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      email="john.smith@somenewemail.org" id="jqsmith" />
diff --git a/docs/guide/src/docbkx/samples/user.json b/docs/guide/src/docbkx/samples/user.json
deleted file mode 100644
index 1051172ce7..0000000000
--- a/docs/guide/src/docbkx/samples/user.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "secret": {
-    "secretQuestion": "What is the middle name of your best fried, spelled backward?",
-    "secretAnswer": "sicnarF"
-  },
-  "password": {
-    "password": "C@n+f001me!"
-  },
-  "apiKey": {
-    "apiKey": "10388a8497547f8w77e"
-  },
-  "roles": [
-      {
-        "name": "Admin",
-        "type": "RackspaceDefined"
-      }
-    ],
-  "permissions": [
-      {
-        "description": "POST /users",
-        "name": "AddUser"
-      },
-      {}
-    ],
-  "username": "jqsmith",
-  "customerId": "RCN-000-000-000",
-  "customerInum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.EEEE",
-  "email": "john.smith@example.org",
-  "personId": "RPN-111-111-111",
-  "firstName": "John",
-  "middleName": "Quincy",
-  "lastName": "Smith",
-  "displayName": "John Smith",
-  "prefLanguage": "US_en",
-  "inum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!1111",
-  "iname": "@Example.Smith*John",
-  "region": "America/Chicago",
-  "status": "ACTIVE",
-  "locked": false,
-  "softDeleted": false
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user.xml b/docs/guide/src/docbkx/samples/user.xml
deleted file mode 100644
index c252696df8..0000000000
--- a/docs/guide/src/docbkx/samples/user.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="false" locked="false" 
-    status="ACTIVE" timeZone="America/Chicago"
-    region="SAT" iname="@Example.Smith*John" 
-    inum="@!FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!1111"
-    prefLanguage="US_en" displayName="John Smith" 
-    lastName="Smith" middleName="Quincy" 
-    firstName="John" personId="RPN-111-111-111" 
-    email="john.smith@example.org"
-    customerInum="@!FFFF.FFFF.FFFF.FFFF!EEEE.EEEE" 
-    customerId="RCN-000-000-000"
-    username="jqsmith">
-    <roles>
-        <role type="RackspaceDefined" 
-            name="Admin" />
-    </roles>
-</user>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userGroups.json b/docs/guide/src/docbkx/samples/userGroups.json
deleted file mode 100644
index dc7b3f3bcb..0000000000
--- a/docs/guide/src/docbkx/samples/userGroups.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"groups": {
-    "values" : [
-        {
-            "tenantId" : "1234",
-            "id" : "Admin",
-        },
-        {
-            "tenantId" : "1234",
-            "id" : "Technical",
-        },
-        {
-            "id" : "Customer",
-        }
-    ]
-}
-}
diff --git a/docs/guide/src/docbkx/samples/userGroups.xml b/docs/guide/src/docbkx/samples/userGroups.xml
deleted file mode 100644
index 16f73c5151..0000000000
--- a/docs/guide/src/docbkx/samples/userGroups.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<groups xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <group tenantId="1234" id="Admin" />
-    <group tenantId="1234" id="Technical"/>
-    <group id="Customer"/>
-</groups>
diff --git a/docs/guide/src/docbkx/samples/userWithOnlyLock.json b/docs/guide/src/docbkx/samples/userWithOnlyLock.json
deleted file mode 100644
index 11d640e69c..0000000000
--- a/docs/guide/src/docbkx/samples/userWithOnlyLock.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"user":
-    {
-      "enabled": "true"
-    }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userWithOnlyLock.xml b/docs/guide/src/docbkx/samples/userWithOnlyLock.xml
deleted file mode 100644
index 42eecba2e6..0000000000
--- a/docs/guide/src/docbkx/samples/userWithOnlyLock.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      enabled="true"/>
diff --git a/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.json b/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.json
deleted file mode 100644
index bc3a14ff0b..0000000000
--- a/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "softDeleted": "true"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.xml b/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.xml
deleted file mode 100644
index 6284eb549f..0000000000
--- a/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="true" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userWithOnlyStatus.json b/docs/guide/src/docbkx/samples/userWithOnlyStatus.json
deleted file mode 100644
index d4bd36c920..0000000000
--- a/docs/guide/src/docbkx/samples/userWithOnlyStatus.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "status": "INACTIVE"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userWithOnlyStatus.xml b/docs/guide/src/docbkx/samples/userWithOnlyStatus.xml
deleted file mode 100644
index 30e7b12717..0000000000
--- a/docs/guide/src/docbkx/samples/userWithOnlyStatus.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    status="ACTIVE" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_api_key.json b/docs/guide/src/docbkx/samples/user_api_key.json
deleted file mode 100644
index ff5dd33af7..0000000000
--- a/docs/guide/src/docbkx/samples/user_api_key.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"user":
-    {
-      "password": "P@$$word1"
-    }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_api_key.xml b/docs/guide/src/docbkx/samples/user_api_key.xml
deleted file mode 100644
index 24f8693572..0000000000
--- a/docs/guide/src/docbkx/samples/user_api_key.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      password="P@$$word1"/>
diff --git a/docs/guide/src/docbkx/samples/user_credentials.json b/docs/guide/src/docbkx/samples/user_credentials.json
deleted file mode 100644
index dbcb997709..0000000000
--- a/docs/guide/src/docbkx/samples/user_credentials.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "newPassword": {
-    "password": "newpassword"
-  },
-  "currentPassword": {
-    "password": "oldpassword"
-  }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_credentials.xml b/docs/guide/src/docbkx/samples/user_credentials.xml
deleted file mode 100644
index 56dc27760f..0000000000
--- a/docs/guide/src/docbkx/samples/user_credentials.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<userCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <newPassword password="newpassword" />
-    <currentPassword password="oldpassword" />
-</userCredentials>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_disabled.json b/docs/guide/src/docbkx/samples/user_disabled.json
deleted file mode 100644
index 5eeb83f247..0000000000
--- a/docs/guide/src/docbkx/samples/user_disabled.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "The user has been disabled.",
-  "details": "Error Details...",
-  "code": 403
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_disabled.xml b/docs/guide/src/docbkx/samples/user_disabled.xml
deleted file mode 100644
index 9f6b528e5a..0000000000
--- a/docs/guide/src/docbkx/samples/user_disabled.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<userDisabled xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    code="409">
-    <message>The user has been disabled.</message>
-    <details>Error Details...</details>
-</userDisabled>
diff --git a/docs/guide/src/docbkx/samples/user_password.json b/docs/guide/src/docbkx/samples/user_password.json
deleted file mode 100644
index 1e1643b9e9..0000000000
--- a/docs/guide/src/docbkx/samples/user_password.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "password": "newpassword"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_password.xml b/docs/guide/src/docbkx/samples/user_password.xml
deleted file mode 100644
index ba8a49cbd9..0000000000
--- a/docs/guide/src/docbkx/samples/user_password.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<userPassword xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    password="newpassword" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_secret.json b/docs/guide/src/docbkx/samples/user_secret.json
deleted file mode 100644
index e0a4a6a873..0000000000
--- a/docs/guide/src/docbkx/samples/user_secret.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "secretQuestion": "Is this a secret question?",
-  "secretAnswer": "Not a very good one."
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_secret.xml b/docs/guide/src/docbkx/samples/user_secret.xml
deleted file mode 100644
index d1ab561092..0000000000
--- a/docs/guide/src/docbkx/samples/user_secret.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<userSecret xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    secretAnswer="Not a very good one." 
-    secretQuestion="Is this a secret question?" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/usernameCredentials.xml b/docs/guide/src/docbkx/samples/usernameCredentials.xml
deleted file mode 100644
index 4d03497d9a..0000000000
--- a/docs/guide/src/docbkx/samples/usernameCredentials.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<usernameCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    username="qauser"
-    key="qauser-000-001" />
diff --git a/docs/guide/src/docbkx/samples/username_conflict.json b/docs/guide/src/docbkx/samples/username_conflict.json
deleted file mode 100644
index e30c009d49..0000000000
--- a/docs/guide/src/docbkx/samples/username_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Username already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/username_conflict.xml b/docs/guide/src/docbkx/samples/username_conflict.xml
deleted file mode 100644
index a3d3dbbcca..0000000000
--- a/docs/guide/src/docbkx/samples/username_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<usernameConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>Username already taken.</message>
-	<details>Error Details...</details>
-</usernameConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/users.json b/docs/guide/src/docbkx/samples/users.json
deleted file mode 100644
index 4bac51c98f..0000000000
--- a/docs/guide/src/docbkx/samples/users.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{"users": {
-    "values" :  [
-        {
-            "id": "jqsmith",
-            "tenantId": "1234",
-            "email": "john.smith@example.org",
-            "enabled": true
-        },
-        {
-            "id": "jdoe",
-            "tenantId": "1234",
-            "email": "john.doe@example.org",
-            "enabled": true
-        }
-    ]
-}
-}
diff --git a/docs/guide/src/docbkx/samples/users.xml b/docs/guide/src/docbkx/samples/users.xml
deleted file mode 100644
index c30c1550f0..0000000000
--- a/docs/guide/src/docbkx/samples/users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<users xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <user enabled="true" tenantId="1234"
-          email="john.smith@example.org" id="jqsmith"/>
-    <user enabled="true" tenantId="1234"
-          email="john.doe@example.org" id="jdoe"/>
-</users>