diff --git a/api-ref-guides/pom.xml b/api-ref-guides/pom.xml
index 07cfad1bb..bc6d7f2d5 100644
--- a/api-ref-guides/pom.xml
+++ b/api-ref-guides/pom.xml
@@ -39,7 +39,7 @@
             <!-- version is set in ../pom.xml file -->
             <executions>
                <!-- Configuration for OpenStack API Guide -->
-               <execution>
+                <execution>
                   <id>os-api-ref</id>
                   <goals>
                      <goal>generate-pdf</goal>
@@ -126,7 +126,7 @@
                      <includes> bk-api-ref-data-processing-v1.1.xml </includes>
                      <pdfFilenameBase>api-ref-data-processing-v1.1</pdfFilenameBase>
                   </configuration>
-               </execution>
+               </execution> 
                <execution>
                   <id>os-api-ref-identity-v3</id>
                   <goals>
diff --git a/api-ref/src/docbkx/ch_identity-admin-v2.xml b/api-ref/src/docbkx/ch_identity-admin-v2.xml
index a02bd4af5..558c84264 100644
--- a/api-ref/src/docbkx/ch_identity-admin-v2.xml
+++ b/api-ref/src/docbkx/ch_identity-admin-v2.xml
@@ -17,7 +17,7 @@
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="admin-extensions">
+    <!-- <section xml:id="admin-extensions">
         <title>Extensions</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource href="../wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-extensions">
@@ -27,7 +27,7 @@
                 <wadl:method href="#admin-getExtension-v2.0"/>
             </wadl:resource>
         </wadl:resources>
-    </section>
+    </section> -->
     <section xml:id="admin-tokens">
         <title>Tokens</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
diff --git a/api-ref/src/docbkx/ch_identity-v2.xml b/api-ref/src/docbkx/ch_identity-v2.xml
index ea37f5358..0307efa79 100644
--- a/api-ref/src/docbkx/ch_identity-v2.xml
+++ b/api-ref/src/docbkx/ch_identity-v2.xml
@@ -23,7 +23,7 @@
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="identity-api-extensions">
+    <!-- <section xml:id="identity-api-extensions">
         <title>Extensions</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
@@ -35,7 +35,7 @@
                 <wadl:method href="#getExtension-v2.0"/>
             </wadl:resource>
         </wadl:resources>
-    </section>
+    </section> -->
     <section xml:id="identity-auth-v2">
         <title>Tokens</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/auth.json
index a7c6dd6f6..a1025e2cf 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/auth.json
@@ -175,4 +175,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_admin.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_admin.json
index 7d653dce9..d1bb7afb2 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_admin.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_admin.json
@@ -175,4 +175,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_admin.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_admin.xml
deleted file mode 100644
index 40f51b4e9..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_admin.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<access xmlns="http://docs.openstack.org/identity/api/v2.0">
-        <token issued_at="2014-01-30T15:49:11.054709"
-                expires="2014-01-31T15:49:11Z" id="admin_id">
-                <tenant enabled="true" name="admin"
-                        id="fc394f2ab2df4114bde39905f800dc57"/>
-        </token>
-        <serviceCatalog>
-                <service type="compute" name="nova">
-                        <endpoints_links/>
-                        <endpoint
-                                adminURL="http://23.253.72.207:8774/v2/fc394f2ab2df4114bde39905f800dc57"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:8774/v2/fc394f2ab2df4114bde39905f800dc57"
-                                internalURL="http://23.253.72.207:8774/v2/fc394f2ab2df4114bde39905f800dc57"
-                                id="2dad48f09e2a447a9bf852bcd93548ef"
-                        />
-                </service>
-                <service type="network" name="neutron">
-                        <endpoints_links/>
-                        <endpoint
-                                adminURL="http://23.253.72.207:9696/"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:9696/"
-                                internalURL="http://23.253.72.207:9696/"
-                                id="97c526db8d7a4c88bbb8d68db1bdcdb8"
-                        />
-                </service>
-                <service type="volumev2" name="cinder">
-                        <endpoints_links/>
-                        <endpoint
-                                adminURL="http://23.253.72.207:8776/v2/fc394f2ab2df4114bde39905f800dc57"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:8776/v2/fc394f2ab2df4114bde39905f800dc57"
-                                internalURL="http://23.253.72.207:8776/v2/fc394f2ab2df4114bde39905f800dc57"
-                                id="93f86dfcbba143a39a33d0c2cd424870"
-                        />
-                </service>
-                <service type="computev3" name="nova">
-                        <endpoints_links/>
-                        <endpoint
-                                adminURL="http://23.253.72.207:8774/v3"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:8774/v3"
-                                internalURL="http://23.253.72.207:8774/v3"
-                                id="3eb274b12b1d47b2abc536038d87339e"
-                        />
-                </service>
-                <service type="s3" name="s3">
-                        <endpoints_links/>
-                        <endpoint adminURL="http://23.253.72.207:3333"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:3333"
-                                internalURL="http://23.253.72.207:3333"
-                                id="957f1e54afc64d33a62099faa5e980a2"
-                        />
-                </service>
-                <service type="image" name="glance">
-                        <endpoints_links/>
-                        <endpoint adminURL="http://23.253.72.207:9292"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:9292"
-                                internalURL="http://23.253.72.207:9292"
-                                id="27d5749f36864c7d96bebf84a5ec9767"
-                        />
-                </service>
-                <service type="volume" name="cinder">
-                        <endpoints_links/>
-                        <endpoint
-                                adminURL="http://23.253.72.207:8776/v1/fc394f2ab2df4114bde39905f800dc57"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:8776/v1/fc394f2ab2df4114bde39905f800dc57"
-                                internalURL="http://23.253.72.207:8776/v1/fc394f2ab2df4114bde39905f800dc57"
-                                id="37c83a2157f944f1972e74658aa0b139"
-                        />
-                </service>
-                <service type="ec2" name="ec2">
-                        <endpoints_links/>
-                        <endpoint
-                                adminURL="http://23.253.72.207:8773/services/Admin"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:8773/services/Cloud"
-                                internalURL="http://23.253.72.207:8773/services/Cloud"
-                                id="289b59289d6048e2912b327e5d3240ca"
-                        />
-                </service>
-                <service type="object-store" name="swift">
-                        <endpoints_links/>
-                        <endpoint adminURL="http://23.253.72.207:8080"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:8080/v1/AUTH_fc394f2ab2df4114bde39905f800dc57"
-                                internalURL="http://23.253.72.207:8080/v1/AUTH_fc394f2ab2df4114bde39905f800dc57"
-                                id="16b76b5e5b7d48039a6e4cc3129545f3"
-                        />
-                </service>
-                <service type="identity" name="keystone">
-                        <endpoints_links/>
-                        <endpoint
-                                adminURL="http://23.253.72.207:35357/v2.0"
-                                region="RegionOne"
-                                publicURL="http://23.253.72.207:5000/v2.0"
-                                internalURL="http://23.253.72.207:5000/v2.0"
-                                id="26af053673df4ef3a2340c4239e21ea2"
-                        />
-                </service>
-        </serviceCatalog>
-        <user username="admin" id="9a6590b2ab024747bc2167c4e064d00d"
-                name="admin">
-                <roles_links/>
-                <role name="Member"/>
-                <role name="anotherrole"/>
-        </user>
-        <metadata is_admin="0">
-                <roles>
-                        <role>7598ac3c634d4c3da4b9126a5f67ca2b</role>
-                        <role>f95c0ab82d6045d9805033ee1fbc80d4</role>
-                </roles>
-        </metadata>
-</access>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_credentials_admin.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_credentials_admin.xml
deleted file mode 100644
index 988403348..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_credentials_admin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<auth xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://docs.openstack.org/identity/api/v2.0"
-  tenantName="admin">
-  <passwordCredentials username="admin" password="secretsecret"/>
-</auth>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_token_request.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_token_request.json
index 461b90cd1..d9513c7a6 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_token_request.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_token_request.json
@@ -5,4 +5,4 @@
             "id": "cbc36478b0bd8e67e89469c7749d4127"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_token_request.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_token_request.xml
deleted file mode 100644
index e95ee3e12..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/auth_token_request.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<auth xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://docs.openstack.org/identity/api/v2.0"
-  tenantName="demo">
-  <token id="cbc36478b0bd8e67e89469c7749d4127"/>
-</auth>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.json
index 6cca39735..838d467c5 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.json
@@ -119,4 +119,4 @@
             "publicURL": "https://keystone.region-one.public.com/v2.0"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml
deleted file mode 100644
index 8505d5c24..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<endpoints xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <endpoint name="nova"
-        adminURL="https://nova.region-one.internal.com/v2/be1319401cfa4a0aa590b97cc7b64d8d"
-        region="RegionOne"
-        internalURL="https://nova.region-one.internal.com/v2/be1319401cfa4a0aa590b97cc7b64d8d"
-        type="compute" id="11b41ee1b00841128b7333d4bf1a6140"
-        publicURL="https://nova.region-one.public.com/v2/be1319401cfa4a0aa590b97cc7b64d8d"/>
-    <endpoint name="neutron"
-        adminURL="https://neutron.region-one.internal.com/"
-        region="RegionOne"
-        internalURL="https://neutron.region-one.internal.com/"
-        type="network" id="cdbfa3c416d741a9b5c968f2dc628acb"
-        publicURL="https://neutron.region-one.public.com/"/>
-    <endpoint name="cinderv2"
-        adminURL="https://cinderv2.region-one.internal.com/v2/be1319401cfa4a0aa590b97cc7b64d8d"
-        region="RegionOne"
-        internalURL="https://cinderv2.region-one.internal.com/v2/be1319401cfa4a0aa590b97cc7b64d8d"
-        type="volumev2" id="6de282e4132747ecb48f6fd8c525c6f6"
-        publicURL="https://cinderv2.region-one.public.com/v2/be1319401cfa4a0aa590b97cc7b64d8d"/>
-    <endpoint name="trove"
-        adminURL="https://trove.region-one.internal.com/v1.0/be1319401cfa4a0aa590b97cc7b64d8d"
-        region="RegionOne"
-        internalURL="https://trove.region-one.internal.com/v1.0/be1319401cfa4a0aa590b97cc7b64d8d"
-        type="database" id="4bfad53a0c684bd981d093099eb7799b"
-        publicURL="https://trove.region-one.public.com/v1.0/be1319401cfa4a0aa590b97cc7b64d8d"/>
-    <endpoint name="s3" adminURL="https://s3.region-one.internal.com"
-        region="RegionOne"
-        internalURL="https://s3.region-one.internal.com" type="s3"
-        id="50fb6b43cde44bb6b0e471a682dc42dd"
-        publicURL="https://s3.region-one.public.com"/>
-    <endpoint name="glance"
-        adminURL="https://glance.region-one.internal.com"
-        region="RegionOne"
-        internalURL="https://glance.region-one.internal.com"
-        type="image" id="838a338171164c3c8f56e6b5882267ff"
-        publicURL="https://glance.region-one.public.com"/>
-    <endpoint name="novav3"
-        adminURL="https://novav3.region-one.internal.com/v3"
-        region="RegionOne"
-        internalURL="https://novav3.region-one.internal.com/v3"
-        type="computev3" id="b437edd03d244bf4be605b9b8c8689e0"
-        publicURL="https://novav3.region-one.public.com/v3"/>
-    <endpoint name="heat"
-        adminURL="https://heat.region-one.internal.com/v1"
-        region="RegionOne"
-        internalURL="https://heat.region-one.internal.com/v1"
-        type="cloudformation" id="7a0f6f37344d488fa596a1325e0fcf10"
-        publicURL="https://heat.region-one.public.com/v1"/>
-    <endpoint name="cinder"
-        adminURL="https://cinderv2.region-one.internal.com/v1/be1319401cfa4a0aa590b97cc7b64d8d"
-        region="RegionOne"
-        internalURL="https://cinderv2.region-one.internal.com/v1/be1319401cfa4a0aa590b97cc7b64d8d"
-        type="volume" id="d4f251065dce4ce3946d3c1b87e167f2"
-        publicURL="https://cinderv2.region-one.public.com/v1/be1319401cfa4a0aa590b97cc7b64d8d"/>
-    <endpoint name="ec2"
-        adminURL="https://ec2.region-one.internal.com/services/Admin"
-        region="RegionOne"
-        internalURL="https://ec2.region-one.internal.com/services/Cloud"
-        type="ec2" id="44c6bf28d9bd4d63bfb00d66f22439a8"
-        publicURL="https://ec2.region-one.public.com/services/Cloud"/>
-    <endpoint name="heat"
-        adminURL="https://heat.region-one.internal.com/v1/be1319401cfa4a0aa590b97cc7b64d8d"
-        region="RegionOne"
-        internalURL="https://heat.region-one.internal.com/v1/be1319401cfa4a0aa590b97cc7b64d8d"
-        type="orchestration" id="21aaace3f33c46b8aaea2b17d41ffd54"
-        publicURL="https://heat.region-one.public.com/v1/be1319401cfa4a0aa590b97cc7b64d8d"/>
-    <endpoint name="swift"
-        adminURL="https://swift.region-one.internal.com"
-        region="RegionOne"
-        internalURL="https://swift.region-one.internal.com/v1/AUTH_be1319401cfa4a0aa590b97cc7b64d8d"
-        type="object-store" id="35f7aca3be384580a3b1df43a97c2eb2"
-        publicURL="https://swift.region-one.public.com/v1/AUTH_be1319401cfa4a0aa590b97cc7b64d8d"/>
-    <endpoint name="keystone"
-        adminURL="https://keystone.region-one.internal.com/v2.0"
-        region="RegionOne"
-        internalURL="https://keystone.region-one.internal.com/v2.0"
-        type="identity" id="48da758fb58c47dcaf02000a4409a265"
-        publicURL="https://keystone.region-one.public.com/v2.0"/>
-</endpoints>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.json
index e28e67245..399f36975 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.json
@@ -13,4 +13,4 @@
         "alias": "s3tokens",
         "description": "OpenStack S3 API."
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.xml
deleted file mode 100644
index 8ca22b0e5..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension xmlns="http://docs.openstack.org/common/api/v1.0"
-    xmlns:atom="http://www.w3.org/2005/Atom"
-    name="User Metadata Extension"
-    namespace="http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0"
-    alias="RS-META" updated="2011-01-12T11:22:33-06:00">
-    <description>Allows associating arbitrary metadata with a
-        user.</description>
-    <atom:link rel="describedby" type="application/pdf"
-        href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"/>
-    <atom:link rel="describedby" type="application/vnd.sun.wadl+xml"
-        href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"
-    />
-</extension>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/extensions.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/extensions.json
index e457acedf..db514fb86 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/extensions.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/extensions.json
@@ -87,4 +87,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/extensions.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/extensions.xml
deleted file mode 100644
index aece564c3..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/extensions.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extensions xmlns="http://docs.openstack.org/common/api/v1.0"
-            xmlns:atom="http://www.w3.org/2005/Atom"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/role.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/role.json
index 692347f57..2df605f55 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/role.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/role.json
@@ -4,4 +4,4 @@
         "name": "Guest",
         "description": "Guest Access"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/role.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/role.xml
deleted file mode 100644
index dd25cfff8..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/role.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<role xmlns="http://docs.openstack.org/identity/api/v2.0"
-  id="123" name="Admin" description="All Access" />
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/roles.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/roles.json
index cad2ba4f5..ed3b58bd2 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/roles.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/roles.json
@@ -7,4 +7,4 @@
         }
     ],
     "roles_links": []
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/roles.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/roles.xml
deleted file mode 100644
index a3f37251c..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/roles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
-  <role id="123" name="Admin" description="All Access"/>
-  <role id="234" name="Guest" description="Guest Access"/>
-</roles>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenant.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenant.json
index 9e0d4f88f..05fad705f 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenant.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenant.json
@@ -5,4 +5,4 @@
         "description": "A description ...",
         "enabled": true
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenant.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenant.xml
deleted file mode 100644
index 8bfa520b1..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenant.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
-    enabled="true" id="1234" name="ACME Corp">
-    <description>A description...</description>
-</tenant>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenantlock.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenantlock.json
index 4d6f9bf2c..9b508fd87 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenantlock.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenantlock.json
@@ -2,4 +2,4 @@
     "tenant": {
         "description": "A NEW description..."
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-1.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-1.json
index 6360f7862..5c260926e 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-1.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-1.json
@@ -13,4 +13,4 @@
             "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-2.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-2.json
index d295505e2..99cd9f376 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-2.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-2.json
@@ -17,4 +17,4 @@
             "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-3.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-3.json
index e876bbd49..1a84592ed 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-3.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-3.json
@@ -13,4 +13,4 @@
             "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-request-XML.txt b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-request-XML.txt
deleted file mode 100644
index 7239ac9d8..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants-request-XML.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GET /v2.0/tenants HTTP/1.1
-Host: identity.api.openstack.org
-Content-Type: application/xml
-X-Auth-Token: fa8426a0-8eaf-4d22-8e13-7c1b16a9370c
-Accept: application/xml
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants.json
index 497a628b9..f825128dc 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants.json
@@ -14,4 +14,4 @@
         }
     ],
     "tenants_links": []
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants.xml
deleted file mode 100644
index 6320d58fa..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenants.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tenants xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <tenant enabled="true" id="1234" name="ACME Corp">
-        <description>A description...</description>
-    </tenant>
-    <tenant enabled="true" id="3645" name="Iron Works">
-        <description>A description...</description>
-    </tenant>
-</tenants>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenantwithoutid.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenantwithoutid.json
index 6791da676..b18dc9665 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/tenantwithoutid.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/tenantwithoutid.json
@@ -4,4 +4,4 @@
         "description": "A description ...",
         "enabled": true
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/user.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/user.json
index f395bb63d..78c8dfea7 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/user.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/user.json
@@ -5,4 +5,4 @@
         "email": "john.smith@example.org",
         "enabled": true
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/user.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/user.xml
deleted file mode 100644
index 2102a42bf..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/user.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/identity/api/v2.0"
-      enabled="true" email="john.smith@example.org" name="jqsmith"
-      id="u1000"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/users.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/users.json
index db5b5ad93..06c3e0f8d 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/users.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/users.json
@@ -14,4 +14,4 @@
         }
     ],
     "users_links": []
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithenabledonly.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithenabledonly.json
index 62efdf886..65beabab7 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithenabledonly.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithenabledonly.json
@@ -2,4 +2,4 @@
     "user": {
         "enabled": true
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.json
index e36703752..55e8171bd 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.json
@@ -4,4 +4,4 @@
         "email": "john.smith@example.org",
         "enabled": true
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/validatetoken.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/validatetoken.json
index 170db5d2d..43d1a8a07 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/validatetoken.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/validatetoken.json
@@ -1,30 +1,28 @@
 {
-   "access":{
-      "token":{
-         "id":"ab48a9efdfedb23ty3494",
-         "expires":"2010-11-01T03:32:15-05:00",
-         "tenant":{
-            "id":"345",
-            "name":"My Project"
-         }
-      },
-      "user":{
-         "id":"123",
-         "name":"jqsmith",
-         "roles":[
-            {
-               "id":"234",
-               "name":"compute:admin"
-            },
-            {
-               "id":"234",
-               "name":"object-store:admin",
-               "tenantId":"1"
+    "access": {
+        "token": {
+            "id": "ab48a9efdfedb23ty3494",
+            "expires": "2010-11-01T03:32:15-05:00",
+            "tenant": {
+                "id": "345",
+                "name": "My Project"
             }
-         ],
-         "roles_links":[
-
-         ]
-      }
-   }
-}
\ No newline at end of file
+        },
+        "user": {
+            "id": "123",
+            "name": "jqsmith",
+            "roles": [
+                {
+                    "id": "234",
+                    "name": "compute:admin"
+                },
+                {
+                    "id": "234",
+                    "name": "object-store:admin",
+                    "tenantId": "1"
+                }
+            ],
+            "roles_links": []
+        }
+    }
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/validatetoken.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/validatetoken.xml
deleted file mode 100644
index 1ccc2b3f3..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/validatetoken.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<access xmlns="http://docs.openstack.org/identity/api/v2.0">
-        <token id="ab48a9efdfedb23ty3494"
-                expires="2010-11-01T03:32:15-05:00">
-                <tenant id="456" name="My Project"/>
-        </token>
-        <user id="123" username="jqsmith">
-                <roles
-                        xmlns="http://docs.openstack.org/identity/api/v2.0">
-                        <role id="123" name="Admin" tenantId="one"/>
-                        <role id="234" name="object-store:admin"
-                                tenantId="1"/>
-                </roles>
-        </user>
-</access>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
index fb5dd954f..45cf6d3e9 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
@@ -195,13 +195,6 @@
                         <xsdxt:code href="../samples/extensions.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml" element="capi:extensions">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="List extensions: XML response">
-                        <xsdxt:code href="../samples/extensions.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
                 <param name="next" style="plain" type="xsd:anyURI"
                     path="/capi:extensions/atom:link[@rel='next']/@href">
                     <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -226,20 +219,13 @@
             <para>Specify the extension alias in the URI.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="capi:extension">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="Get extension details: JSON response">
                         <xsdxt:code href="../samples/extension.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="capi:extension">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Get extension details: XML response">
-                        <xsdxt:code href="../samples/extension.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
     <!-- Token Operations -->
     <method name="POST" id="admin-authenticate">
@@ -269,13 +255,6 @@
                         <xsdxt:code href="../samples/auth_credentials_admin.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml" element="identity:auth">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Authenticate with credentials: XML request">
-                        <xsdxt:code href="../samples/auth_credentials_admin.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="tenantName" style="plain"
                     required="false" type="xsd:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"><para>The tenant name. Both the
@@ -331,13 +310,6 @@
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:auth">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Authenticate with token: XML request">
-                        <xsdxt:code href="../samples/auth_token_request.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </request>
         <response status="200 203">
             <representation mediaType="application/json" element="identity:access">
@@ -346,13 +318,6 @@
                         <xsdxt:code href="../samples/auth_admin.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml" element="identity:access">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Authenticate with credentials: XML response">
-                        <xsdxt:code href="../samples/auth_admin.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="access" style="plain"
                     required="true" type="xsd:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"><para>An <code>access</code>
@@ -457,20 +422,13 @@
                     (<code>404</code>) fault for an token that is not valid.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:access">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="Validate token: JSON response">
                         <xsdxt:code href="../samples/validatetoken.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:access">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Validate token: XML response">
-                        <xsdxt:code href="../samples/validatetoken.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
     <method name="HEAD" id="admin-checkToken">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Validate token (admin)">
@@ -487,20 +445,13 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:endpoints">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="List endpoints for token: JSON response">
                         <xsdxt:code href="../samples/endpoints.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:endpoints">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="List endpoints for token: XML response">
-                        <xsdxt:code href="../samples/endpoints.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
     <!--User Operations-->
     <method name="POST" id="admin-addUser">
@@ -508,15 +459,10 @@
             <para role="shortdesc">Adds a user.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:user">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                     <xsdxt:code href="../samples/user.json"/>
                 </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml" element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="../samples/user.xml"/>
-                </wadl:doc>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="X-Auth-Token" style="header"
                     type="xsd:string" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">A valid
@@ -550,11 +496,6 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                     <xsdxt:code href="../samples/user.json"/>
                 </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="../samples/user.xml"/>
-                </wadl:doc>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="id" style="plain"
                     type="xsd:string" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">The user
@@ -582,15 +523,10 @@
             <para role="shortdesc">Updates a user.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:user">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                     <xsdxt:code href="../samples/user.json"/>
                 </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml" element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="../samples/user.xml"/>
-                </wadl:doc>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="id" style="plain"
                     type="xsd:string" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">The user
@@ -618,11 +554,6 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                     <xsdxt:code href="../samples/user.json"/>
                 </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="../samples/user.xml"/>
-                </wadl:doc>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="id" style="plain"
                     type="xsd:string" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">The user
@@ -664,12 +595,7 @@
             </param>
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml" element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="../samples/user.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:user">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                     <xsdxt:code href="../samples/user.json"/>
                 </wadl:doc>
@@ -682,12 +608,7 @@
                 ID.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/xml" element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="../samples/user.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:user">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                     <xsdxt:code href="../samples/user.json"/>
                 </wadl:doc>
@@ -702,20 +623,13 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:roles">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="List user global roles: JSON response">
                         <xsdxt:code href="../samples/roles.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:roles">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="List user global roles: XML response">
-                        <xsdxt:code href="../samples/roles.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
 
     <!-- Tenant Operations -->
@@ -734,20 +648,13 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:tenants">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="Get tenants: JSON response">
                         <xsdxt:code href="../samples/tenants.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:tenants">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Get tenants: XML response">
-                        <xsdxt:code href="../samples/tenants.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
     <method name="GET" id="admin-getTenantByName">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -765,20 +672,13 @@
             </representation>
         </request>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:tenant">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="Get tenant by name: JSON response">
                         <xsdxt:code href="../samples/tenant.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:tenant">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Get tenant by name: XML response">
-                        <xsdxt:code href="../samples/tenant.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
     <method name="GET" id="admin-getTenantById">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -786,20 +686,13 @@
             <para role="shortdesc">Gets detailed information about a specified tenant by ID.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:tenant">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="Get tenant by ID: JSON response">
                         <xsdxt:code href="../samples/tenant.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:tenant">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Get tenant by ID: XML response">
-                        <xsdxt:code href="../samples/tenant.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
     <method name="GET" id="admin-listRolesForUserOnTenant">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List roles for user">
@@ -810,19 +703,12 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:roles">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="List roles for user: JSON response">
                         <xsdxt:code href="../samples/roles.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:roles">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="List roles for user: XML response">
-                        <xsdxt:code href="../samples/roles.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
 </application>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
index 7a75c21e1..b65934f68 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
@@ -108,13 +108,6 @@
                         <xsdxt:code href="../samples/extensions.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml" element="capi:extensions">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="List extensions: XML response">
-                        <xsdxt:code href="../samples/extensions.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
                 <param name="next" style="plain" type="xsd:anyURI"
                     path="/capi:extensions/atom:link[@rel='next']/@href">
                     <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -139,20 +132,13 @@
             <para>Specify the extension alias in the URI.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="capi:extension">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="Get extension details: JSON response">
                         <xsdxt:code href="../samples/extension.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="capi:extension">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Get extension details: XML response">
-                        <xsdxt:code href="../samples/extension.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
     <!-- Token Operations -->
     <method name="POST" id="authenticate-v2.0">
@@ -235,13 +221,6 @@
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:auth">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="Authenticate with token: XML request">
-                        <xsdxt:code href="../samples/auth_token_request.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </request>
         <response status="200 203"> <representation mediaType="application/json"
                 element="identity:access">
@@ -350,28 +329,14 @@
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:tenants">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="List tenants: HTTP/XML request">
-                        <xsdxt:code href="../samples/tenants-request-XML.txt"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </request>
         <response status="200 203">
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:tenants">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample title="List tenants: JSON response">
                         <xsdxt:code href="../samples/tenants.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml" element="identity:tenants">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample title="List tenants: XML response">
-                        <xsdxt:code href="../samples/tenants.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
 </application>
diff --git a/api-ref/src/wadls/identity-api/src/v3/wadl/samples/OS-TRUST/trust-POST-req.json b/api-ref/src/wadls/identity-api/src/v3/samples/OS-TRUST/trust-POST-req.json
similarity index 100%
rename from api-ref/src/wadls/identity-api/src/v3/wadl/samples/OS-TRUST/trust-POST-req.json
rename to api-ref/src/wadls/identity-api/src/v3/samples/OS-TRUST/trust-POST-req.json
diff --git a/api-ref/src/wadls/identity-api/src/v3/wadl/samples/OS-TRUST/trust-POST-resp.json b/api-ref/src/wadls/identity-api/src/v3/samples/OS-TRUST/trust-POST-resp.json
similarity index 100%
rename from api-ref/src/wadls/identity-api/src/v3/wadl/samples/OS-TRUST/trust-POST-resp.json
rename to api-ref/src/wadls/identity-api/src/v3/samples/OS-TRUST/trust-POST-resp.json
diff --git a/api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.json b/api-ref/src/wadls/identity-api/src/v3/samples/identity-versions-response.json
similarity index 100%
rename from api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.json
rename to api-ref/src/wadls/identity-api/src/v3/samples/identity-versions-response.json
diff --git a/api-ref/src/wadls/identity-api/src/v3/wadl/OS-TRUST-v3.wadl b/api-ref/src/wadls/identity-api/src/v3/wadl/OS-TRUST-v3.wadl
index cd398ed27..1a942e8b8 100644
--- a/api-ref/src/wadls/identity-api/src/v3/wadl/OS-TRUST-v3.wadl
+++ b/api-ref/src/wadls/identity-api/src/v3/wadl/OS-TRUST-v3.wadl
@@ -58,7 +58,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample>
                         <xsdxt:code
-                            href="samples/OS-TRUST/trust-POST-req.json"
+                            href="../samples/OS-TRUST/trust-POST-req.json"
                         />
                     </xsdxt:sample>
                 </wadl:doc>
@@ -136,7 +136,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:sample>
                         <xsdxt:code
-                            href="samples/OS-TRUST/trust-POST-resp.json"
+                            href="../samples/OS-TRUST/trust-POST-resp.json"
                         />
                     </xsdxt:sample>
                 </wadl:doc>
diff --git a/api-ref/src/wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl b/api-ref/src/wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl
index 119217dbb..afe0f667f 100644
--- a/api-ref/src/wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl
+++ b/api-ref/src/wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl
@@ -446,7 +446,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/identity-versions-response.json"
+                        href="../samples/identity-versions-response.json"
                     />
                 </wadl:doc>
             </representation>