diff --git a/v2/src/samples/backup_create_request.json b/v2/src/samples/backup_create_request.json
deleted file mode 100644
index 744accb..0000000
--- a/v2/src/samples/backup_create_request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "backup":{
-      "container":null,
-      "description":null,
-      "name":"backup001",
-      "volume_id":"64f5d2fb-d836-4063-b7e2-544d5c1ff607"
-   }
-}
diff --git a/v2/src/samples/backup_create_response.json b/v2/src/samples/backup_create_response.json
deleted file mode 100644
index 0e48d2b..0000000
--- a/v2/src/samples/backup_create_response.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-   "backup":{
-      "id":"deac8b8c-35c9-4c71-acaa-889c2d5d5c8e",
-      "links":[
-         {
-            "href":"http://localhost:8776/v2/c95fc3e4afe248a49a28828f286a7b38/backups/deac8b8c-35c9-4c71-acaa-889c2d5d5c8e",
-            "rel":"self"
-         },
-         {
-            "href":"http://localhost:8776/c95fc3e4afe248a49a28828f286a7b38/backups/deac8b8c-35c9-4c71-acaa-889c2d5d5c8e",
-            "rel":"bookmark"
-         }
-      ],
-      "name":"backup001"
-   }
-}
diff --git a/v2/src/samples/backup_list_detail_response.json b/v2/src/samples/backup_list_detail_response.json
deleted file mode 100644
index b3e4ec0..0000000
--- a/v2/src/samples/backup_list_detail_response.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-   "backups":[
-      {
-         "availability_zone":"az1",
-         "container":"volumebackups",
-         "created_at":"2013-04-02T10:35:27.000000",
-         "description":null,
-         "fail_reason":null,
-         "id":"2ef47aee-8844-490c-804d-2a8efe561c65",
-         "links":[
-            {
-               "href":"http://localhost:8776/v1/c95fc3e4afe248a49a28828f286a7b38/backups/2ef47aee-8844-490c-804d-2a8efe561c65",
-               "rel":"self"
-            },
-            {
-               "href":"http://localhost:8776/c95fc3e4afe248a49a28828f286a7b38/backups/2ef47aee-8844-490c-804d-2a8efe561c65",
-               "rel":"bookmark"
-            }
-         ],
-         "name":"backup001",
-         "object_count":22,
-         "size":1,
-         "status":"available",
-         "volume_id":"e5185058-943a-4cb4-96d9-72c184c337d6"
-      },
-      {
-         "availability_zone":"az1",
-         "container":"volumebackups",
-         "created_at":"2013-04-02T10:21:48.000000",
-         "description":null,
-         "fail_reason":null,
-         "id":"4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8",
-         "links":[
-            {
-               "href":"http://localhost:8776/v1/c95fc3e4afe248a49a28828f286a7b38/backups/4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8",
-               "rel":"self"
-            },
-            {
-               "href":"http://localhost:8776/c95fc3e4afe248a49a28828f286a7b38/backups/4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8",
-               "rel":"bookmark"
-            }
-         ],
-         "name":"backup002",
-         "object_count":22,
-         "size":1,
-         "status":"available",
-         "volume_id":"e5185058-943a-4cb4-96d9-72c184c337d6"
-      }
-   ]
-}
\ No newline at end of file
diff --git a/v2/src/samples/backup_list_simple_response.json b/v2/src/samples/backup_list_simple_response.json
deleted file mode 100644
index 0283fd5..0000000
--- a/v2/src/samples/backup_list_simple_response.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-   "backups":[
-      {
-         "id":"2ef47aee-8844-490c-804d-2a8efe561c65",
-         "links":[
-            {
-               "href":"http://localhost:8776/v1/c95fc3e4afe248a49a28828f286a7b38/backups/2ef47aee-8844-490c-804d-2a8efe561c65",
-               "rel":"self"
-            },
-            {
-               "href":"http://localhost:8776/c95fc3e4afe248a49a28828f286a7b38/backups/2ef47aee-8844-490c-804d-2a8efe561c65",
-               "rel":"bookmark"
-            }
-         ],
-         "name":"backup001"
-      },
-      {
-         "id":"4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8",
-         "links":[
-            {
-               "href":"http://localhost:8776/v1/c95fc3e4afe248a49a28828f286a7b38/backups/4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8",
-               "rel":"self"
-            },
-            {
-               "href":"http://localhost:8776/c95fc3e4afe248a49a28828f286a7b38/backups/4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8",
-               "rel":"bookmark"
-            }
-         ],
-         "name":"backup002"
-      }
-   ]
-}
diff --git a/v2/src/samples/backup_restore_request.json b/v2/src/samples/backup_restore_request.json
deleted file mode 100644
index ab883db..0000000
--- a/v2/src/samples/backup_restore_request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "restore":{
-      "volume_id":"64f5d2fb-d836-4063-b7e2-544d5c1ff607"
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/backup_restore_response.json b/v2/src/samples/backup_restore_response.json
deleted file mode 100644
index 26e23af..0000000
--- a/v2/src/samples/backup_restore_response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-   "restore":{
-      "backup_id":"2ef47aee-8844-490c-804d-2a8efe561c65",
-      "volume_id":"795114e8-7489-40be-a978-83797f2c1dd3"
-   }
-}
diff --git a/v2/src/samples/backup_show_response.json b/v2/src/samples/backup_show_response.json
deleted file mode 100644
index 1f52922..0000000
--- a/v2/src/samples/backup_show_response.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-   "backup":{
-      "availability_zone":"az1",
-      "container":"volumebackups",
-      "created_at":"2013-04-02T10:35:27.000000",
-      "description":null,
-      "fail_reason":null,
-      "id":"2ef47aee-8844-490c-804d-2a8efe561c65",
-      "links":[
-         {
-            "href":"http://localhost:8776/v1/c95fc3e4afe248a49a28828f286a7b38/backups/2ef47aee-8844-490c-804d-2a8efe561c65",
-            "rel":"self"
-         },
-         {
-            "href":"http://localhost:8776/c95fc3e4afe248a49a28828f286a7b38/backups/2ef47aee-8844-490c-804d-2a8efe561c65",
-            "rel":"bookmark"
-         }
-      ],
-      "name":"backup001",
-      "object_count":22,
-      "size":1,
-      "status":"available",
-      "volume_id":"e5185058-943a-4cb4-96d9-72c184c337d6"
-   }
-}
diff --git a/v2/src/samples/snapshot_create_request.json b/v2/src/samples/snapshot_create_request.json
deleted file mode 100644
index eccea82..0000000
--- a/v2/src/samples/snapshot_create_request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "snapshot":{
-      "name":"snap-001",
-      "description":"Daily backup",
-      "volume_id":"5aa119a8-d25b-45a7-8d1b-88e127885635",
-      "force":true
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/snapshot_create_response.json b/v2/src/samples/snapshot_create_response.json
deleted file mode 100644
index c432145..0000000
--- a/v2/src/samples/snapshot_create_response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "snapshot": {
-        "status": "creating",
-        "description": "Daily backup",
-        "created_at": "2013-02-25T03:56:53.081642",
-        "metadata": {},
-        "volume_id": "5aa119a8-d25b-45a7-8d1b-88e127885635",
-        "size": 1,
-        "id": "ffa9bc5e-1172-4021-acaf-cdcd78a9584d",
-        "name": "snap-001"
-    }
-}
\ No newline at end of file
diff --git a/v2/src/samples/snapshot_list_detail_response.json b/v2/src/samples/snapshot_list_detail_response.json
deleted file mode 100644
index 85c4636..0000000
--- a/v2/src/samples/snapshot_list_detail_response.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-   "snapshots":[
-      {
-         "status":"available",
-         "os-extended-snapshot-attributes:progress":"100%",
-         "description":"Daily backup",
-         "created_at":"2013-02-25T07:30:12.000000",
-         "metadata":{
-
-         },
-         "volume_id":"5aa119a8-d25b-45a7-8d1b-88e127885635",
-         "os-extended-snapshot-attributes:project_id":"0c2eba2c5af04d3f9e9d0d410b371fde",
-         "size":30,
-         "id":"43f20e0e-2c2c-4770-9d4e-c3d769ae5470",
-         "name":"snap-001"
-      },
-      {
-         "status":"available",
-         "os-extended-snapshot-attributes:progress":"100%",
-         "description":"Weekly backup",
-         "created_at":"2013-02-25T07:20:38.000000",
-         "metadata":{
-
-         },
-         "volume_id":"806092e3-7551-4fff-a005-49016f4943b1",
-         "os-extended-snapshot-attributes:project_id":"0c2eba2c5af04d3f9e9d0d410b371fde",
-         "size":1,
-         "id":"e820db06-58b5-439d-bac6-c01faa3f6499",
-         "name":"snap-002"
-      }
-   ]
-}
\ No newline at end of file
diff --git a/v2/src/samples/snapshot_list_simple_response.json b/v2/src/samples/snapshot_list_simple_response.json
deleted file mode 100644
index af1c1f2..0000000
--- a/v2/src/samples/snapshot_list_simple_response.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-   "snapshots":[
-      {
-         "status":"available",
-         "description":"Very important",
-         "created_at":"2013-02-25T04:13:17.000000",
-         "metadata":{
-
-         },
-         "volume_id":"5aa119a8-d25b-45a7-8d1b-88e127885635",
-         "size":1,
-         "id":"2bb856e1-b3d8-4432-a858-09e4ce939389",
-         "name":"snap-001"
-      },
-      {
-         "status":"available",
-         "description":"Weekly backup",
-         "created_at":"2013-02-25T07:20:38.000000",
-         "metadata":{
-
-         },
-         "volume_id":"806092e3-7551-4fff-a005-49016f4943b1",
-         "size":1,
-         "id":"e820db06-58b5-439d-bac6-c01faa3f6499",
-         "name":"snap-002"
-      }
-   ]
-}
\ No newline at end of file
diff --git a/v2/src/samples/snapshot_show_response.json b/v2/src/samples/snapshot_show_response.json
deleted file mode 100644
index a7fd1d8..0000000
--- a/v2/src/samples/snapshot_show_response.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-   "snapshot":{
-      "status":"available",
-      "os-extended-snapshot-attributes:progress":"100%",
-      "description":"Daily backup",
-      "created_at":"2013-02-25T04:13:17.000000",
-      "metadata":{
-
-      },
-      "volume_id":"5aa119a8-d25b-45a7-8d1b-88e127885635",
-      "os-extended-snapshot-attributes:project_id":"0c2eba2c5af04d3f9e9d0d410b371fde",
-      "size":1,
-      "id":"2bb856e1-b3d8-4432-a858-09e4ce939389",
-      "name":"snap-001"
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/snapshot_show_response.xml b/v2/src/samples/snapshot_show_response.xml
deleted file mode 100644
index 6071ee0..0000000
--- a/v2/src/samples/snapshot_show_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="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/v2/src/samples/snapshot_update_request.json b/v2/src/samples/snapshot_update_request.json
deleted file mode 100644
index 3c418c2..0000000
--- a/v2/src/samples/snapshot_update_request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-   "snapshot":{
-      "name":"snap-002",
-      "description":"This is yet, another snapshot."
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/snapshot_update_response.json b/v2/src/samples/snapshot_update_response.json
deleted file mode 100644
index e1c93f0..0000000
--- a/v2/src/samples/snapshot_update_response.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "snapshot": {
-        "created_at": "2013-02-20T08:11:34.000000",
-        "description": "This is yet, another snapshot",
-        "name": "vol-002",
-        "id": "4b502fcb-1f26-45f8-9fe5-3b9a0a52eaf2",
-        "size": 1,
-        "status": "available",
-        "volume_id": "2402b902-0b7a-458c-9c07-7435a826f794"
-    }
-}
diff --git a/v2/src/samples/volume_create_request.json b/v2/src/samples/volume_create_request.json
deleted file mode 100644
index 84882ea..0000000
--- a/v2/src/samples/volume_create_request.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-   "volume":{
-      "name":"vol-001",
-      "description":"Another volume.",
-      "size":30,
-      "volume_type":"289da7f8-6440-407c-9fb4-7db01ec49164",
-      "availability_zone":"us-east1",
-      "metadata":{
-         "contents":"junk"
-      }
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/volume_create_response.json b/v2/src/samples/volume_create_response.json
deleted file mode 100644
index b4f351e..0000000
--- a/v2/src/samples/volume_create_response.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-   "volume":{
-      "id":"6996b558-d633-4635-8116-adf14009fcc3",
-      "links":[
-         {
-            "href":"http://localhost:8776/v2/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/6996b558-d633-4635-8116-adf14009fcc3",
-            "rel":"self"
-         },
-         {
-            "href":"http://localhost:8776/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/6996b558-d633-4635-8116-adf14009fcc3",
-            "rel":"bookmark"
-         }
-      ],
-      "name":"vol-001"
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/volume_list_detail_response.json b/v2/src/samples/volume_list_detail_response.json
deleted file mode 100644
index 2284e2f..0000000
--- a/v2/src/samples/volume_list_detail_response.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-   "volumes":[
-      {
-         "status":"available",
-         "attachments":[
-
-         ],
-         "links":[
-            {
-               "href":"http://localhost:8776/v2/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/45baf976-c20a-4894-a7c3-c94b7376bf55",
-               "rel":"self"
-            },
-            {
-               "href":"http://localhost:8776/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/45baf976-c20a-4894-a7c3-c94b7376bf55",
-               "rel":"bookmark"
-            }
-         ],
-         "availability_zone":"nova",
-         "os-vol-host-attr:host":"ip-10-168-107-25",
-         "source_volid":null,
-         "snapshot_id":null,
-         "id":"45baf976-c20a-4894-a7c3-c94b7376bf55",
-         "description":"Another volume.",
-         "name":"vol-004",
-         "created_at":"2013-02-25T06:36:28.000000",
-         "volume_type":"None",
-         "os-vol-tenant-attr:tenant_id":"0c2eba2c5af04d3f9e9d0d410b371fde",
-         "size":1,
-         "metadata":{
-            "contents":"junk"
-         }
-      },
-      {
-         "status":"available",
-         "attachments":[
-
-         ],
-         "links":[
-            {
-               "href":"http://localhost:8776/v2/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/5aa119a8-d25b-45a7-8d1b-88e127885635",
-               "rel":"self"
-            },
-            {
-               "href":"http://localhost:8776/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/5aa119a8-d25b-45a7-8d1b-88e127885635",
-               "rel":"bookmark"
-            }
-         ],
-         "availability_zone":"nova",
-         "os-vol-host-attr:host":"ip-10-168-107-25",
-         "source_volid":null,
-         "snapshot_id":null,
-         "id":"5aa119a8-d25b-45a7-8d1b-88e127885635",
-         "description":"This is yet, another volume.",
-         "name":"vol-003",
-         "created_at":"2013-02-25T02:40:21.000000",
-         "volume_type":"None",
-         "os-vol-tenant-attr:tenant_id":"0c2eba2c5af04d3f9e9d0d410b371fde",
-         "size":1,
-         "metadata":{
-            "contents":"not junk"
-         }
-      }
-   ]
-}
\ No newline at end of file
diff --git a/v2/src/samples/volume_list_detail_response.xml b/v2/src/samples/volume_list_detail_response.xml
deleted file mode 100644
index f8cada9..0000000
--- a/v2/src/samples/volume_list_detail_response.xml
+++ /dev/null
@@ -1,43 +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/v2/src/samples/volume_list_simple_response.json b/v2/src/samples/volume_list_simple_response.json
deleted file mode 100644
index 9950842..0000000
--- a/v2/src/samples/volume_list_simple_response.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-   "volumes":[
-      {
-         "id":"45baf976-c20a-4894-a7c3-c94b7376bf55",
-         "links":[
-            {
-               "href":"http://54.241.241.145:8776/v2/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/45baf976-c20a-4894-a7c3-c94b7376bf55",
-               "rel":"self"
-            },
-            {
-               "href":"http://54.241.241.145:8776/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/45baf976-c20a-4894-a7c3-c94b7376bf55",
-               "rel":"bookmark"
-            }
-         ],
-         "name":"vol-004"
-      },
-      {
-         "id":"5aa119a8-d25b-45a7-8d1b-88e127885635",
-         "links":[
-            {
-               "href":"http://54.241.241.145:8776/v2/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/5aa119a8-d25b-45a7-8d1b-88e127885635",
-               "rel":"self"
-            },
-            {
-               "href":"http://54.241.241.145:8776/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/5aa119a8-d25b-45a7-8d1b-88e127885635",
-               "rel":"bookmark"
-            }
-         ],
-         "name":"vol-003"
-      }
-   ]
-}
\ No newline at end of file
diff --git a/v2/src/samples/volume_list_simple_response.xml b/v2/src/samples/volume_list_simple_response.xml
deleted file mode 100644
index 88bcabf..0000000
--- a/v2/src/samples/volume_list_simple_response.xml
+++ /dev/null
@@ -1,13 +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/v2/src/samples/volume_show_response.json b/v2/src/samples/volume_show_response.json
deleted file mode 100644
index a8f43e2..0000000
--- a/v2/src/samples/volume_show_response.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-   "volume":{
-      "status":"available",
-      "attachments":[
-
-      ],
-      "links":[
-         {
-            "href":"http://localhost:8776/v2/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/5aa119a8-d25b-45a7-8d1b-88e127885635",
-            "rel":"self"
-         },
-         {
-            "href":"http://localhost:8776/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/5aa119a8-d25b-45a7-8d1b-88e127885635",
-            "rel":"bookmark"
-         }
-      ],
-      "availability_zone":"nova",
-      "os-vol-host-attr:host":"ip-10-168-107-25",
-      "source_volid":null,
-      "snapshot_id":null,
-      "id":"5aa119a8-d25b-45a7-8d1b-88e127885635",
-      "description":"Super volume.",
-      "name":"vol-002",
-      "created_at":"2013-02-25T02:40:21.000000",
-      "volume_type":"None",
-      "os-vol-tenant-attr:tenant_id":"0c2eba2c5af04d3f9e9d0d410b371fde",
-      "size":1,
-      "metadata":{
-         "contents":"not junk"
-      }
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/volume_show_response.xml b/v2/src/samples/volume_show_response.xml
deleted file mode 100644
index 77e5b94..0000000
--- a/v2/src/samples/volume_show_response.xml
+++ /dev/null
@@ -1,24 +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"
-    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/v2/src/samples/volume_type_list_response.json b/v2/src/samples/volume_type_list_response.json
deleted file mode 100644
index 9d495bd..0000000
--- a/v2/src/samples/volume_type_list_response.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-   "volume_types":[
-      {
-         "extra_specs":{
-            "capabilities":"gpu"
-         },
-         "id":"6685584b-1eac-4da6-b5c3-555430cf68ff",
-         "name":"SSD"
-      },
-      {
-         "extra_specs":{
-
-         },
-         "id":"8eb69a46-df97-4e41-9586-9a40a7533803",
-         "name":"SATA"
-      }
-   ]
-}
\ No newline at end of file
diff --git a/v2/src/samples/volume_type_list_response.xml b/v2/src/samples/volume_type_list_response.xml
deleted file mode 100644
index 63b5dd9..0000000
--- a/v2/src/samples/volume_type_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/v2/src/samples/volume_type_show_response.json b/v2/src/samples/volume_type_show_response.json
deleted file mode 100644
index afcbbb4..0000000
--- a/v2/src/samples/volume_type_show_response.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-   "volume_type":{
-      "id":"6685584b-1eac-4da6-b5c3-555430cf68ff",
-      "name":"SSD",
-      "extra_specs":{
-         "capabilities":"gpu"
-      }
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/volume_type_show_response.xml b/v2/src/samples/volume_type_show_response.xml
deleted file mode 100644
index 552446b..0000000
--- a/v2/src/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/openstack-block-storage/2.0/content"
-    id="6685584b-1eac-4da6-b5c3-555430cf68ff"
-    name="SSD">
-    <extra_specs>
-        <extra_spec key="capabilities">gpu</extra_spec>
-    </extra_specs>
-</volume_type>
diff --git a/v2/src/samples/volume_update_request.json b/v2/src/samples/volume_update_request.json
deleted file mode 100644
index 0ff7183..0000000
--- a/v2/src/samples/volume_update_request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-   "volume":{
-      "name":"vol-003",
-      "description":"This is yet, another volume."
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/volume_update_request.xml b/v2/src/samples/volume_update_request.xml
deleted file mode 100644
index 4cb907a..0000000
--- a/v2/src/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/v2/src/samples/volume_update_response.json b/v2/src/samples/volume_update_response.json
deleted file mode 100644
index e71390b..0000000
--- a/v2/src/samples/volume_update_response.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-   "volume":{
-      "status":"available",
-      "attachments":[
-
-      ],
-      "links":[
-         {
-            "href":"http://localhost:8776/v2/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/5aa119a8-d25b-45a7-8d1b-88e127885635",
-            "rel":"self"
-         },
-         {
-            "href":"http://localhost:8776/0c2eba2c5af04d3f9e9d0d410b371fde/volumes/5aa119a8-d25b-45a7-8d1b-88e127885635",
-            "rel":"bookmark"
-         }
-      ],
-      "availability_zone":"nova",
-      "source_volid":null,
-      "snapshot_id":null,
-      "id":"5aa119a8-d25b-45a7-8d1b-88e127885635",
-      "description":"This is yet, another volume.",
-      "name":"vol-003",
-      "created_at":"2013-02-25T02:40:21.000000",
-      "volume_type":"None",
-      "size":1,
-      "metadata":{
-         "contents":"not junk"
-      }
-   }
-}
\ No newline at end of file
diff --git a/v2/src/samples/volume_update_response.xml b/v2/src/samples/volume_update_response.xml
deleted file mode 100644
index 72b73ac..0000000
--- a/v2/src/samples/volume_update_response.xml
+++ /dev/null
@@ -1,19 +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>