diff --git a/api-ref/source/v1/samples/quotas-defaults-show-response.xml b/api-ref/source/v1/samples/quotas-defaults-show-response.xml
deleted file mode 100644
index 76a9292c137..00000000000
--- a/api-ref/source/v1/samples/quotas-defaults-show-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <cores>20</cores>
-  <fixed_ips>-1</fixed_ips>
-  <floating_ips>10</floating_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>10</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v1/samples/quotas-show-response.xml b/api-ref/source/v1/samples/quotas-show-response.xml
deleted file mode 100644
index 76a9292c137..00000000000
--- a/api-ref/source/v1/samples/quotas-show-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <cores>20</cores>
-  <fixed_ips>-1</fixed_ips>
-  <floating_ips>10</floating_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>10</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v1/samples/quotas-update-request.xml b/api-ref/source/v1/samples/quotas-update-request.xml
deleted file mode 100644
index 596ce56ac36..00000000000
--- a/api-ref/source/v1/samples/quotas-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <security_groups>45</security_groups>
-</quota_set>
diff --git a/api-ref/source/v1/samples/quotas-update-response.xml b/api-ref/source/v1/samples/quotas-update-response.xml
deleted file mode 100644
index e03a0bf5e4b..00000000000
--- a/api-ref/source/v1/samples/quotas-update-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set>
-  <cores>20</cores>
-  <fixed_ips>-1</fixed_ips>
-  <floating_ips>10</floating_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>10</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>45</security_groups>
-</quota_set>
diff --git a/api-ref/source/v1/samples/snapshot-create-request.xml b/api-ref/source/v1/samples/snapshot-create-request.xml
deleted file mode 100644
index 911667a7b3f..00000000000
--- a/api-ref/source/v1/samples/snapshot-create-request.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot xmlns="http://docs.openstack.org/volume/api/v1"
-          name="snap-001" display_name="snap-001"
-          display_description="Daily backup"
-          volume_id="521752a6-acf6-4b2d-bc7a-119f9148cd8c"
-          force="true"/>
diff --git a/api-ref/source/v1/samples/snapshot-metadata-show-response.xml b/api-ref/source/v1/samples/snapshot-metadata-show-response.xml
deleted file mode 100644
index c8e002424d0..00000000000
--- a/api-ref/source/v1/samples/snapshot-metadata-show-response.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot
-    xmlns:os-extended-snapshot-attributes="http://docs.openstack.org/volume/ext/extended_snapshot_attributes/api/v1"
-    status="available" description="None"
-    created_at="2014-05-06 17:59:52"
-    volume_id="ebd80b99-bc3d-4154-9d28-5583baa80580" size="10"
-    id="dfcd17fe-3b64-44ba-b95f-1c9c7109ef95" name="my-snapshot"
-    os-extended-snapshot-attributes:project_id="7e0105e19cd2466193729ef78b604f79"
-    os-extended-snapshot-attributes:progress="0%">
-    <metadata>
-        <meta key="key">v1</meta>
-    </metadata>
-</snapshot>
diff --git a/api-ref/source/v1/samples/snapshot-metadata-update-request.xml b/api-ref/source/v1/samples/snapshot-metadata-update-request.xml
deleted file mode 100644
index cbcf6b27344..00000000000
--- a/api-ref/source/v1/samples/snapshot-metadata-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata>
-    <meta key="key">v1</meta>
-</metadata>
diff --git a/api-ref/source/v1/samples/snapshot-metadata-update-response.xml b/api-ref/source/v1/samples/snapshot-metadata-update-response.xml
deleted file mode 100644
index 31535fda410..00000000000
--- a/api-ref/source/v1/samples/snapshot-metadata-update-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
-    <meta key="key">v1</meta>
-</metadata>
diff --git a/api-ref/source/v1/samples/snapshot-show-response.xml b/api-ref/source/v1/samples/snapshot-show-response.xml
deleted file mode 100644
index c37ab2ed3a6..00000000000
--- a/api-ref/source/v1/samples/snapshot-show-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot xmlns="http://docs.openstack.org/volume/api/v1"
-          id="3fbbcccf-d058-4502-8844-6feeffdf4cb5"
-          display_name="snap-001"
-          display_description="Daily backup"
-          volume_id="521752a6-acf6-4b2d-bc7a-119f9148cd8c"
-          status="available"
-          size="30"
-          created_at="2012-02-29T03:50:07Z" />
diff --git a/api-ref/source/v1/samples/snapshots-list-response.xml b/api-ref/source/v1/samples/snapshots-list-response.xml
deleted file mode 100644
index 2e103ff6b23..00000000000
--- a/api-ref/source/v1/samples/snapshots-list-response.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshots xmlns="http://docs.openstack.org/volume/api/v1">
-    <snapshot id="3fbbcccf-d058-4502-8844-6feeffdf4cb5"
-              display_name="snap-001"
-              display_description="Daily backup"
-              volume_id="521752a6-acf6-4b2d-bc7a-119f9148cd8c"
-              status="available"
-              size="30"
-              created_at="2012-02-29T03:50:07Z">
-        <metadata>
-              <meta key="contents">junk</meta>
-        </metadata>
-    </snapshot>
-    <snapshot id="e479997c-650b-40a4-9dfe-77655818b0d2"
-              display_name="snap-002"
-              display_description="Weekly backup"
-              volume_id="76b8950a-8594-4e5b-8dce-0dfa9c696358"
-              status="available"
-              size="25"
-              created_at="2012-03-19T01:52:47Z" />
-</snapshots>
diff --git a/api-ref/source/v1/samples/user-quotas-show-response.xml b/api-ref/source/v1/samples/user-quotas-show-response.xml
deleted file mode 100644
index 76a9292c137..00000000000
--- a/api-ref/source/v1/samples/user-quotas-show-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <cores>20</cores>
-  <fixed_ips>-1</fixed_ips>
-  <floating_ips>10</floating_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>10</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v1/samples/user-quotas-update-request.xml b/api-ref/source/v1/samples/user-quotas-update-request.xml
deleted file mode 100644
index dd58ed24d0c..00000000000
--- a/api-ref/source/v1/samples/user-quotas-update-request.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <force>true</force>
-  <instances>9</instances>
-</quota_set>
diff --git a/api-ref/source/v1/samples/user-quotas-update-response.xml b/api-ref/source/v1/samples/user-quotas-update-response.xml
deleted file mode 100644
index 43c36c7da31..00000000000
--- a/api-ref/source/v1/samples/user-quotas-update-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set>
-  <cores>20</cores>
-  <floating_ips>10</floating_ips>
-  <fixed_ips>-1</fixed_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>9</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v1/samples/volume-create-request.xml b/api-ref/source/v1/samples/volume-create-request.xml
deleted file mode 100644
index 46d6c9be307..00000000000
--- a/api-ref/source/v1/samples/volume-create-request.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume xmlns="http://docs.openstack.org/volume/api/v1"
-        display_name="vol-001"
-        display_description="Another volume."
-        size="30"
-        volume_type="289da7f8-6440-407c-9fb4-7db01ec49164"
-        availability_zone="us-east1">
-    <metadata>
-        <meta key="contents">junk</meta>
-    </metadata>
-</volume>
diff --git a/api-ref/source/v1/samples/volume-show-response.xml b/api-ref/source/v1/samples/volume-show-response.xml
deleted file mode 100644
index 7dc246265d1..00000000000
--- a/api-ref/source/v1/samples/volume-show-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume xmlns="http://docs.openstack.org/volume/api/v1"
-        id="521752a6-acf6-4b2d-bc7a-119f9148cd8c"
-        display_name="vol-001"
-        display_description="Another volume."
-        status="active"
-        size="30"
-        volume_type="289da7f8-6440-407c-9fb4-7db01ec49164"
-        availability_zone="us-east1"
-        bootable="false"
-        created_at="2012-02-14T20:53:07Z">
-    <metadata>
-        <meta key="contents">junk</meta>
-    </metadata>
-</volume>
diff --git a/api-ref/source/v1/samples/volume-type-create-request.xml b/api-ref/source/v1/samples/volume-type-create-request.xml
deleted file mode 100644
index dfe9b37a352..00000000000
--- a/api-ref/source/v1/samples/volume-type-create-request.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_type xmlns="http://docs.openstack.org/volume/api/v1"
-        name="vol-type-001">
-        <extra_specs>
-            <extra_spec key="capabilities">gpu</extra_spec>
-        </extra_specs>
-</volume_type>
diff --git a/api-ref/source/v1/samples/volume-type-show-response.xml b/api-ref/source/v1/samples/volume-type-show-response.xml
deleted file mode 100644
index 1c4291d08f1..00000000000
--- a/api-ref/source/v1/samples/volume-type-show-response.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_type xmlns="http://docs.openstack.org/volume/api/v1"
-             id="289da7f8-6440-407c-9fb4-7db01ec49164"
-             name="vol-type-001">
-    <extra_specs>
-        <extra_spec key="capabilities">gpu</extra_spec>
-    </extra_specs>
-</volume_type>
diff --git a/api-ref/source/v1/samples/volume-types-list-response.xml b/api-ref/source/v1/samples/volume-types-list-response.xml
deleted file mode 100644
index edde1f67598..00000000000
--- a/api-ref/source/v1/samples/volume-types-list-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_types xmlns="http://docs.openstack.org/volume/api/v1">
-    <volume_type id="289da7f8-6440-407c-9fb4-7db01ec49164"
-                 name="vol-type-001">
-        <extra_specs>
-            <extra_spec key="capabilities">gpu</extra_spec>
-        </extra_specs>
-    </volume_type>
-    <volume_type id="96c3bda7-c82a-4f50-be73-ca7621794835"
-                 name="vol-type-002" />
-</volume_types>
diff --git a/api-ref/source/v1/samples/volumes-list-response.xml b/api-ref/source/v1/samples/volumes-list-response.xml
deleted file mode 100644
index 0e20c3ed626..00000000000
--- a/api-ref/source/v1/samples/volumes-list-response.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volumes xmlns="http://docs.openstack.org/volume/api/v1">
-    <volume xmlns="http://docs.openstack.org/volume/api/v1"
-            id="521752a6-acf6-4b2d-bc7a-119f9148cd8c"
-            display_name="vol-001"
-            display_description="Another volume."
-            status="active"
-            size="30"
-            volume_type="289da7f8-6440-407c-9fb4-7db01ec49164"
-            availability_zone="us-east1"
-            created_at="2012-02-14T20:53:07Z">
-        <metadata>
-            <meta key="contents">junk</meta>
-        </metadata>
-    </volume>
-    <volume xmlns="http://docs.openstack.org/volume/api/v1"
-            id="76b8950a-8594-4e5b-8dce-0dfa9c696358"
-            display_name="vol-002"
-            display_description="Yet another volume."
-            status="active"
-            size="25"
-            volume_type="96c3bda7-c82a-4f50-be73-ca7621794835"
-            availability_zone="us-east2"
-            created_at="2012-03-15T19:10:03Z" />
-</volumes>
diff --git a/api-ref/source/v2/api-versions.inc b/api-ref/source/v2/api-versions.inc
index 7ad9077866d..367a98a93f8 100644
--- a/api-ref/source/v2/api-versions.inc
+++ b/api-ref/source/v2/api-versions.inc
@@ -24,9 +24,3 @@ Response
 
 .. literalinclude:: ./samples/versions-response.json
    :language: javascript
-
-**Example List Api Versions: XML request**
-
-
-.. literalinclude:: ./samples/versions-response.xml
-   :language: javascript
diff --git a/api-ref/source/v2/samples/consistency-group-show-response.xml b/api-ref/source/v2/samples/consistency-group-show-response.xml
deleted file mode 100644
index a9d2b4dd9ea..00000000000
--- a/api-ref/source/v2/samples/consistency-group-show-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<consistencygroups xmlns:consistencygroups="http://docs.openstack.org/volume/ext/consistencygroups/api/v1">
-    <consistencygroup
-        id="6f519a48-3183-46cf-a32f-41815f813986"
-        status="available"
-        availability_zone="az1"
-        created_at="2015-09-16T09:28:52.000000"
-        name="my-cg1"
-        description="my first consistency group">
-        <volume_types>
-            <volume_type>"123456"</volume_type>
-        </volume_types>
-    </consistencygroup>
-</consistencygroups>
diff --git a/api-ref/source/v2/samples/consistency-groups-list-detailed-response.xml b/api-ref/source/v2/samples/consistency-groups-list-detailed-response.xml
deleted file mode 100644
index bed4f625663..00000000000
--- a/api-ref/source/v2/samples/consistency-groups-list-detailed-response.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<consistencygroups xmlns:consistencygroups="http://docs.openstack.org/volume/ext/consistencygroups/api/v1">
-    <consistencygroup
-        id="6f519a48-3183-46cf-a32f-41815f813986"
-        status="available"
-        availability_zone="az1"
-        created_at="2015-09-16T09:28:52.000000"
-        name="my-cg1"
-        description="my first consistency group">
-        <volume_types>
-            <volume_type>"123456"</volume_type>
-        </volume_types>
-    </consistencygroup>
-    <consistencygroup
-        id="aed36625-a6d7-4681-ba59-c7ba3d18c148"
-        status="error"
-        availability_zone="az2"
-        created_at="2015-09-16T09:31:15.000000"
-        name="my-cg2"
-        description="Edited description">
-        <volume_types>
-            <volume_type>"234567"</volume_type>
-        </volume_types>
-    </consistencygroup>
-</consistencygroups>
diff --git a/api-ref/source/v2/samples/extensions-list-response.xml b/api-ref/source/v2/samples/extensions-list-response.xml
deleted file mode 100644
index 969efec6b5c..00000000000
--- a/api-ref/source/v2/samples/extensions-list-response.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<extensions xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/common/api/v1.0">
-    <extension alias="OS-SCH-HNT" updated="2013-04-18T00:00:00+00:00"
-        namespace="http://docs.openstack.org/block-service/ext/scheduler-hints/api/v2"
-        name="SchedulerHints">
-        <description>Pass arbitrary key/value pairs to the
-            scheduler.</description>
-    </extension>
-    <extension alias="os-hosts" updated="2011-06-29T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/hosts/api/v1.1"
-        name="Hosts">
-        <description>Admin-only host administration.</description>
-    </extension>
-    <extension alias="os-vol-tenant-attr"
-        updated="2011-11-03T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume_tenant_attribute/api/v1"
-        name="VolumeTenantAttribute">
-        <description>Expose the internal project_id as an attribute of
-            a volume.</description>
-    </extension>
-    <extension alias="os-quota-sets"
-        updated="2011-08-08T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/quotas-sets/api/v1.1"
-        name="Quotas">
-        <description>Quota management support.</description>
-    </extension>
-    <extension alias="os-types-manage"
-        updated="2011-08-24T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/types-manage/api/v1"
-        name="TypesManage">
-        <description>Types manage support.</description>
-    </extension>
-    <extension alias="os-volume-encryption-metadata"
-        updated="2013-07-10T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/os-volume-encryption-metadata/api/v1"
-        name="VolumeEncryptionMetadata">
-        <description>Volume encryption metadata retrieval
-            support.</description>
-    </extension>
-    <extension alias="backups" updated="2012-12-12T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/backups/api/v1"
-        name="Backups">
-        <description>Backups support.</description>
-    </extension>
-    <extension alias="os-snapshot-actions"
-        updated="2013-07-16T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/snapshot-actions/api/v1.1"
-        name="SnapshotActions">
-        <description>Enable snapshot manager actions.</description>
-    </extension>
-    <extension alias="os-volume-actions"
-        updated="2012-05-31T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume-actions/api/v1.1"
-        name="VolumeActions">
-        <description>Enable volume actions </description>
-    </extension>
-    <extension alias="os-used-limits"
-        updated="2013-10-03T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/used-limits/api/v1.1"
-        name="UsedLimits">
-        <description>Provide data on limited resources that are being
-            used.</description>
-    </extension>
-    <extension alias="os-volume-unmanage"
-        updated="2012-05-31T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume-unmanage/api/v1.1"
-        name="VolumeUnmanage">
-        <description>Enable volume unmanage operation.</description>
-    </extension>
-    <extension alias="os-vol-host-attr"
-        updated="2011-11-03T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume_host_attribute/api/v1"
-        name="VolumeHostAttribute">
-        <description>Expose host as an attribute of a
-            volume.</description>
-    </extension>
-    <extension alias="encryption" updated="2013-07-01T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume-type-encryption/api/v1"
-        name="VolumeTypeEncryption">
-        <description>Encryption support for volume
-            types.</description>
-    </extension>
-    <extension alias="os-availability-zone"
-        updated="2013-06-27T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/os-availability-zone/api/v1"
-        name="AvailabilityZones">
-        <description>Describe Availability Zones.</description>
-    </extension>
-    <extension alias="qos-specs" updated="2013-08-02T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/qos-specs/api/v1"
-        name="Qos_specs_manage">
-        <description>QoS specs support.</description>
-    </extension>
-    <extension alias="os-types-extra-specs"
-        updated="2011-08-24T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/types-extra-specs/api/v1"
-        name="TypesExtraSpecs">
-        <description>Type extra specs support.</description>
-    </extension>
-    <extension alias="os-vol-mig-status-attr"
-        updated="2013-08-08T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume_mig_status_attribute/api/v1"
-        name="VolumeMigStatusAttribute">
-        <description>Expose migration_status as an attribute of a
-            volume.</description>
-    </extension>
-    <extension alias="os-image-create"
-        updated="2012-08-13T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/image-create/api/v1"
-        name="CreateVolumeExtension">
-        <description>Allow creating a volume from an image in the
-            Create Volume v1 API.</description>
-    </extension>
-    <extension alias="os-extended-services"
-        updated="2014-01-10T00:00:00-00:00"
-        namespace="http://docs.openstack.org/volume/ext/extended_services/api/v2"
-        name="ExtendedServices">
-        <description>Extended services support.</description>
-    </extension>
-    <extension alias="os-extended-snapshot-attributes"
-        updated="2012-06-19T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/extended_snapshot_attributes/api/v1"
-        name="ExtendedSnapshotAttributes">
-        <description>Extended SnapshotAttributes
-            support.</description>
-    </extension>
-    <extension alias="os-vol-image-meta"
-        updated="2012-12-07T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume_image_metadata/api/v1"
-        name="VolumeImageMetadata">
-        <description>Show image metadata associated with the
-            volume.</description>
-    </extension>
-    <extension alias="os-quota-class-sets"
-        updated="2012-03-12T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/quota-classes-sets/api/v1.1"
-        name="QuotaClasses">
-        <description>Quota classes management support.</description>
-    </extension>
-    <extension alias="os-volume-transfer"
-        updated="2013-05-29T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume-transfer/api/v1.1"
-        name="VolumeTransfer">
-        <description>Volume transfer management support.</description>
-    </extension>
-    <extension alias="os-volume-manage"
-        updated="2014-02-10T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/os-volume-manage/api/v1"
-        name="VolumeManage">
-        <description>Allows existing back end storage to be 'managed'
-            by cinder.</description>
-    </extension>
-    <extension alias="os-admin-actions"
-        updated="2012-08-25T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/admin-actions/api/v1.1"
-        name="AdminActions">
-        <description>Enable admin actions.</description>
-    </extension>
-    <extension alias="os-services" updated="2012-10-28T00:00:00-00:00"
-        namespace="http://docs.openstack.org/volume/ext/services/api/v2"
-        name="Services">
-        <description>Services support.</description>
-    </extension>
-</extensions>
diff --git a/api-ref/source/v2/samples/limits-show-response.xml b/api-ref/source/v2/samples/limits-show-response.xml
deleted file mode 100644
index 0f932b074d7..00000000000
--- a/api-ref/source/v2/samples/limits-show-response.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<limits xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/common/api/v1.0">
-    <rates/>
-    <absolute>
-        <limit name="totalSnapshotsUsed" value="0"/>
-        <limit name="maxTotalBackups" value="10"/>
-        <limit name="maxTotalVolumeGigabytes" value="1000"/>
-        <limit name="maxTotalSnapshots" value="10"/>
-        <limit name="maxTotalBackupGigabytes" value="1000"/>
-        <limit name="totalBackupGigabytesUsed" value="0"/>
-        <limit name="maxTotalVolumes" value="10"/>
-        <limit name="totalVolumesUsed" value="0"/>
-        <limit name="totalBackupsUsed" value="0"/>
-        <limit name="totalGigabytesUsed" value="0"/>
-    </absolute>
-</limits>
diff --git a/api-ref/source/v2/samples/qos-create-request.xml b/api-ref/source/v2/samples/qos-create-request.xml
deleted file mode 100644
index ac772236cac..00000000000
--- a/api-ref/source/v2/samples/qos-create-request.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<qos_specs name="performance-spec" delay="0" throughput="100" />
diff --git a/api-ref/source/v2/samples/qos-create-response.xml b/api-ref/source/v2/samples/qos-create-response.xml
deleted file mode 100644
index b2393248699..00000000000
--- a/api-ref/source/v2/samples/qos-create-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<qos_specs>
-    <qos_spec consumer="back-end" id="e1f84cf3-6b1e-4f25-8130-3244f69ec7c1" name="performance-spec">
-        <specs>
-            <delay>0</delay>
-            <throughput>100</throughput>
-        </specs>
-    </qos_spec>
-</qos_specs>
diff --git a/api-ref/source/v2/samples/qos-list-response.xml b/api-ref/source/v2/samples/qos-list-response.xml
deleted file mode 100644
index c77e7847ff3..00000000000
--- a/api-ref/source/v2/samples/qos-list-response.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<qos_specs>
-    <qos_spec consumer="back-end"
-        id="0388d6c6-d5d4-42a3-b289-95205c50dd15"
-        name="reliability-spec">
-        <specs>
-            <availability>100</availability>
-            <numberOfFailures>0</numberOfFailures>
-        </specs>
-    </qos_spec>
-    <qos_spec consumer="back-end"
-        id="ecfc6e2e-7117-44a4-8eec-f84d04f531a8"
-        name="performance-spec">
-        <specs>
-            <delay>0</delay>
-            <throughput>100</throughput>
-        </specs>
-    </qos_spec>
-</qos_specs>
diff --git a/api-ref/source/v2/samples/qos-show-response.xml b/api-ref/source/v2/samples/qos-show-response.xml
deleted file mode 100644
index 7aee8126ce8..00000000000
--- a/api-ref/source/v2/samples/qos-show-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<qos_specs>
-    <qos_spec consumer="back-end"
-        id="0388d6c6-d5d4-42a3-b289-95205c50dd15"
-        name="reliability-spec">
-        <specs>
-            <availability>100</availability>
-            <numberOfFailures>0</numberOfFailures>
-        </specs>
-    </qos_spec>
-</qos_specs>
diff --git a/api-ref/source/v2/samples/qos-unset-request.xml b/api-ref/source/v2/samples/qos-unset-request.xml
deleted file mode 100644
index c6f10f9f37b..00000000000
--- a/api-ref/source/v2/samples/qos-unset-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keys>
-    <key/>
-</keys>
diff --git a/api-ref/source/v2/samples/qos-update-request.xml b/api-ref/source/v2/samples/qos-update-request.xml
deleted file mode 100644
index 78524c7cadb..00000000000
--- a/api-ref/source/v2/samples/qos-update-request.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<qos_specs delay="2" throughput="100"/>
diff --git a/api-ref/source/v2/samples/qos-update-response.xml b/api-ref/source/v2/samples/qos-update-response.xml
deleted file mode 100644
index ed8dd0578d9..00000000000
--- a/api-ref/source/v2/samples/qos-update-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<qos_specs>
-    <qos_spec/>
-</qos_specs>
diff --git a/api-ref/source/v2/samples/qos_show_response.xml b/api-ref/source/v2/samples/qos_show_response.xml
deleted file mode 100644
index e208b8a2085..00000000000
--- a/api-ref/source/v2/samples/qos_show_response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<qos_associations>
-    <associations association_type="volume_type"
-        name="reliability-type"
-        id="a12983c2-83bd-4afa-be9f-ad796573ead6"/>
-</qos_associations>
diff --git a/api-ref/source/v2/samples/quotas-defaults-show-response.xml b/api-ref/source/v2/samples/quotas-defaults-show-response.xml
deleted file mode 100644
index 76a9292c137..00000000000
--- a/api-ref/source/v2/samples/quotas-defaults-show-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <cores>20</cores>
-  <fixed_ips>-1</fixed_ips>
-  <floating_ips>10</floating_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>10</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v2/samples/quotas-show-defaults-response.xml b/api-ref/source/v2/samples/quotas-show-defaults-response.xml
deleted file mode 100644
index b63b30b08f7..00000000000
--- a/api-ref/source/v2/samples/quotas-show-defaults-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <gigabytes>5</gigabytes>
-  <snapshots>10</snapshots>
-  <volumes>20</volumes>
-</quota_set>
diff --git a/api-ref/source/v2/samples/quotas-show-response.xml b/api-ref/source/v2/samples/quotas-show-response.xml
deleted file mode 100644
index b63b30b08f7..00000000000
--- a/api-ref/source/v2/samples/quotas-show-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <gigabytes>5</gigabytes>
-  <snapshots>10</snapshots>
-  <volumes>20</volumes>
-</quota_set>
diff --git a/api-ref/source/v2/samples/quotas-update-request.xml b/api-ref/source/v2/samples/quotas-update-request.xml
deleted file mode 100644
index ccf34efa0ab..00000000000
--- a/api-ref/source/v2/samples/quotas-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <snapshots>45</snapshots>
-</quota_set>
diff --git a/api-ref/source/v2/samples/quotas-update-response.xml b/api-ref/source/v2/samples/quotas-update-response.xml
deleted file mode 100644
index b63b30b08f7..00000000000
--- a/api-ref/source/v2/samples/quotas-update-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <gigabytes>5</gigabytes>
-  <snapshots>10</snapshots>
-  <volumes>20</volumes>
-</quota_set>
diff --git a/api-ref/source/v2/samples/quotas-user-show-response.xml b/api-ref/source/v2/samples/quotas-user-show-response.xml
deleted file mode 100644
index b63b30b08f7..00000000000
--- a/api-ref/source/v2/samples/quotas-user-show-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <gigabytes>5</gigabytes>
-  <snapshots>10</snapshots>
-  <volumes>20</volumes>
-</quota_set>
diff --git a/api-ref/source/v2/samples/snapshot-create-request.xml b/api-ref/source/v2/samples/snapshot-create-request.xml
deleted file mode 100644
index 2b56fde55da..00000000000
--- a/api-ref/source/v2/samples/snapshot-create-request.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    name="snap-001" description="Daily backup"
-    volume_id="5aa119a8-d25b-45a7-8d1b-88e127885635" force="true"/>
diff --git a/api-ref/source/v2/samples/snapshot-create-response.xml b/api-ref/source/v2/samples/snapshot-create-response.xml
deleted file mode 100644
index 1f72e69934c..00000000000
--- a/api-ref/source/v2/samples/snapshot-create-response.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot status="creating" description="Daily backup"
-    created_at="2013-02-25T03:56:53.081642"
-    volume_id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1"
-    id="ffa9bc5e-1172-4021-acaf-cdcd78a9584d" name="snap-001">
-    <metadata/>
-</snapshot>
diff --git a/api-ref/source/v2/samples/snapshot-metadata-show-response.xml b/api-ref/source/v2/samples/snapshot-metadata-show-response.xml
deleted file mode 100644
index f62f5b6b9c3..00000000000
--- a/api-ref/source/v2/samples/snapshot-metadata-show-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
-    <meta key="name">test</meta>
-</metadata>
diff --git a/api-ref/source/v2/samples/snapshot-metadata-update-request.xml b/api-ref/source/v2/samples/snapshot-metadata-update-request.xml
deleted file mode 100644
index ceeb8f0314b..00000000000
--- a/api-ref/source/v2/samples/snapshot-metadata-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata>
-    <meta key="key">v2</meta>
-</metadata>
diff --git a/api-ref/source/v2/samples/snapshot-metadata-update-response.xml b/api-ref/source/v2/samples/snapshot-metadata-update-response.xml
deleted file mode 100644
index 6d00cdef115..00000000000
--- a/api-ref/source/v2/samples/snapshot-metadata-update-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
-    <meta key="key">v2</meta>
-</metadata>
diff --git a/api-ref/source/v2/samples/snapshot-show-response.xml b/api-ref/source/v2/samples/snapshot-show-response.xml
deleted file mode 100644
index 5863aa554f4..00000000000
--- a/api-ref/source/v2/samples/snapshot-show-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot
-  xmlns:os-extended-snapshot-attributes="http://docs.openstack.org/openstack-block-storage/2.0/content/Extended_Snapshot_Attributes.html"
-  status="available" description="Very important"
-  created_at="2013-02-25 04:13:17"
-  volume_id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1"
-  id="2bb856e1-b3d8-4432-a858-09e4ce939389" name="snap-001"
-  os-extended-snapshot-attributes:project_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-  os-extended-snapshot-attributes:progress="100%">
-  <metadata/>
-</snapshot>
diff --git a/api-ref/source/v2/samples/snapshot-update-request.xml b/api-ref/source/v2/samples/snapshot-update-request.xml
deleted file mode 100644
index 670f6e68231..00000000000
--- a/api-ref/source/v2/samples/snapshot-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    name="snap-002" description="This is yet, another snapshot."/>
diff --git a/api-ref/source/v2/samples/snapshot-update-response.xml b/api-ref/source/v2/samples/snapshot-update-response.xml
deleted file mode 100644
index 1d09541c78c..00000000000
--- a/api-ref/source/v2/samples/snapshot-update-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot
-  xmlns:os-extended-snapshot-attributes="http://docs.openstack.org/openstack-block-storage/2.0/content/Extended_Snapshot_Attributes.html"
-    status="available"
-    description="This is yet, another snapshot"
-    created_at="2013-02-20T08:11:34.000000"
-    volume_id="2402b902-0b7a-458c-9c07-7435a826f794"
-    size="1"
-    id="4b502fcb-1f26-45f8-9fe5-3b9a0a52eaf2"
-    name="snap-002"
-    os-extended-snapshot-attributes:project_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-    os-extended-snapshot-attributes:progress="100%">
-    <metadata/>
-</snapshot>
diff --git a/api-ref/source/v2/samples/snapshots-list-detailed-response.xml b/api-ref/source/v2/samples/snapshots-list-detailed-response.xml
deleted file mode 100644
index 2114e0069ca..00000000000
--- a/api-ref/source/v2/samples/snapshots-list-detailed-response.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshots
-    xmlns:os-extended-snapshot-attributes="http://docs.openstack.org/volume/ext/extended_snapshot_attributes/api/v1">
-    <snapshot status="available"
-        description="volume snapshot"
-        created_at="2015-11-29 02:25:51+00:00"
-        volume_id="173f7b48-c4c1-4e70-9acc-086b39073506"
-        size="1" id="b1323cda-8e4b-41c1-afc5-2fc791809c8c"
-        name="test-volume-snapshot"
-        os-extended-snapshot-attributes:project_id="bab7d5c60cd041a0a36f7c4b6e1dd978"
-        os-extended-snapshot-attributes:progress="100%">
-        <metadata>
-            <meta key="name">test</meta>
-        </metadata>
-    </snapshot>
-</snapshots>
diff --git a/api-ref/source/v2/samples/snapshots-list-response.xml b/api-ref/source/v2/samples/snapshots-list-response.xml
deleted file mode 100644
index 654189455fb..00000000000
--- a/api-ref/source/v2/samples/snapshots-list-response.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshots>
-    <snapshot status="available"
-        description="volume snapshot"
-        created_at="2015-11-29 02:25:51+00:00"
-        volume_id="173f7b48-c4c1-4e70-9acc-086b39073506"
-        size="1" id="b1323cda-8e4b-41c1-afc5-2fc791809c8c"
-        name="test-volume-snapshot">
-        <metadata>
-            <meta key="name">test</meta>
-        </metadata>
-    </snapshot>
-</snapshots>
diff --git a/api-ref/source/v2/samples/user-quotas-show-response.xml b/api-ref/source/v2/samples/user-quotas-show-response.xml
deleted file mode 100644
index 76a9292c137..00000000000
--- a/api-ref/source/v2/samples/user-quotas-show-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <cores>20</cores>
-  <fixed_ips>-1</fixed_ips>
-  <floating_ips>10</floating_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>10</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v2/samples/user-quotas-update-request.xml b/api-ref/source/v2/samples/user-quotas-update-request.xml
deleted file mode 100644
index dd58ed24d0c..00000000000
--- a/api-ref/source/v2/samples/user-quotas-update-request.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <force>true</force>
-  <instances>9</instances>
-</quota_set>
diff --git a/api-ref/source/v2/samples/user-quotas-update-response.xml b/api-ref/source/v2/samples/user-quotas-update-response.xml
deleted file mode 100644
index 43c36c7da31..00000000000
--- a/api-ref/source/v2/samples/user-quotas-update-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set>
-  <cores>20</cores>
-  <floating_ips>10</floating_ips>
-  <fixed_ips>-1</fixed_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>9</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v2/samples/version-show-response.xml b/api-ref/source/v2/samples/version-show-response.xml
deleted file mode 100644
index 38cecbc616b..00000000000
--- a/api-ref/source/v2/samples/version-show-response.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<choices xmlns="http://docs.openstack.org/common/api/v1.0" xmlns:atom="http://www.w3.org/2005/Atom">
-    <version status="SUPPORTED" id="v1.0">
-        <media-types>
-            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
-            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
-        </media-types>
-        <atom:link href="http://23.253.248.171:8776/v1/v2.xml" rel="self" />
-    </version>
-    <version status="CURRENT" id="v2.0">
-        <media-types>
-            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
-            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
-        </media-types>
-        <atom:link href="http://23.253.248.171:8776/v2/v2.xml" rel="self" />
-    </version>
-</choices>
diff --git a/api-ref/source/v2/samples/versions-response.xml b/api-ref/source/v2/samples/versions-response.xml
deleted file mode 100644
index a09fac7165b..00000000000
--- a/api-ref/source/v2/samples/versions-response.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<choices xmlns="http://docs.openstack.org/common/api/v1.0" xmlns:atom="http://www.w3.org/2005/Atom">
-    <version status="DEPRECATED" id="v1.0">
-        <media-types>
-            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
-            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
-        </media-types>
-        <atom:link href="http://23.253.248.171:8776/v1/.xml" rel="self" />
-    </version>
-    <version status="SUPPORTED" id="v2.0">
-        <media-types>
-            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
-            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
-        </media-types>
-        <atom:link href="http://23.253.248.171:8776/v2/.xml" rel="self" />
-    </version>
-    <version status="CURRENT" id="v3.0">
-        <media-types>
-            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
-            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
-        </media-types>
-        <atom:link href="http://23.253.248.171:8776/v3/.xml" rel="self" />
-    </version>
-</choices>
-
diff --git a/api-ref/source/v2/samples/volume-create-request.xml b/api-ref/source/v2/samples/volume-create-request.xml
deleted file mode 100644
index 5b655e92e9f..00000000000
--- a/api-ref/source/v2/samples/volume-create-request.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    name="vol-001" description="Another volume."
-    size="2"/>
diff --git a/api-ref/source/v2/samples/volume-create-response.xml b/api-ref/source/v2/samples/volume-create-response.xml
deleted file mode 100644
index 9be3c5e3943..00000000000
--- a/api-ref/source/v2/samples/volume-create-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volume xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/volume/api/v1" status="creating"
-    name="vol-001" availability_zone="nova" bootable="false"
-    created_at="2014-02-21 20:18:33.122452"
-    description="Another volume." volume_type="None"
-    snapshot_id="None" source_volid="None"
-    id="83960a54-8dad-4fd8-bc41-33c71e098e04" size="2">
-    <attachments/>
-    <metadata/>
-</volume>
diff --git a/api-ref/source/v2/samples/volume-metadata-show-response.xml b/api-ref/source/v2/samples/volume-metadata-show-response.xml
deleted file mode 100644
index ba106077a94..00000000000
--- a/api-ref/source/v2/samples/volume-metadata-show-response.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"/>
diff --git a/api-ref/source/v2/samples/volume-metadata-update-request.xml b/api-ref/source/v2/samples/volume-metadata-update-request.xml
deleted file mode 100644
index ceeb8f0314b..00000000000
--- a/api-ref/source/v2/samples/volume-metadata-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata>
-    <meta key="key">v2</meta>
-</metadata>
diff --git a/api-ref/source/v2/samples/volume-metadata-update-response.xml b/api-ref/source/v2/samples/volume-metadata-update-response.xml
deleted file mode 100644
index 6d00cdef115..00000000000
--- a/api-ref/source/v2/samples/volume-metadata-update-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
-    <meta key="key">v2</meta>
-</metadata>
diff --git a/api-ref/source/v2/samples/volume-show-response.xml b/api-ref/source/v2/samples/volume-show-response.xml
deleted file mode 100644
index 17632dfcb80..00000000000
--- a/api-ref/source/v2/samples/volume-show-response.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volume
-    xmlns:os-vol-image-meta="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Image_Metadata.html"
-    xmlns:os-vol-tenant-attr="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Tenant_Attribute.html"
-    xmlns:os-vol-host-attr="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Host_Attribute.html"
-    xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content"
-    status="available" name="vol-003" availability_zone="nova"
-    bootable="false" created_at="2013-02-25 02:40:21"
-    description="This is yet, another volume." volume_type="None"
-    source_volid="None" snapshot_id="None"
-    id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1"
-    os-vol-tenant-attr:tenant_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-    os-vol-host-attr:host="ip-10-168-107-25">
-    <attachments/>
-    <metadata>
-        <meta key="contents">not junk</meta>
-    </metadata>
-</volume>
diff --git a/api-ref/source/v2/samples/volume-type-access-add-request.xml b/api-ref/source/v2/samples/volume-type-access-add-request.xml
deleted file mode 100644
index fdf06a0c2c1..00000000000
--- a/api-ref/source/v2/samples/volume-type-access-add-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<addProjectAccess id="bb4f8f7f-fc38-4807-bd78-5710792205e1">
-  <project>"f270b245cb11498ca4031deb7e141cfa"</project>
-</addProjectAccess>
diff --git a/api-ref/source/v2/samples/volume-type-access-delete-request.xml b/api-ref/source/v2/samples/volume-type-access-delete-request.xml
deleted file mode 100644
index dcde1b2e4e7..00000000000
--- a/api-ref/source/v2/samples/volume-type-access-delete-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<removeProjectAccess id="bb4f8f7f-fc38-4807-bd78-5710792205e1">
-  <project>"f270b245cb11498ca4031deb7e141cfa"</project>
-</removeProjectAccess>
diff --git a/api-ref/source/v2/samples/volume-type-create-request.xml b/api-ref/source/v2/samples/volume-type-create-request.xml
deleted file mode 100644
index 817e446d768..00000000000
--- a/api-ref/source/v2/samples/volume-type-create-request.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_type xmlns="http://docs.openstack.org/volume/api/v1" xmlns:os-volume-type-access="http://docs.openstack.org/openstack-block-storage/2.0/ext/os-volume-type-access/api/v2.0" name="vol-type-001" description="volume type 0001" os-volume-type-access:is_public="true">
-        <extra_specs>
-            <extra_spec key="capabilities">gpu</extra_spec>
-        </extra_specs>
-</volume_type>
diff --git a/api-ref/source/v2/samples/volume-type-show-request.xml b/api-ref/source/v2/samples/volume-type-show-request.xml
deleted file mode 100644
index 1c4291d08f1..00000000000
--- a/api-ref/source/v2/samples/volume-type-show-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_type xmlns="http://docs.openstack.org/volume/api/v1"
-             id="289da7f8-6440-407c-9fb4-7db01ec49164"
-             name="vol-type-001">
-    <extra_specs>
-        <extra_spec key="capabilities">gpu</extra_spec>
-    </extra_specs>
-</volume_type>
diff --git a/api-ref/source/v2/samples/volume-type-show-response.xml b/api-ref/source/v2/samples/volume-type-show-response.xml
deleted file mode 100644
index f5935c74a1b..00000000000
--- a/api-ref/source/v2/samples/volume-type-show-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_type
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    id="6685584b-1eac-4da6-b5c3-555430cf68ff" name="vol-type-001"
-    description="volume type 001" is_public="true">
-    <extra_specs>
-        <extra_spec key="capabilities">gpu</extra_spec>
-    </extra_specs>
-</volume_type>
diff --git a/api-ref/source/v2/samples/volume-type-update-request.xml b/api-ref/source/v2/samples/volume-type-update-request.xml
deleted file mode 100644
index dddddf66920..00000000000
--- a/api-ref/source/v2/samples/volume-type-update-request.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_type xmlns="http://docs.openstack.org/volume/api/v1" xmlns:os-volume-type-access="http://docs.openstack.org/openstack-block-storage/2.0/ext/os-volume-type-access/api/v2.0" name="vol-type-001" description="volume type 0001" is_public="true">
-        <extra_specs>
-            <extra_spec key="capabilities">gpu</extra_spec>
-        </extra_specs>
-</volume_type>
diff --git a/api-ref/source/v2/samples/volume-types-list-response.xml b/api-ref/source/v2/samples/volume-types-list-response.xml
deleted file mode 100644
index e227787da51..00000000000
--- a/api-ref/source/v2/samples/volume-types-list-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_types
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content">
-    <volume_type id="6685584b-1eac-4da6-b5c3-555430cf68ff" name="SSD">
-        <extra_specs>
-            <extra_spec key="capabilities">gpu</extra_spec>
-        </extra_specs>
-    </volume_type>
-    <volume_type id="8eb69a46-df97-4e41-9586-9a40a7533803" name="SATA"
-    />
-</volume_types>
diff --git a/api-ref/source/v2/samples/volume-update-request.xml b/api-ref/source/v2/samples/volume-update-request.xml
deleted file mode 100644
index d03ed193032..00000000000
--- a/api-ref/source/v2/samples/volume-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    name="vol-003" description="This is yet, another volume."/>
diff --git a/api-ref/source/v2/samples/volume-update-response.xml b/api-ref/source/v2/samples/volume-update-response.xml
deleted file mode 100644
index 0524361acba..00000000000
--- a/api-ref/source/v2/samples/volume-update-response.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volume xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content"
-    status="available" name="vol-003" availability_zone="nova"
-    created_at="2013-02-25 02:40:21"
-    description="This is yet, another volume." volume_type="None"
-    source_volid="None" snapshot_id="None"
-    id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1">
-    <attachments/>
-    <metadata>
-        <meta key="contents">not junk</meta>
-    </metadata>
-</volume>
diff --git a/api-ref/source/v2/samples/volumes-list-detailed-response.xml b/api-ref/source/v2/samples/volumes-list-detailed-response.xml
deleted file mode 100644
index 36bbffd0ab8..00000000000
--- a/api-ref/source/v2/samples/volumes-list-detailed-response.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volumes
-    xmlns:os-vol-image-meta="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Image_Metadata.html"
-    xmlns:os-vol-tenant-attr="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Tenant_Attribute.html"
-    xmlns:os-vol-host-attr="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Host_Attribute.html"
-    xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content">
-    <volume status="available" name="vol-004" availability_zone="nova"
-        created_at="2013-02-25 06:36:28" description="Another volume."
-        volume_type="None" source_volid="None" snapshot_id="None"
-        id="45baf976-c20a-4894-a7c3-c94b7376bf55" size="1"
-        os-vol-tenant-attr:tenant_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-        os-vol-host-attr:host="ip-10-168-107-25">
-        <attachments/>
-        <metadata>
-            <meta key="contents">junk</meta>
-        </metadata>
-    </volume>
-    <volume status="available" name="vol-003" availability_zone="nova"
-        created_at="2013-02-25 02:40:21"
-        description="This is yet, another volume." volume_type="None"
-        source_volid="None" snapshot_id="None"
-        id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1"
-        os-vol-tenant-attr:tenant_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-        os-vol-host-attr:host="ip-10-168-107-25">
-        <attachments/>
-        <metadata>
-            <meta key="contents">not junk</meta>
-        </metadata>
-    </volume>
-</volumes>
diff --git a/api-ref/source/v2/samples/volumes-list-response.xml b/api-ref/source/v2/samples/volumes-list-response.xml
deleted file mode 100644
index 024608615ad..00000000000
--- a/api-ref/source/v2/samples/volumes-list-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volumes xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content">
-    <volume name="vol-004" id="45baf976-c20a-4894-a7c3-c94b7376bf55">
-        <attachments/>
-        <metadata/>
-    </volume>
-    <volume name="vol-003" id="5aa119a8-d25b-45a7-8d1b-88e127885635">
-        <attachments/>
-        <metadata/>
-    </volume>
-</volumes>
diff --git a/api-ref/source/v3/api-versions.inc b/api-ref/source/v3/api-versions.inc
index 948ead9c2f3..a2dc526eb25 100644
--- a/api-ref/source/v3/api-versions.inc
+++ b/api-ref/source/v3/api-versions.inc
@@ -24,9 +24,3 @@ Response
 
 .. literalinclude:: ./samples/versions-response.json
    :language: javascript
-
-**Example List Api Versions: XML request**
-
-
-.. literalinclude:: ./samples/versions-response.xml
-   :language: javascript
diff --git a/api-ref/source/v3/samples/consistency-group-show-response.xml b/api-ref/source/v3/samples/consistency-group-show-response.xml
deleted file mode 100644
index a9d2b4dd9ea..00000000000
--- a/api-ref/source/v3/samples/consistency-group-show-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<consistencygroups xmlns:consistencygroups="http://docs.openstack.org/volume/ext/consistencygroups/api/v1">
-    <consistencygroup
-        id="6f519a48-3183-46cf-a32f-41815f813986"
-        status="available"
-        availability_zone="az1"
-        created_at="2015-09-16T09:28:52.000000"
-        name="my-cg1"
-        description="my first consistency group">
-        <volume_types>
-            <volume_type>"123456"</volume_type>
-        </volume_types>
-    </consistencygroup>
-</consistencygroups>
diff --git a/api-ref/source/v3/samples/consistency-groups-list-detailed-response.xml b/api-ref/source/v3/samples/consistency-groups-list-detailed-response.xml
deleted file mode 100644
index bed4f625663..00000000000
--- a/api-ref/source/v3/samples/consistency-groups-list-detailed-response.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<consistencygroups xmlns:consistencygroups="http://docs.openstack.org/volume/ext/consistencygroups/api/v1">
-    <consistencygroup
-        id="6f519a48-3183-46cf-a32f-41815f813986"
-        status="available"
-        availability_zone="az1"
-        created_at="2015-09-16T09:28:52.000000"
-        name="my-cg1"
-        description="my first consistency group">
-        <volume_types>
-            <volume_type>"123456"</volume_type>
-        </volume_types>
-    </consistencygroup>
-    <consistencygroup
-        id="aed36625-a6d7-4681-ba59-c7ba3d18c148"
-        status="error"
-        availability_zone="az2"
-        created_at="2015-09-16T09:31:15.000000"
-        name="my-cg2"
-        description="Edited description">
-        <volume_types>
-            <volume_type>"234567"</volume_type>
-        </volume_types>
-    </consistencygroup>
-</consistencygroups>
diff --git a/api-ref/source/v3/samples/extensions-list-response.xml b/api-ref/source/v3/samples/extensions-list-response.xml
deleted file mode 100644
index 969efec6b5c..00000000000
--- a/api-ref/source/v3/samples/extensions-list-response.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<extensions xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/common/api/v1.0">
-    <extension alias="OS-SCH-HNT" updated="2013-04-18T00:00:00+00:00"
-        namespace="http://docs.openstack.org/block-service/ext/scheduler-hints/api/v2"
-        name="SchedulerHints">
-        <description>Pass arbitrary key/value pairs to the
-            scheduler.</description>
-    </extension>
-    <extension alias="os-hosts" updated="2011-06-29T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/hosts/api/v1.1"
-        name="Hosts">
-        <description>Admin-only host administration.</description>
-    </extension>
-    <extension alias="os-vol-tenant-attr"
-        updated="2011-11-03T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume_tenant_attribute/api/v1"
-        name="VolumeTenantAttribute">
-        <description>Expose the internal project_id as an attribute of
-            a volume.</description>
-    </extension>
-    <extension alias="os-quota-sets"
-        updated="2011-08-08T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/quotas-sets/api/v1.1"
-        name="Quotas">
-        <description>Quota management support.</description>
-    </extension>
-    <extension alias="os-types-manage"
-        updated="2011-08-24T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/types-manage/api/v1"
-        name="TypesManage">
-        <description>Types manage support.</description>
-    </extension>
-    <extension alias="os-volume-encryption-metadata"
-        updated="2013-07-10T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/os-volume-encryption-metadata/api/v1"
-        name="VolumeEncryptionMetadata">
-        <description>Volume encryption metadata retrieval
-            support.</description>
-    </extension>
-    <extension alias="backups" updated="2012-12-12T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/backups/api/v1"
-        name="Backups">
-        <description>Backups support.</description>
-    </extension>
-    <extension alias="os-snapshot-actions"
-        updated="2013-07-16T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/snapshot-actions/api/v1.1"
-        name="SnapshotActions">
-        <description>Enable snapshot manager actions.</description>
-    </extension>
-    <extension alias="os-volume-actions"
-        updated="2012-05-31T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume-actions/api/v1.1"
-        name="VolumeActions">
-        <description>Enable volume actions </description>
-    </extension>
-    <extension alias="os-used-limits"
-        updated="2013-10-03T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/used-limits/api/v1.1"
-        name="UsedLimits">
-        <description>Provide data on limited resources that are being
-            used.</description>
-    </extension>
-    <extension alias="os-volume-unmanage"
-        updated="2012-05-31T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume-unmanage/api/v1.1"
-        name="VolumeUnmanage">
-        <description>Enable volume unmanage operation.</description>
-    </extension>
-    <extension alias="os-vol-host-attr"
-        updated="2011-11-03T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume_host_attribute/api/v1"
-        name="VolumeHostAttribute">
-        <description>Expose host as an attribute of a
-            volume.</description>
-    </extension>
-    <extension alias="encryption" updated="2013-07-01T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume-type-encryption/api/v1"
-        name="VolumeTypeEncryption">
-        <description>Encryption support for volume
-            types.</description>
-    </extension>
-    <extension alias="os-availability-zone"
-        updated="2013-06-27T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/os-availability-zone/api/v1"
-        name="AvailabilityZones">
-        <description>Describe Availability Zones.</description>
-    </extension>
-    <extension alias="qos-specs" updated="2013-08-02T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/qos-specs/api/v1"
-        name="Qos_specs_manage">
-        <description>QoS specs support.</description>
-    </extension>
-    <extension alias="os-types-extra-specs"
-        updated="2011-08-24T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/types-extra-specs/api/v1"
-        name="TypesExtraSpecs">
-        <description>Type extra specs support.</description>
-    </extension>
-    <extension alias="os-vol-mig-status-attr"
-        updated="2013-08-08T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume_mig_status_attribute/api/v1"
-        name="VolumeMigStatusAttribute">
-        <description>Expose migration_status as an attribute of a
-            volume.</description>
-    </extension>
-    <extension alias="os-image-create"
-        updated="2012-08-13T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/image-create/api/v1"
-        name="CreateVolumeExtension">
-        <description>Allow creating a volume from an image in the
-            Create Volume v1 API.</description>
-    </extension>
-    <extension alias="os-extended-services"
-        updated="2014-01-10T00:00:00-00:00"
-        namespace="http://docs.openstack.org/volume/ext/extended_services/api/v2"
-        name="ExtendedServices">
-        <description>Extended services support.</description>
-    </extension>
-    <extension alias="os-extended-snapshot-attributes"
-        updated="2012-06-19T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/extended_snapshot_attributes/api/v1"
-        name="ExtendedSnapshotAttributes">
-        <description>Extended SnapshotAttributes
-            support.</description>
-    </extension>
-    <extension alias="os-vol-image-meta"
-        updated="2012-12-07T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume_image_metadata/api/v1"
-        name="VolumeImageMetadata">
-        <description>Show image metadata associated with the
-            volume.</description>
-    </extension>
-    <extension alias="os-quota-class-sets"
-        updated="2012-03-12T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/quota-classes-sets/api/v1.1"
-        name="QuotaClasses">
-        <description>Quota classes management support.</description>
-    </extension>
-    <extension alias="os-volume-transfer"
-        updated="2013-05-29T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/volume-transfer/api/v1.1"
-        name="VolumeTransfer">
-        <description>Volume transfer management support.</description>
-    </extension>
-    <extension alias="os-volume-manage"
-        updated="2014-02-10T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/os-volume-manage/api/v1"
-        name="VolumeManage">
-        <description>Allows existing back end storage to be 'managed'
-            by cinder.</description>
-    </extension>
-    <extension alias="os-admin-actions"
-        updated="2012-08-25T00:00:00+00:00"
-        namespace="http://docs.openstack.org/volume/ext/admin-actions/api/v1.1"
-        name="AdminActions">
-        <description>Enable admin actions.</description>
-    </extension>
-    <extension alias="os-services" updated="2012-10-28T00:00:00-00:00"
-        namespace="http://docs.openstack.org/volume/ext/services/api/v2"
-        name="Services">
-        <description>Services support.</description>
-    </extension>
-</extensions>
diff --git a/api-ref/source/v3/samples/limits-show-response.xml b/api-ref/source/v3/samples/limits-show-response.xml
deleted file mode 100644
index 0f932b074d7..00000000000
--- a/api-ref/source/v3/samples/limits-show-response.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<limits xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/common/api/v1.0">
-    <rates/>
-    <absolute>
-        <limit name="totalSnapshotsUsed" value="0"/>
-        <limit name="maxTotalBackups" value="10"/>
-        <limit name="maxTotalVolumeGigabytes" value="1000"/>
-        <limit name="maxTotalSnapshots" value="10"/>
-        <limit name="maxTotalBackupGigabytes" value="1000"/>
-        <limit name="totalBackupGigabytesUsed" value="0"/>
-        <limit name="maxTotalVolumes" value="10"/>
-        <limit name="totalVolumesUsed" value="0"/>
-        <limit name="totalBackupsUsed" value="0"/>
-        <limit name="totalGigabytesUsed" value="0"/>
-    </absolute>
-</limits>
diff --git a/api-ref/source/v3/samples/qos-create-request.xml b/api-ref/source/v3/samples/qos-create-request.xml
deleted file mode 100644
index ac772236cac..00000000000
--- a/api-ref/source/v3/samples/qos-create-request.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<qos_specs name="performance-spec" delay="0" throughput="100" />
diff --git a/api-ref/source/v3/samples/qos-create-response.xml b/api-ref/source/v3/samples/qos-create-response.xml
deleted file mode 100644
index b2393248699..00000000000
--- a/api-ref/source/v3/samples/qos-create-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<qos_specs>
-    <qos_spec consumer="back-end" id="e1f84cf3-6b1e-4f25-8130-3244f69ec7c1" name="performance-spec">
-        <specs>
-            <delay>0</delay>
-            <throughput>100</throughput>
-        </specs>
-    </qos_spec>
-</qos_specs>
diff --git a/api-ref/source/v3/samples/qos-list-response.xml b/api-ref/source/v3/samples/qos-list-response.xml
deleted file mode 100644
index c77e7847ff3..00000000000
--- a/api-ref/source/v3/samples/qos-list-response.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<qos_specs>
-    <qos_spec consumer="back-end"
-        id="0388d6c6-d5d4-42a3-b289-95205c50dd15"
-        name="reliability-spec">
-        <specs>
-            <availability>100</availability>
-            <numberOfFailures>0</numberOfFailures>
-        </specs>
-    </qos_spec>
-    <qos_spec consumer="back-end"
-        id="ecfc6e2e-7117-44a4-8eec-f84d04f531a8"
-        name="performance-spec">
-        <specs>
-            <delay>0</delay>
-            <throughput>100</throughput>
-        </specs>
-    </qos_spec>
-</qos_specs>
diff --git a/api-ref/source/v3/samples/qos-show-response.xml b/api-ref/source/v3/samples/qos-show-response.xml
deleted file mode 100644
index 7aee8126ce8..00000000000
--- a/api-ref/source/v3/samples/qos-show-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<qos_specs>
-    <qos_spec consumer="back-end"
-        id="0388d6c6-d5d4-42a3-b289-95205c50dd15"
-        name="reliability-spec">
-        <specs>
-            <availability>100</availability>
-            <numberOfFailures>0</numberOfFailures>
-        </specs>
-    </qos_spec>
-</qos_specs>
diff --git a/api-ref/source/v3/samples/qos-unset-request.xml b/api-ref/source/v3/samples/qos-unset-request.xml
deleted file mode 100644
index c6f10f9f37b..00000000000
--- a/api-ref/source/v3/samples/qos-unset-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keys>
-    <key/>
-</keys>
diff --git a/api-ref/source/v3/samples/qos-update-request.xml b/api-ref/source/v3/samples/qos-update-request.xml
deleted file mode 100644
index 78524c7cadb..00000000000
--- a/api-ref/source/v3/samples/qos-update-request.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<qos_specs delay="2" throughput="100"/>
diff --git a/api-ref/source/v3/samples/qos-update-response.xml b/api-ref/source/v3/samples/qos-update-response.xml
deleted file mode 100644
index ed8dd0578d9..00000000000
--- a/api-ref/source/v3/samples/qos-update-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<qos_specs>
-    <qos_spec/>
-</qos_specs>
diff --git a/api-ref/source/v3/samples/qos_show_response.xml b/api-ref/source/v3/samples/qos_show_response.xml
deleted file mode 100644
index e208b8a2085..00000000000
--- a/api-ref/source/v3/samples/qos_show_response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<qos_associations>
-    <associations association_type="volume_type"
-        name="reliability-type"
-        id="a12983c2-83bd-4afa-be9f-ad796573ead6"/>
-</qos_associations>
diff --git a/api-ref/source/v3/samples/quotas-defaults-show-response.xml b/api-ref/source/v3/samples/quotas-defaults-show-response.xml
deleted file mode 100644
index 76a9292c137..00000000000
--- a/api-ref/source/v3/samples/quotas-defaults-show-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <cores>20</cores>
-  <fixed_ips>-1</fixed_ips>
-  <floating_ips>10</floating_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>10</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v3/samples/quotas-show-defaults-response.xml b/api-ref/source/v3/samples/quotas-show-defaults-response.xml
deleted file mode 100644
index b63b30b08f7..00000000000
--- a/api-ref/source/v3/samples/quotas-show-defaults-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <gigabytes>5</gigabytes>
-  <snapshots>10</snapshots>
-  <volumes>20</volumes>
-</quota_set>
diff --git a/api-ref/source/v3/samples/quotas-show-response.xml b/api-ref/source/v3/samples/quotas-show-response.xml
deleted file mode 100644
index b63b30b08f7..00000000000
--- a/api-ref/source/v3/samples/quotas-show-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <gigabytes>5</gigabytes>
-  <snapshots>10</snapshots>
-  <volumes>20</volumes>
-</quota_set>
diff --git a/api-ref/source/v3/samples/quotas-update-request.xml b/api-ref/source/v3/samples/quotas-update-request.xml
deleted file mode 100644
index ccf34efa0ab..00000000000
--- a/api-ref/source/v3/samples/quotas-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <snapshots>45</snapshots>
-</quota_set>
diff --git a/api-ref/source/v3/samples/quotas-update-response.xml b/api-ref/source/v3/samples/quotas-update-response.xml
deleted file mode 100644
index b63b30b08f7..00000000000
--- a/api-ref/source/v3/samples/quotas-update-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <gigabytes>5</gigabytes>
-  <snapshots>10</snapshots>
-  <volumes>20</volumes>
-</quota_set>
diff --git a/api-ref/source/v3/samples/quotas-user-show-response.xml b/api-ref/source/v3/samples/quotas-user-show-response.xml
deleted file mode 100644
index b63b30b08f7..00000000000
--- a/api-ref/source/v3/samples/quotas-user-show-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <gigabytes>5</gigabytes>
-  <snapshots>10</snapshots>
-  <volumes>20</volumes>
-</quota_set>
diff --git a/api-ref/source/v3/samples/snapshot-create-request.xml b/api-ref/source/v3/samples/snapshot-create-request.xml
deleted file mode 100644
index 2b56fde55da..00000000000
--- a/api-ref/source/v3/samples/snapshot-create-request.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    name="snap-001" description="Daily backup"
-    volume_id="5aa119a8-d25b-45a7-8d1b-88e127885635" force="true"/>
diff --git a/api-ref/source/v3/samples/snapshot-create-response.xml b/api-ref/source/v3/samples/snapshot-create-response.xml
deleted file mode 100644
index 1f72e69934c..00000000000
--- a/api-ref/source/v3/samples/snapshot-create-response.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot status="creating" description="Daily backup"
-    created_at="2013-02-25T03:56:53.081642"
-    volume_id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1"
-    id="ffa9bc5e-1172-4021-acaf-cdcd78a9584d" name="snap-001">
-    <metadata/>
-</snapshot>
diff --git a/api-ref/source/v3/samples/snapshot-metadata-show-response.xml b/api-ref/source/v3/samples/snapshot-metadata-show-response.xml
deleted file mode 100644
index f62f5b6b9c3..00000000000
--- a/api-ref/source/v3/samples/snapshot-metadata-show-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
-    <meta key="name">test</meta>
-</metadata>
diff --git a/api-ref/source/v3/samples/snapshot-metadata-update-request.xml b/api-ref/source/v3/samples/snapshot-metadata-update-request.xml
deleted file mode 100644
index ceeb8f0314b..00000000000
--- a/api-ref/source/v3/samples/snapshot-metadata-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata>
-    <meta key="key">v2</meta>
-</metadata>
diff --git a/api-ref/source/v3/samples/snapshot-metadata-update-response.xml b/api-ref/source/v3/samples/snapshot-metadata-update-response.xml
deleted file mode 100644
index 6d00cdef115..00000000000
--- a/api-ref/source/v3/samples/snapshot-metadata-update-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
-    <meta key="key">v2</meta>
-</metadata>
diff --git a/api-ref/source/v3/samples/snapshot-show-response.xml b/api-ref/source/v3/samples/snapshot-show-response.xml
deleted file mode 100644
index 5863aa554f4..00000000000
--- a/api-ref/source/v3/samples/snapshot-show-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot
-  xmlns:os-extended-snapshot-attributes="http://docs.openstack.org/openstack-block-storage/2.0/content/Extended_Snapshot_Attributes.html"
-  status="available" description="Very important"
-  created_at="2013-02-25 04:13:17"
-  volume_id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1"
-  id="2bb856e1-b3d8-4432-a858-09e4ce939389" name="snap-001"
-  os-extended-snapshot-attributes:project_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-  os-extended-snapshot-attributes:progress="100%">
-  <metadata/>
-</snapshot>
diff --git a/api-ref/source/v3/samples/snapshot-update-request.xml b/api-ref/source/v3/samples/snapshot-update-request.xml
deleted file mode 100644
index 670f6e68231..00000000000
--- a/api-ref/source/v3/samples/snapshot-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    name="snap-002" description="This is yet, another snapshot."/>
diff --git a/api-ref/source/v3/samples/snapshot-update-response.xml b/api-ref/source/v3/samples/snapshot-update-response.xml
deleted file mode 100644
index 1d09541c78c..00000000000
--- a/api-ref/source/v3/samples/snapshot-update-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot
-  xmlns:os-extended-snapshot-attributes="http://docs.openstack.org/openstack-block-storage/2.0/content/Extended_Snapshot_Attributes.html"
-    status="available"
-    description="This is yet, another snapshot"
-    created_at="2013-02-20T08:11:34.000000"
-    volume_id="2402b902-0b7a-458c-9c07-7435a826f794"
-    size="1"
-    id="4b502fcb-1f26-45f8-9fe5-3b9a0a52eaf2"
-    name="snap-002"
-    os-extended-snapshot-attributes:project_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-    os-extended-snapshot-attributes:progress="100%">
-    <metadata/>
-</snapshot>
diff --git a/api-ref/source/v3/samples/snapshots-list-detailed-response.xml b/api-ref/source/v3/samples/snapshots-list-detailed-response.xml
deleted file mode 100644
index 2114e0069ca..00000000000
--- a/api-ref/source/v3/samples/snapshots-list-detailed-response.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshots
-    xmlns:os-extended-snapshot-attributes="http://docs.openstack.org/volume/ext/extended_snapshot_attributes/api/v1">
-    <snapshot status="available"
-        description="volume snapshot"
-        created_at="2015-11-29 02:25:51+00:00"
-        volume_id="173f7b48-c4c1-4e70-9acc-086b39073506"
-        size="1" id="b1323cda-8e4b-41c1-afc5-2fc791809c8c"
-        name="test-volume-snapshot"
-        os-extended-snapshot-attributes:project_id="bab7d5c60cd041a0a36f7c4b6e1dd978"
-        os-extended-snapshot-attributes:progress="100%">
-        <metadata>
-            <meta key="name">test</meta>
-        </metadata>
-    </snapshot>
-</snapshots>
diff --git a/api-ref/source/v3/samples/snapshots-list-response.xml b/api-ref/source/v3/samples/snapshots-list-response.xml
deleted file mode 100644
index 654189455fb..00000000000
--- a/api-ref/source/v3/samples/snapshots-list-response.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshots>
-    <snapshot status="available"
-        description="volume snapshot"
-        created_at="2015-11-29 02:25:51+00:00"
-        volume_id="173f7b48-c4c1-4e70-9acc-086b39073506"
-        size="1" id="b1323cda-8e4b-41c1-afc5-2fc791809c8c"
-        name="test-volume-snapshot">
-        <metadata>
-            <meta key="name">test</meta>
-        </metadata>
-    </snapshot>
-</snapshots>
diff --git a/api-ref/source/v3/samples/user-quotas-show-response.xml b/api-ref/source/v3/samples/user-quotas-show-response.xml
deleted file mode 100644
index 76a9292c137..00000000000
--- a/api-ref/source/v3/samples/user-quotas-show-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <cores>20</cores>
-  <fixed_ips>-1</fixed_ips>
-  <floating_ips>10</floating_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>10</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v3/samples/user-quotas-update-request.xml b/api-ref/source/v3/samples/user-quotas-update-request.xml
deleted file mode 100644
index dd58ed24d0c..00000000000
--- a/api-ref/source/v3/samples/user-quotas-update-request.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
-  <force>true</force>
-  <instances>9</instances>
-</quota_set>
diff --git a/api-ref/source/v3/samples/user-quotas-update-response.xml b/api-ref/source/v3/samples/user-quotas-update-response.xml
deleted file mode 100644
index 43c36c7da31..00000000000
--- a/api-ref/source/v3/samples/user-quotas-update-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set>
-  <cores>20</cores>
-  <floating_ips>10</floating_ips>
-  <fixed_ips>-1</fixed_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
-  <instances>9</instances>
-  <key_pairs>100</key_pairs>
-  <metadata_items>128</metadata_items>
-  <ram>51200</ram>
-  <security_group_rules>20</security_group_rules>
-  <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/source/v3/samples/version-show-response.xml b/api-ref/source/v3/samples/version-show-response.xml
deleted file mode 100644
index aa42257291a..00000000000
--- a/api-ref/source/v3/samples/version-show-response.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<versions>
-  <version>
-    <id>v1.0</id>
-    <links>
-      <link>
-        <href>http://docs.openstack.org/</href>
-        <rel>describedby</rel>
-        <type>text/html</type>
-      </link>
-      <link>
-        <href>http://23.253.248.171:8776/v1/</href>
-        <rel>self</rel>
-      </link>
-    </links>
-    <media-types>
-      <media-type>
-        <base>application/json</base>
-        <type>application/vnd.openstack.volume+json;version=1</type>
-      </media-type>
-      <media-type>
-        <base>application/xml</base>
-        <type>application/vnd.openstack.volume+xml;version=1</type>
-      </media-type>
-    </media-types>
-    <min_version/>
-    <status>DEPRECATED</status>
-    <updated>2014-06-28T12:20:21Z</updated>
-    <version/>
-  </version>
-  <version>
-    <id>v2.0</id>
-    <links>
-      <link>
-        <href>http://docs.openstack.org/</href>
-        <rel>describedby</rel>
-        <type>text/html</type>
-      </link>
-      <link>
-        <href>http://23.253.248.171:8776/v2/</href>
-        <rel>self</rel>
-      </link>
-    </links>
-    <media-types>
-      <media-type>
-        <base>application/json</base>
-        <type>application/vnd.openstack.volume+json;version=1</type>
-      </media-type>
-      <media-type>
-        <base>application/xml</base>
-        <type>application/vnd.openstack.volume+xml;version=1</type>
-      </media-type>
-    </media-types>
-    <min_version/>
-    <status>SUPPORTED</status>
-    <updated>2014-06-28T12:20:21Z</updated>
-    <version/>
-  </version>
-  <version>
-    <id>v3.0</id>
-    <links>
-      <link>
-        <href>http://docs.openstack.org/</href>
-        <rel>describedby</rel>
-        <type>text/html</type>
-      </link>
-      <link>
-        <href>http://23.253.248.171/v3/</href>
-        <rel>self</rel>
-      </link>
-    </links>
-    <media-types>
-      <media-type>
-        <base>application/json</base>
-        <type>application/vnd.openstack.volume+json;version=1</type>
-      </media-type>
-      <media-type>
-        <base>application/xml</base>
-        <type>application/vnd.openstack.volume+xml;version=1</type>
-      </media-type>
-    </media-types>
-    <min_version>3.0</min_version>
-    <status>CURRENT</status>
-    <updated>2016-02-08T12:20:21Z</updated>
-    <version>3.0</version>
-  </version>
-</versions>
diff --git a/api-ref/source/v3/samples/versions-response.xml b/api-ref/source/v3/samples/versions-response.xml
deleted file mode 100644
index a09fac7165b..00000000000
--- a/api-ref/source/v3/samples/versions-response.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<choices xmlns="http://docs.openstack.org/common/api/v1.0" xmlns:atom="http://www.w3.org/2005/Atom">
-    <version status="DEPRECATED" id="v1.0">
-        <media-types>
-            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
-            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
-        </media-types>
-        <atom:link href="http://23.253.248.171:8776/v1/.xml" rel="self" />
-    </version>
-    <version status="SUPPORTED" id="v2.0">
-        <media-types>
-            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
-            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
-        </media-types>
-        <atom:link href="http://23.253.248.171:8776/v2/.xml" rel="self" />
-    </version>
-    <version status="CURRENT" id="v3.0">
-        <media-types>
-            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
-            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
-        </media-types>
-        <atom:link href="http://23.253.248.171:8776/v3/.xml" rel="self" />
-    </version>
-</choices>
-
diff --git a/api-ref/source/v3/samples/volume-create-request.xml b/api-ref/source/v3/samples/volume-create-request.xml
deleted file mode 100644
index 5b655e92e9f..00000000000
--- a/api-ref/source/v3/samples/volume-create-request.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    name="vol-001" description="Another volume."
-    size="2"/>
diff --git a/api-ref/source/v3/samples/volume-create-response.xml b/api-ref/source/v3/samples/volume-create-response.xml
deleted file mode 100644
index 9be3c5e3943..00000000000
--- a/api-ref/source/v3/samples/volume-create-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volume xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/volume/api/v1" status="creating"
-    name="vol-001" availability_zone="nova" bootable="false"
-    created_at="2014-02-21 20:18:33.122452"
-    description="Another volume." volume_type="None"
-    snapshot_id="None" source_volid="None"
-    id="83960a54-8dad-4fd8-bc41-33c71e098e04" size="2">
-    <attachments/>
-    <metadata/>
-</volume>
diff --git a/api-ref/source/v3/samples/volume-metadata-show-response.xml b/api-ref/source/v3/samples/volume-metadata-show-response.xml
deleted file mode 100644
index ba106077a94..00000000000
--- a/api-ref/source/v3/samples/volume-metadata-show-response.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"/>
diff --git a/api-ref/source/v3/samples/volume-metadata-update-request.xml b/api-ref/source/v3/samples/volume-metadata-update-request.xml
deleted file mode 100644
index ceeb8f0314b..00000000000
--- a/api-ref/source/v3/samples/volume-metadata-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata>
-    <meta key="key">v2</meta>
-</metadata>
diff --git a/api-ref/source/v3/samples/volume-metadata-update-response.xml b/api-ref/source/v3/samples/volume-metadata-update-response.xml
deleted file mode 100644
index 6d00cdef115..00000000000
--- a/api-ref/source/v3/samples/volume-metadata-update-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
-    <meta key="key">v2</meta>
-</metadata>
diff --git a/api-ref/source/v3/samples/volume-show-response.xml b/api-ref/source/v3/samples/volume-show-response.xml
deleted file mode 100644
index 17632dfcb80..00000000000
--- a/api-ref/source/v3/samples/volume-show-response.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volume
-    xmlns:os-vol-image-meta="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Image_Metadata.html"
-    xmlns:os-vol-tenant-attr="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Tenant_Attribute.html"
-    xmlns:os-vol-host-attr="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Host_Attribute.html"
-    xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content"
-    status="available" name="vol-003" availability_zone="nova"
-    bootable="false" created_at="2013-02-25 02:40:21"
-    description="This is yet, another volume." volume_type="None"
-    source_volid="None" snapshot_id="None"
-    id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1"
-    os-vol-tenant-attr:tenant_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-    os-vol-host-attr:host="ip-10-168-107-25">
-    <attachments/>
-    <metadata>
-        <meta key="contents">not junk</meta>
-    </metadata>
-</volume>
diff --git a/api-ref/source/v3/samples/volume-type-access-add-request.xml b/api-ref/source/v3/samples/volume-type-access-add-request.xml
deleted file mode 100644
index fdf06a0c2c1..00000000000
--- a/api-ref/source/v3/samples/volume-type-access-add-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<addProjectAccess id="bb4f8f7f-fc38-4807-bd78-5710792205e1">
-  <project>"f270b245cb11498ca4031deb7e141cfa"</project>
-</addProjectAccess>
diff --git a/api-ref/source/v3/samples/volume-type-access-delete-request.xml b/api-ref/source/v3/samples/volume-type-access-delete-request.xml
deleted file mode 100644
index dcde1b2e4e7..00000000000
--- a/api-ref/source/v3/samples/volume-type-access-delete-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<removeProjectAccess id="bb4f8f7f-fc38-4807-bd78-5710792205e1">
-  <project>"f270b245cb11498ca4031deb7e141cfa"</project>
-</removeProjectAccess>
diff --git a/api-ref/source/v3/samples/volume-type-show-request.xml b/api-ref/source/v3/samples/volume-type-show-request.xml
deleted file mode 100644
index 1c4291d08f1..00000000000
--- a/api-ref/source/v3/samples/volume-type-show-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_type xmlns="http://docs.openstack.org/volume/api/v1"
-             id="289da7f8-6440-407c-9fb4-7db01ec49164"
-             name="vol-type-001">
-    <extra_specs>
-        <extra_spec key="capabilities">gpu</extra_spec>
-    </extra_specs>
-</volume_type>
diff --git a/api-ref/source/v3/samples/volume-type-show-response.xml b/api-ref/source/v3/samples/volume-type-show-response.xml
deleted file mode 100644
index f5935c74a1b..00000000000
--- a/api-ref/source/v3/samples/volume-type-show-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_type
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    id="6685584b-1eac-4da6-b5c3-555430cf68ff" name="vol-type-001"
-    description="volume type 001" is_public="true">
-    <extra_specs>
-        <extra_spec key="capabilities">gpu</extra_spec>
-    </extra_specs>
-</volume_type>
diff --git a/api-ref/source/v3/samples/volume-types-list-response.xml b/api-ref/source/v3/samples/volume-types-list-response.xml
deleted file mode 100644
index e227787da51..00000000000
--- a/api-ref/source/v3/samples/volume-types-list-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume_types
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content">
-    <volume_type id="6685584b-1eac-4da6-b5c3-555430cf68ff" name="SSD">
-        <extra_specs>
-            <extra_spec key="capabilities">gpu</extra_spec>
-        </extra_specs>
-    </volume_type>
-    <volume_type id="8eb69a46-df97-4e41-9586-9a40a7533803" name="SATA"
-    />
-</volume_types>
diff --git a/api-ref/source/v3/samples/volume-update-request.xml b/api-ref/source/v3/samples/volume-update-request.xml
deleted file mode 100644
index d03ed193032..00000000000
--- a/api-ref/source/v3/samples/volume-update-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot
-    xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
-    name="vol-003" description="This is yet, another volume."/>
diff --git a/api-ref/source/v3/samples/volume-update-response.xml b/api-ref/source/v3/samples/volume-update-response.xml
deleted file mode 100644
index 0524361acba..00000000000
--- a/api-ref/source/v3/samples/volume-update-response.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volume xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content"
-    status="available" name="vol-003" availability_zone="nova"
-    created_at="2013-02-25 02:40:21"
-    description="This is yet, another volume." volume_type="None"
-    source_volid="None" snapshot_id="None"
-    id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1">
-    <attachments/>
-    <metadata>
-        <meta key="contents">not junk</meta>
-    </metadata>
-</volume>
diff --git a/api-ref/source/v3/samples/volumes-list-detailed-response.xml b/api-ref/source/v3/samples/volumes-list-detailed-response.xml
deleted file mode 100644
index 36bbffd0ab8..00000000000
--- a/api-ref/source/v3/samples/volumes-list-detailed-response.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volumes
-    xmlns:os-vol-image-meta="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Image_Metadata.html"
-    xmlns:os-vol-tenant-attr="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Tenant_Attribute.html"
-    xmlns:os-vol-host-attr="http://docs.openstack.org/openstack-block-storage/2.0/content/Volume_Host_Attribute.html"
-    xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content">
-    <volume status="available" name="vol-004" availability_zone="nova"
-        created_at="2013-02-25 06:36:28" description="Another volume."
-        volume_type="None" source_volid="None" snapshot_id="None"
-        id="45baf976-c20a-4894-a7c3-c94b7376bf55" size="1"
-        os-vol-tenant-attr:tenant_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-        os-vol-host-attr:host="ip-10-168-107-25">
-        <attachments/>
-        <metadata>
-            <meta key="contents">junk</meta>
-        </metadata>
-    </volume>
-    <volume status="available" name="vol-003" availability_zone="nova"
-        created_at="2013-02-25 02:40:21"
-        description="This is yet, another volume." volume_type="None"
-        source_volid="None" snapshot_id="None"
-        id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1"
-        os-vol-tenant-attr:tenant_id="0c2eba2c5af04d3f9e9d0d410b371fde"
-        os-vol-host-attr:host="ip-10-168-107-25">
-        <attachments/>
-        <metadata>
-            <meta key="contents">not junk</meta>
-        </metadata>
-    </volume>
-</volumes>
diff --git a/api-ref/source/v3/samples/volumes-list-response.xml b/api-ref/source/v3/samples/volumes-list-response.xml
deleted file mode 100644
index 024608615ad..00000000000
--- a/api-ref/source/v3/samples/volumes-list-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volumes xmlns:atom="http://www.w3.org/2005/Atom"
-    xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content">
-    <volume name="vol-004" id="45baf976-c20a-4894-a7c3-c94b7376bf55">
-        <attachments/>
-        <metadata/>
-    </volume>
-    <volume name="vol-003" id="5aa119a8-d25b-45a7-8d1b-88e127885635">
-        <attachments/>
-        <metadata/>
-    </volume>
-</volumes>