diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-add-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-add-post-req.xml
deleted file mode 100644
index 6160b250e..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-add-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addSecurityGroup>
-  <name>test</name>
-</addSecurityGroup>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-post-req.xml
deleted file mode 100644
index 34893bb00..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-post-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<security_group name="test">
-    <description>
-        description
-    </description>
-</security_group>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-remove-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-remove-post-req.xml
deleted file mode 100644
index a238f67e6..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-remove-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<removeSecurityGroup>
-  <name>test</name>
-</removeSecurityGroup>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.xml
deleted file mode 100644
index b5c2bfb35..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group xmlns="http://docs.openstack.org/compute/api/v1.1" tenant_id="openstack" id="2" name="test">
-  <description>
-        description
-    </description>
-  <rules/>
-</security_group>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-get-resp.xml
deleted file mode 100644
index 8d950fb8d..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group xmlns="http://docs.openstack.org/compute/api/v1.1" tenant_id="openstack" id="1" name="default">
-  <description>default</description>
-  <rules/>
-</security_group>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-list-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-list-get-resp.xml
deleted file mode 100644
index 8f6e201bd..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-list-get-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_groups xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <security_group tenant_id="openstack" id="1" name="default">
-    <description>default</description>
-    <rules/>
-  </security_group>
-</security_groups>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-security-groups-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-security-groups-list-resp.xml
deleted file mode 100644
index 8f6e201bd..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-security-groups-list-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_groups xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <security_group tenant_id="openstack" id="1" name="default">
-    <description>default</description>
-    <rules/>
-  </security_group>
-</security_groups>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-add-post-req.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-add-post-req.xml
deleted file mode 100644
index 6160b250e..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-add-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addSecurityGroup>
-  <name>test</name>
-</addSecurityGroup>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-post-req.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-post-req.xml
deleted file mode 100644
index 34893bb00..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-post-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<security_group name="test">
-    <description>
-        description
-    </description>
-</security_group>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-remove-post-req.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-remove-post-req.xml
deleted file mode 100644
index a238f67e6..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-remove-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<removeSecurityGroup>
-  <name>test</name>
-</removeSecurityGroup>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-create-resp.xml
deleted file mode 100644
index b5c2bfb35..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-create-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group xmlns="http://docs.openstack.org/compute/api/v1.1" tenant_id="openstack" id="2" name="test">
-  <description>
-        description
-    </description>
-  <rules/>
-</security_group>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-get-resp.xml
deleted file mode 100644
index 8d950fb8d..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group xmlns="http://docs.openstack.org/compute/api/v1.1" tenant_id="openstack" id="1" name="default">
-  <description>default</description>
-  <rules/>
-</security_group>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-list-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-list-get-resp.xml
deleted file mode 100644
index 8f6e201bd..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-list-get-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_groups xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <security_group tenant_id="openstack" id="1" name="default">
-    <description>default</description>
-    <rules/>
-  </security_group>
-</security_groups>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-security-groups-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-security-groups-list-resp.xml
deleted file mode 100644
index 8f6e201bd..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-security-groups-list-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_groups xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <security_group tenant_id="openstack" id="1" name="default">
-    <description>default</description>
-    <rules/>
-  </security_group>
-</security_groups>
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-admin-actions.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-admin-actions.wadl
index 67d30b82f..858658587 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-admin-actions.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-admin-actions.wadl
@@ -619,13 +619,6 @@
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"
-                    title="Add security group: XML request">
-                    <xsdxt:code
-                        href="../api_samples/os-security-groups/security-group-add-post-req.xml"
-                    />
-                </wadl:doc>
                 <param name="addSecurityGroup" style="plain"
                     type="xsd:string" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -663,13 +656,6 @@
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"
-                    title="Remove security group: XML request">
-                    <xsdxt:code
-                        href="../api_samples/os-security-groups/security-group-remove-post-req.xml"
-                    />
-                </wadl:doc>
                 <param name="removeSecurityGroup" style="plain"
                     type="xsd:string" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
index a8246b490..137b90e7b 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
@@ -81,11 +81,6 @@
                <xsdxt:code href="../api_samples/os-security-groups/security-groups-list-get-resp.json" />
             </wadl:doc>
          </representation>
-         <representation mediaType="application/xml">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List security group: XML response">
-               <xsdxt:code href="../api_samples/os-security-groups/security-groups-list-get-resp.xml" />
-            </wadl:doc>
-         </representation>
       </response>
    </method>
    <method name="GET" id="listSecGroupsByServer">
@@ -129,11 +124,6 @@
                <xsdxt:code href="../api_samples/os-security-groups/security-groups-list-get-resp.json" />
             </wadl:doc>
          </representation>
-         <representation mediaType="application/xml">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List security groups by server: XML response">
-               <xsdxt:code href="../api_samples/os-security-groups/security-groups-list-get-resp.xml" />
-            </wadl:doc>
-         </representation>
       </response>
    </method>
    <method name="GET" id="showSecGroup">
@@ -177,11 +167,6 @@
                <xsdxt:code href="../api_samples/os-security-groups/security-groups-get-resp.json" />
             </wadl:doc>
          </representation>
-         <representation mediaType="application/xml">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Show security group: XML response">
-               <xsdxt:code href="../api_samples/os-security-groups/security-groups-get-resp.xml" />
-            </wadl:doc>
-         </representation>
       </response>
    </method>
    <method name="POST" id="createSecGroup">
@@ -213,11 +198,6 @@
                <xsdxt:code href="../api_samples/os-security-groups/security-group-add-post-req.json" />
             </wadl:doc>
          </representation>
-         <representation mediaType="application/xml">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Create security group: XML request">
-               <xsdxt:code href="../api_samples/os-security-groups/security-group-add-post-req.xml" />
-            </wadl:doc>
-         </representation>
       </request>
       <response status="200">
          <param name="security_group" style="plain" type="xsd:string" required="true">
@@ -255,11 +235,6 @@
                <xsdxt:code href="../api_samples/os-security-groups/security-groups-create-resp.json" />
             </wadl:doc>
          </representation>
-         <representation mediaType="application/xml">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Create security group: XML response">
-               <xsdxt:code href="../api_samples/os-security-groups/security-groups-create-resp.xml" />
-            </wadl:doc>
-         </representation>
       </response>
    </method>
    <method name="DELETE" id="deleteSecGroup">