diff --git a/mdx/uk/import.xsl b/mdx/uk/import.xsl
index 7e6bd0b5..b72e9bad 100644
--- a/mdx/uk/import.xsl
+++ b/mdx/uk/import.xsl
@@ -63,20 +63,20 @@
 	<xsl:template match="md:EntityDescriptor">
 		<xsl:text>&#10;</xsl:text>
 		<EntityDescriptor ID="uk000000_CHANGE_THIS"
-			xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata ../xml/saml-schema-metadata-2.0.xsd
-			urn:oasis:names:tc:SAML:metadata:algsupport ../xml/sstc-saml-metadata-algsupport-v1.0.xsd
-			urn:oasis:names:tc:SAML:metadata:attribute ../xml/sstc-metadata-attr.xsd
-			urn:oasis:names:tc:SAML:metadata:rpi ../xml/saml-metadata-rpi-v1.0.xsd
-			urn:oasis:names:tc:SAML:metadata:ui ../xml/sstc-saml-metadata-ui-v1.0.xsd
-			urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol ../xml/sstc-saml-idp-discovery.xsd
-			urn:oasis:names:tc:SAML:profiles:SSO:request-init ../xml/sstc-request-initiation.xsd
-			urn:oasis:names:tc:SAML:2.0:assertion ../xml/saml-schema-assertion-2.0.xsd
-			urn:mace:shibboleth:metadata:1.0 ../xml/shibboleth-metadata-1.0.xsd
-			http://ukfederation.org.uk/2006/11/label ../xml/uk-fed-label.xsd
-			http://sdss.ac.uk/2006/06/WAYF ../xml/uk-wayf.xsd
-			http://www.w3.org/2001/04/xmlenc# ../xml/xenc-schema.xsd
-			http://www.w3.org/2009/xmlenc11# ../xml/xenc-schema-11.xsd
-			http://www.w3.org/2000/09/xmldsig# ../xml/xmldsig-core-schema.xsd">
+			xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd
+			urn:oasis:names:tc:SAML:metadata:algsupport sstc-saml-metadata-algsupport-v1.0.xsd
+			urn:oasis:names:tc:SAML:metadata:attribute sstc-metadata-attr.xsd
+			urn:oasis:names:tc:SAML:metadata:rpi saml-metadata-rpi-v1.0.xsd
+			urn:oasis:names:tc:SAML:metadata:ui sstc-saml-metadata-ui-v1.0.xsd
+			urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol sstc-saml-idp-discovery.xsd
+			urn:oasis:names:tc:SAML:profiles:SSO:request-init sstc-request-initiation.xsd
+			urn:oasis:names:tc:SAML:2.0:assertion saml-schema-assertion-2.0.xsd
+			urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd
+			http://ukfederation.org.uk/2006/11/label uk-fed-label.xsd
+			http://sdss.ac.uk/2006/06/WAYF uk-wayf.xsd
+			http://www.w3.org/2001/04/xmlenc# xenc-schema.xsd
+			http://www.w3.org/2009/xmlenc11# xenc-schema-11.xsd
+			http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
 			
 			<!--
 				Copy across the @entityID attribute.  Other attributes from the input document
diff --git a/xml/MetadataExchange.xsd b/xml/MetadataExchange.xsd
deleted file mode 100644
index 53094fb7..00000000
--- a/xml/MetadataExchange.xsd
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
-(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
-International Business Machines Corporation, Microsoft Corporation,
-Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved. 
-
-Permission to copy and display the WS-MetadataExchange Specification
-(the "Specification"), in any medium without fee or royalty is hereby
-granted, provided that you include the following on ALL copies of the
-Specification that you make:
-
-1.	A link or URL to the Specification at this location.
-2.	The copyright notice as shown in the Specification.
-
-BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
-webMethods (collectively, the "Authors") each agree to grant you a
-license, under royalty-free and otherwise reasonable,
-non-discriminatory terms and conditions, to their respective essential
-patent claims that they deem necessary to implement the
-WS-MetadataExchange Specification.
-
-THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
-SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
-IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
-PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
-USE OR DISTRIBUTION OF THE SPECIFICATIONS.
-
-The name and trademarks of the Authors may NOT be used in any manner,
-including advertising or publicity pertaining to the Specifications or
-their contents without specific, written prior permission. Title to
-copyright in the Specifications will at all times remain with the
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
--->
-
-<xs:schema
-    targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
-    xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
-    xmlns:wsa10='http://www.w3.org/2005/08/addressing'
-    xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
-    xmlns:xs='http://www.w3.org/2001/XMLSchema'
-    elementFormDefault='qualified'
-    blockDefault='#all' >
-
-  <!-- Get Metadata request -->
-  <xs:element name='GetMetadata' >
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref='tns:Dialect' minOccurs='0' />
-        <xs:element ref='tns:Identifier' minOccurs='0' />
-      </xs:sequence>
-      <xs:anyAttribute namespace='##other' processContents='lax' />
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name='Dialect' type='xs:anyURI' />
-  <xs:element name='Identifier' type='xs:anyURI' />
-
-  <!-- Get Metadata response -->
-  <xs:element name='Metadata' >
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref='tns:MetadataSection'
-                    minOccurs='0'
-                    maxOccurs='unbounded' />
-        <xs:any namespace='##other' processContents='lax'
-                minOccurs='0'
-                maxOccurs='unbounded' />
-      </xs:sequence>
-      <xs:anyAttribute namespace='##other' processContents='lax' />
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name='MetadataSection' >
-    <xs:complexType>
-      <xs:choice>
-        <xs:any namespace='##other' processContents='lax' />
-        <xs:element ref='tns:MetadataReference' />
-        <xs:element ref='tns:Location' />
-      </xs:choice>
-      <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
-      <xs:attribute name='Identifier' type='xs:anyURI' />
-      <xs:anyAttribute namespace='##other' processContents='lax' />
-    </xs:complexType>
-  </xs:element>
-  
-  <!-- 
-       Ideally, the type of the MetadataReference would have been
-       the union of wsa04:EndpointReferenceType and
-       wsa10:EndpointReferenceType but unfortunately xs:union only
-       works for simple types. As a result, we have to define
-       the mex:MetadataReference using xs:any.
-  -->
-
-  <xs:element name='MetadataReference'>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:any minOccurs='1' maxOccurs='unbounded' 
-                processContents='lax' namespace='##other' />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name='Location'
-              type='xs:anyURI' />
-</xs:schema>
diff --git a/xml/incommon-metadata.xsd b/xml/incommon-metadata.xsd
deleted file mode 100644
index f33a8398..00000000
--- a/xml/incommon-metadata.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xs:schema
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  targetNamespace="http://id.incommon.org/metadata"
-  elementFormDefault="qualified"
-  attributeFormDefault="unqualified"
-  blockDefault="substitution"
-  version="2.0">
-  
-  <xs:annotation>
-    <xs:documentation>
-      Document title: Schema for InCommon Federation metadata extensions
-      Document identifier: Metadata Extension Schema
-      Location: https://spaces.internet2.edu/x/iIuVAQ
-      Revision history: 
-      V1.2 (3 May 2013):
-      Make schema itself schema-valid.
-      V1.1 (2 May 2013):
-      Initial version. Added documentation.
-      V1.0 (2 December 2011):
-      Initial version. Added contactType attribute.
-    </xs:documentation>
-  </xs:annotation>
-  
-  <xs:attribute name="contactType" type="xs:anyURI"/>
-  
-</xs:schema>
diff --git a/xml/oasis-200401-wss-wssecurity-secext-1.0.xsd b/xml/oasis-200401-wss-wssecurity-secext-1.0.xsd
deleted file mode 100644
index 6829a00f..00000000
--- a/xml/oasis-200401-wss-wssecurity-secext-1.0.xsd
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright © OASIS Open 2002-2004. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
--->
-<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" version="0.2">
-	<xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
-	<xsd:complexType name="AttributedString">
-		<xsd:annotation>
-			<xsd:documentation>This type represents an element with arbitrary attributes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute ref="wsu:Id"/>
-				<xsd:anyAttribute namespace="##other" processContents="lax"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="PasswordString">
-		<xsd:annotation>
-			<xsd:documentation>This type is used for password elements per Section 4.1.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:AttributedString">
-				<xsd:attribute name="Type" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="EncodedString">
-		<xsd:annotation>
-			<xsd:documentation>This type is used for elements containing stringified binary data.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:AttributedString">
-				<xsd:attribute name="EncodingType" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="UsernameTokenType">
-		<xsd:annotation>
-			<xsd:documentation>This type represents a username token per Section 4.1</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="Username" type="wsse:AttributedString"/>
-			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:attribute ref="wsu:Id"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="BinarySecurityTokenType">
-		<xsd:annotation>
-			<xsd:documentation>A security token that is encoded in binary</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:EncodedString">
-				<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="KeyIdentifierType">
-		<xsd:annotation>
-			<xsd:documentation>A security token key identifier</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:EncodedString">
-				<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:simpleType name="tUsage">
-		<xsd:annotation>
-			<xsd:documentation>Typedef to allow a list of usages (as URIs).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:list itemType="xsd:anyURI"/>
-	</xsd:simpleType>
-	<xsd:attribute name="Usage" type="tUsage">
-		<xsd:annotation>
-			<xsd:documentation>This global attribute is used to indicate the usage of a referenced or indicated token within the containing context</xsd:documentation>
-		</xsd:annotation>
-	</xsd:attribute>
-	<xsd:complexType name="ReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This type represents a reference to an external security token.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="URI" type="xsd:anyURI"/>
-		<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="EmbeddedType">
-		<xsd:annotation>
-			<xsd:documentation>This type represents a reference to an embedded security token.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:any processContents="lax"/>
-		</xsd:choice>
-		<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="SecurityTokenReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This type is used reference a security token.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:any processContents="lax"/>
-		</xsd:choice>
-		<xsd:attribute ref="wsu:Id"/>
-		<xsd:attribute ref="wsse:Usage"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="SecurityHeaderType">
-		<xsd:annotation>
-			<xsd:documentation>This complexType defines header block to use for security-relevant data directed at a specific SOAP actor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation>The use of "any" is to allow extensibility and different forms of security data.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:any>
-		</xsd:sequence>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="TransformationParametersType">
-		<xsd:annotation>
-			<xsd:documentation>This complexType defines a container for elements to be specified from any namespace as properties/parameters of a DSIG transformation.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation>The use of "any" is to allow extensibility from any namespace.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:any>
-		</xsd:sequence>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:element name="UsernameToken" type="wsse:UsernameTokenType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:UsernameToken element per Section 4.1.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="BinarySecurityToken" type="wsse:BinarySecurityTokenType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:BinarySecurityToken element per Section 4.2.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Reference" type="wsse:ReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines a security token reference</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Embedded" type="wsse:EmbeddedType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines a security token embedded reference</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="KeyIdentifier" type="wsse:KeyIdentifierType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines a key identifier reference</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="SecurityTokenReference" type="wsse:SecurityTokenReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:SecurityTokenReference per Section 4.3.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Security" type="wsse:SecurityHeaderType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:Security SOAP header element per Section 4.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="TransformationParameters" type="wsse:TransformationParametersType">
-		<xsd:annotation>
-			<xsd:documentation>This element contains properties for transformations from any namespace, including DSIG.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Password" type="wsse:PasswordString"/>
-	<xsd:element name="Nonce" type="wsse:EncodedString"/>
-	<xsd:simpleType name="FaultcodeEnum">
-		<xsd:restriction base="xsd:QName">
-			<xsd:enumeration value="wsse:UnsupportedSecurityToken"/>
-			<xsd:enumeration value="wsse:UnsupportedAlgorithm"/>
-			<xsd:enumeration value="wsse:InvalidSecurity"/>
-			<xsd:enumeration value="wsse:InvalidSecurityToken"/>
-			<xsd:enumeration value="wsse:FailedAuthentication"/>
-			<xsd:enumeration value="wsse:FailedCheck"/>
-			<xsd:enumeration value="wsse:SecurityTokenUnavailable"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-</xsd:schema>
diff --git a/xml/oasis-200401-wss-wssecurity-utility-1.0.xsd b/xml/oasis-200401-wss-wssecurity-utility-1.0.xsd
deleted file mode 100644
index f8d74e9c..00000000
--- a/xml/oasis-200401-wss-wssecurity-utility-1.0.xsd
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright © OASIS Open 2002-2004. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
--->
-<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-
-
-
-xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
-elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
-	<!-- // Fault Codes /////////////////////////////////////////// -->
-	<xsd:simpleType name="tTimestampFault">
-		<xsd:annotation>
-			<xsd:documentation>
-This type defines the fault code value for Timestamp message expiration.
-          </xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:QName">
-			<xsd:enumeration value="wsu:MessageExpired"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<!-- // Global attributes //////////////////////////////////// -->
-	<xsd:attribute name="Id" type="xsd:ID">
-		<xsd:annotation>
-			<xsd:documentation>
-This global attribute supports annotating arbitrary elements with an ID.
-          </xsd:documentation>
-		</xsd:annotation>
-	</xsd:attribute>
-	<xsd:attributeGroup name="commonAtts">
-		<xsd:annotation>
-			<xsd:documentation>
-Convenience attribute group used to simplify this schema.
-          </xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute ref="wsu:Id" use="optional"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:attributeGroup>
-	<!-- // Utility types //////////////////////////////////////// -->
-	<xsd:complexType name="AttributedDateTime">
-		<xsd:annotation>
-			<xsd:documentation>
-This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes. 
-      </xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attributeGroup ref="wsu:commonAtts"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="AttributedURI">
-		<xsd:annotation>
-			<xsd:documentation>
-This type is for elements whose [children] is an anyURI and can have arbitrary attributes.
-      </xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:anyURI">
-				<xsd:attributeGroup ref="wsu:commonAtts"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<!-- // Timestamp header components /////////////////////////// -->
-	<xsd:complexType name="TimestampType">
-		<xsd:annotation>
-			<xsd:documentation>
-This complex type ties together the timestamp related elements into a composite type.
-            </xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element ref="wsu:Created" minOccurs="0"/>
-			<xsd:element ref="wsu:Expires" minOccurs="0"/>
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:any namespace="##other" processContents="lax"/>
-			</xsd:choice>
-		</xsd:sequence>
-		<xsd:attributeGroup ref="wsu:commonAtts"/>
-	</xsd:complexType>
-	<xsd:element name="Timestamp" type="wsu:TimestampType">
-		<xsd:annotation>
-			<xsd:documentation>
-This element allows Timestamps to be applied anywhere element wildcards are present,
-including as a SOAP header.
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<!-- global element decls to allow individual elements to appear anywhere -->
-	<xsd:element name="Expires" type="wsu:AttributedDateTime">
-		<xsd:annotation>
-			<xsd:documentation>
-This element allows an expiration time to be applied anywhere element wildcards are present.
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Created" type="wsu:AttributedDateTime">
-		<xsd:annotation>
-			<xsd:documentation>
-This element allows a creation time to be applied anywhere element wildcards are present.
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-</xsd:schema>
diff --git a/xml/saml-metadata-rpi-v1.0.xsd b/xml/saml-metadata-rpi-v1.0.xsd
deleted file mode 100644
index 135efa33..00000000
--- a/xml/saml-metadata-rpi-v1.0.xsd
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  SAML V2.0 Metadata Extensions for Registration and Publication Information Version 1.0
-  Committee Specification 01
-  03 April 2012
-  Copyright (c) OASIS Open 2012.  All rights reserved.
-  Source: http://docs.oasis-open.org/security/saml/Post2.0/saml-metadata-rpi/v1.0/cs01/xsd/
--->
-
-<schema targetNamespace="urn:oasis:names:tc:SAML:metadata:rpi"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
-    elementFormDefault="unqualified" 
-    attributeFormDefault="unqualified" 
-    blockDefault="substitution" 
-    version="1.0"> 
-
-    <annotation>
-        <documentation>
-            Document title: SAML V2.0 Metadata Extensions for Registration and Publication Information Version 1.0
-            Document identifier: sstc-saml-metadata-rpi-v1.0.xsd
-            Location: http://docs.oasis-open.org/security/saml/Post2.0/
-            Revision history:
-              21 March 2011
-                Correct minOccurs on elements that were meant to be optional              
-              17 December 2010
-                Change of document title and namespace
-              24 November 2010
-                Initial Submission
-        </documentation>
-    </annotation>
-    
-    <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="saml-schema-metadata-2.0.xsd"/>
-    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-    
-    <element name="RegistrationInfo" type="mdrpi:RegistrationInfoType" />
-    <complexType name="RegistrationInfoType">
-        <sequence>
-            <element ref="mdrpi:RegistrationPolicy" minOccurs="0" maxOccurs="unbounded" />
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-        </sequence>
-        <attribute name="registrationAuthority" type="string" use="required"/>
-        <attribute name="registrationInstant" type="dateTime" />
-        <anyAttribute namespace="##other" processContents="lax" />
-    </complexType>
-    
-    <element name="RegistrationPolicy" type="md:localizedURIType" />
-    
-    <element name="PublicationInfo" type="mdrpi:PublicationInfoType" />
-    <complexType name="PublicationInfoType">
-        <sequence>
-            <element ref="mdrpi:UsagePolicy" minOccurs="0" maxOccurs="unbounded"/>
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-        </sequence>
-        <attribute name="publisher" type="string" use="required" />
-        <attribute name="creationInstant" type="dateTime" />
-        <attribute name="publicationId" type="string" />
-        <anyAttribute namespace="##other" processContents="lax" />
-    </complexType>
-    
-    <element name="UsagePolicy" type="md:localizedURIType" />
-    
-    <element name="PublicationPath" type="mdrpi:PublicationPathType" />
-    <complexType name="PublicationPathType">
-        <sequence>
-            <element ref="mdrpi:Publication" minOccurs="0" maxOccurs="unbounded" />
-        </sequence>
-    </complexType>
-    
-    <element name="Publication" type="mdrpi:PublicationType" />
-    <complexType name="PublicationType">
-        <attribute name="publisher" type="string" use="required" />
-        <attribute name="creationInstant" type="dateTime" />
-        <attribute name="publicationId" type="string" />
-    </complexType>
-    
-</schema>
\ No newline at end of file
diff --git a/xml/saml-schema-assertion-2.0.xsd b/xml/saml-schema-assertion-2.0.xsd
deleted file mode 100644
index 2b2f7b80..00000000
--- a/xml/saml-schema-assertion-2.0.xsd
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/2001/04/xmlenc#"
-        schemaLocation="xenc-schema.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-assertion-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-            V1.0 (November, 2002):
-              Initial Standard Schema.
-            V1.1 (September, 2003):
-              Updates within the same V1.0 namespace.
-            V2.0 (March, 2005):
-              New assertion schema for SAML V2.0 namespace.
-        </documentation>
-    </annotation>
-    <attributeGroup name="IDNameQualifiers">
-        <attribute name="NameQualifier" type="string" use="optional"/>
-        <attribute name="SPNameQualifier" type="string" use="optional"/>
-    </attributeGroup>
-    <element name="BaseID" type="saml:BaseIDAbstractType"/>
-    <complexType name="BaseIDAbstractType" abstract="true">
-        <attributeGroup ref="saml:IDNameQualifiers"/>
-    </complexType>
-    <element name="NameID" type="saml:NameIDType"/>
-    <complexType name="NameIDType">
-        <simpleContent>
-            <extension base="string">
-                <attributeGroup ref="saml:IDNameQualifiers"/>
-                <attribute name="Format" type="anyURI" use="optional"/>
-                <attribute name="SPProvidedID" type="string" use="optional"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <complexType name="EncryptedElementType">
-        <sequence>
-            <element ref="xenc:EncryptedData"/>
-            <element ref="xenc:EncryptedKey" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="EncryptedID" type="saml:EncryptedElementType"/>
-    <element name="Issuer" type="saml:NameIDType"/>
-    <element name="AssertionIDRef" type="NCName"/>
-    <element name="AssertionURIRef" type="anyURI"/>
-    <element name="Assertion" type="saml:AssertionType"/>
-    <complexType name="AssertionType">
-        <sequence>
-            <element ref="saml:Issuer"/>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="saml:Subject" minOccurs="0"/>
-            <element ref="saml:Conditions" minOccurs="0"/>
-            <element ref="saml:Advice" minOccurs="0"/>
-            <choice minOccurs="0" maxOccurs="unbounded">
-                <element ref="saml:Statement"/>
-                <element ref="saml:AuthnStatement"/>
-                <element ref="saml:AuthzDecisionStatement"/>
-                <element ref="saml:AttributeStatement"/>
-            </choice>
-        </sequence>
-        <attribute name="Version" type="string" use="required"/>
-        <attribute name="ID" type="ID" use="required"/>
-        <attribute name="IssueInstant" type="dateTime" use="required"/>
-    </complexType>
-    <element name="Subject" type="saml:SubjectType"/>
-    <complexType name="SubjectType">
-        <choice>
-            <sequence>
-                <choice>
-                    <element ref="saml:BaseID"/>
-                    <element ref="saml:NameID"/>
-                    <element ref="saml:EncryptedID"/>
-                </choice>
-                <element ref="saml:SubjectConfirmation" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <element ref="saml:SubjectConfirmation" maxOccurs="unbounded"/>
-        </choice>
-    </complexType>
-    <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
-    <complexType name="SubjectConfirmationType">
-        <sequence>
-            <choice minOccurs="0">
-                <element ref="saml:BaseID"/>
-                <element ref="saml:NameID"/>
-                <element ref="saml:EncryptedID"/>
-            </choice>
-            <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
-        </sequence>
-        <attribute name="Method" type="anyURI" use="required"/>
-    </complexType>
-    <element name="SubjectConfirmationData" type="saml:SubjectConfirmationDataType"/>
-    <complexType name="SubjectConfirmationDataType" mixed="true">
-        <complexContent>
-            <restriction base="anyType">
-                <sequence>
-                    <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="NotBefore" type="dateTime" use="optional"/>
-                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-                <attribute name="Recipient" type="anyURI" use="optional"/>
-                <attribute name="InResponseTo" type="NCName" use="optional"/>
-                <attribute name="Address" type="string" use="optional"/>
-                <anyAttribute namespace="##other" processContents="lax"/>
-            </restriction>
-        </complexContent>
-    </complexType>
-    <complexType name="KeyInfoConfirmationDataType" mixed="false">
-        <complexContent>
-            <restriction base="saml:SubjectConfirmationDataType">
-                <sequence>
-                    <element ref="ds:KeyInfo" maxOccurs="unbounded"/>
-                </sequence>
-            </restriction>
-        </complexContent>
-    </complexType>
-    <element name="Conditions" type="saml:ConditionsType"/>
-    <complexType name="ConditionsType">
-        <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="saml:Condition"/>
-            <element ref="saml:AudienceRestriction"/>
-            <element ref="saml:OneTimeUse"/>
-            <element ref="saml:ProxyRestriction"/>
-        </choice>
-        <attribute name="NotBefore" type="dateTime" use="optional"/>
-        <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-    </complexType>
-    <element name="Condition" type="saml:ConditionAbstractType"/>
-    <complexType name="ConditionAbstractType" abstract="true"/>
-    <element name="AudienceRestriction" type="saml:AudienceRestrictionType"/>
-    <complexType name="AudienceRestrictionType">
-        <complexContent>
-            <extension base="saml:ConditionAbstractType">
-                <sequence>
-                    <element ref="saml:Audience" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="Audience" type="anyURI"/>
-    <element name="OneTimeUse" type="saml:OneTimeUseType" />
-    <complexType name="OneTimeUseType">
-        <complexContent>
-            <extension base="saml:ConditionAbstractType"/>
-        </complexContent>
-    </complexType>
-    <element name="ProxyRestriction" type="saml:ProxyRestrictionType"/>
-    <complexType name="ProxyRestrictionType">
-    <complexContent>
-        <extension base="saml:ConditionAbstractType">
-            <sequence>
-                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="Count" type="nonNegativeInteger" use="optional"/>
-        </extension>
-	</complexContent>
-    </complexType>
-    <element name="Advice" type="saml:AdviceType"/>
-    <complexType name="AdviceType">
-        <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="saml:AssertionIDRef"/>
-            <element ref="saml:AssertionURIRef"/>
-            <element ref="saml:Assertion"/>
-            <element ref="saml:EncryptedAssertion"/>
-            <any namespace="##other" processContents="lax"/>
-        </choice>
-    </complexType>
-    <element name="EncryptedAssertion" type="saml:EncryptedElementType"/>
-    <element name="Statement" type="saml:StatementAbstractType"/>
-    <complexType name="StatementAbstractType" abstract="true"/>
-    <element name="AuthnStatement" type="saml:AuthnStatementType"/>
-    <complexType name="AuthnStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <sequence>
-                    <element ref="saml:SubjectLocality" minOccurs="0"/>
-                    <element ref="saml:AuthnContext"/>
-                </sequence>
-                <attribute name="AuthnInstant" type="dateTime" use="required"/>
-                <attribute name="SessionIndex" type="string" use="optional"/>
-                <attribute name="SessionNotOnOrAfter" type="dateTime" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
-    <complexType name="SubjectLocalityType">
-        <attribute name="Address" type="string" use="optional"/>
-        <attribute name="DNSName" type="string" use="optional"/>
-    </complexType>
-    <element name="AuthnContext" type="saml:AuthnContextType"/>
-    <complexType name="AuthnContextType">
-        <sequence>
-            <choice>
-                <sequence>
-                    <element ref="saml:AuthnContextClassRef"/>
-                    <choice minOccurs="0">
-                        <element ref="saml:AuthnContextDecl"/>
-                        <element ref="saml:AuthnContextDeclRef"/>
-                    </choice>
-                </sequence>
-                <choice>
-                    <element ref="saml:AuthnContextDecl"/>
-                    <element ref="saml:AuthnContextDeclRef"/>
-                </choice>
-            </choice>
-            <element ref="saml:AuthenticatingAuthority" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="AuthnContextClassRef" type="anyURI"/>
-    <element name="AuthnContextDeclRef" type="anyURI"/>
-    <element name="AuthnContextDecl" type="anyType"/>
-    <element name="AuthenticatingAuthority" type="anyURI"/>
-    <element name="AuthzDecisionStatement" type="saml:AuthzDecisionStatementType"/>
-    <complexType name="AuthzDecisionStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <sequence>
-                    <element ref="saml:Action" maxOccurs="unbounded"/>
-                    <element ref="saml:Evidence" minOccurs="0"/>
-                </sequence>
-                <attribute name="Resource" type="anyURI" use="required"/>
-                <attribute name="Decision" type="saml:DecisionType" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <simpleType name="DecisionType">
-        <restriction base="string">
-            <enumeration value="Permit"/>
-            <enumeration value="Deny"/>
-            <enumeration value="Indeterminate"/>
-        </restriction>
-    </simpleType>
-    <element name="Action" type="saml:ActionType"/>
-    <complexType name="ActionType">
-        <simpleContent>
-            <extension base="string">
-                <attribute name="Namespace" type="anyURI" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <element name="Evidence" type="saml:EvidenceType"/>
-    <complexType name="EvidenceType">
-        <choice maxOccurs="unbounded">
-            <element ref="saml:AssertionIDRef"/>
-            <element ref="saml:AssertionURIRef"/>
-            <element ref="saml:Assertion"/>
-            <element ref="saml:EncryptedAssertion"/>
-        </choice>
-    </complexType>
-    <element name="AttributeStatement" type="saml:AttributeStatementType"/>
-    <complexType name="AttributeStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <choice maxOccurs="unbounded">
-                    <element ref="saml:Attribute"/>
-                    <element ref="saml:EncryptedAttribute"/>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="Attribute" type="saml:AttributeType"/>
-    <complexType name="AttributeType">
-        <sequence>
-            <element ref="saml:AttributeValue" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="Name" type="string" use="required"/>
-        <attribute name="NameFormat" type="anyURI" use="optional"/>
-        <attribute name="FriendlyName" type="string" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="AttributeValue" type="anyType" nillable="true"/>
-    <element name="EncryptedAttribute" type="saml:EncryptedElementType"/>
-</schema>
diff --git a/xml/saml-schema-metadata-2.0.xsd b/xml/saml-schema-metadata-2.0.xsd
deleted file mode 100644
index b656d4f4..00000000
--- a/xml/saml-schema-metadata-2.0.xsd
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/2001/04/xmlenc#"
-        schemaLocation="xenc-schema.xsd"/>
-    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
-        schemaLocation="saml-schema-assertion-2.0.xsd"/>
-    <import namespace="http://www.w3.org/XML/1998/namespace"
-        schemaLocation="xml.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-metadata-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-              V2.0 (March, 2005):
-                Schema for SAML metadata, first published in SAML 2.0.
-        </documentation>
-    </annotation>
-
-    <simpleType name="entityIDType">
-        <restriction base="anyURI">
-            <maxLength value="1024"/>
-        </restriction>
-    </simpleType>
-    <complexType name="localizedNameType">
-        <simpleContent>
-            <extension base="string">
-                <attribute ref="xml:lang" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <complexType name="localizedURIType">
-        <simpleContent>
-            <extension base="anyURI">
-                <attribute ref="xml:lang" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    
-    <element name="Extensions" type="md:ExtensionsType"/>
-    <complexType final="#all" name="ExtensionsType">
-        <sequence>
-            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    
-    <complexType name="EndpointType">
-        <sequence>
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="Binding" type="anyURI" use="required"/>
-        <attribute name="Location" type="anyURI" use="required"/>
-        <attribute name="ResponseLocation" type="anyURI" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="IndexedEndpointType">
-        <complexContent>
-            <extension base="md:EndpointType">
-                <attribute name="index" type="unsignedShort" use="required"/>
-                <attribute name="isDefault" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <element name="EntitiesDescriptor" type="md:EntitiesDescriptorType"/>
-    <complexType name="EntitiesDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <choice minOccurs="1" maxOccurs="unbounded">
-                <element ref="md:EntityDescriptor"/>
-                <element ref="md:EntitiesDescriptor"/>
-            </choice>
-        </sequence>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <attribute name="Name" type="string" use="optional"/>
-    </complexType>
-
-    <element name="EntityDescriptor" type="md:EntityDescriptorType"/>
-    <complexType name="EntityDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <choice>
-                <choice maxOccurs="unbounded">
-                    <element ref="md:RoleDescriptor"/>
-                    <element ref="md:IDPSSODescriptor"/>
-                    <element ref="md:SPSSODescriptor"/>
-                    <element ref="md:AuthnAuthorityDescriptor"/>
-                    <element ref="md:AttributeAuthorityDescriptor"/>
-                    <element ref="md:PDPDescriptor"/>
-                </choice>
-                <element ref="md:AffiliationDescriptor"/>
-            </choice>
-            <element ref="md:Organization" minOccurs="0"/>
-            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:AdditionalMetadataLocation" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="entityID" type="md:entityIDType" use="required"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    
-    <element name="Organization" type="md:OrganizationType"/>
-    <complexType name="OrganizationType">
-        <sequence>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:OrganizationName" maxOccurs="unbounded"/>
-            <element ref="md:OrganizationDisplayName" maxOccurs="unbounded"/>
-            <element ref="md:OrganizationURL" maxOccurs="unbounded"/>
-        </sequence>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="OrganizationName" type="md:localizedNameType"/>
-    <element name="OrganizationDisplayName" type="md:localizedNameType"/>
-    <element name="OrganizationURL" type="md:localizedURIType"/>
-    <element name="ContactPerson" type="md:ContactType"/>
-    <complexType name="ContactType">
-        <sequence>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:Company" minOccurs="0"/>
-            <element ref="md:GivenName" minOccurs="0"/>
-            <element ref="md:SurName" minOccurs="0"/>
-            <element ref="md:EmailAddress" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:TelephoneNumber" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="contactType" type="md:ContactTypeType" use="required"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="Company" type="string"/>
-    <element name="GivenName" type="string"/>
-    <element name="SurName" type="string"/>
-    <element name="EmailAddress" type="anyURI"/>
-    <element name="TelephoneNumber" type="string"/>
-    <simpleType name="ContactTypeType">
-        <restriction base="string">
-            <enumeration value="technical"/>
-            <enumeration value="support"/>
-            <enumeration value="administrative"/>
-            <enumeration value="billing"/>
-            <enumeration value="other"/>
-        </restriction>
-    </simpleType>
-
-    <element name="AdditionalMetadataLocation" type="md:AdditionalMetadataLocationType"/>
-    <complexType name="AdditionalMetadataLocationType">
-        <simpleContent>
-            <extension base="anyURI">
-                <attribute name="namespace" type="anyURI" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-
-    <element name="RoleDescriptor" type="md:RoleDescriptorType"/>
-    <complexType name="RoleDescriptorType" abstract="true">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:KeyDescriptor" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:Organization" minOccurs="0"/>
-            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="ID" type="ID" use="optional"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="protocolSupportEnumeration" type="md:anyURIListType" use="required"/>
-        <attribute name="errorURL" type="anyURI" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <simpleType name="anyURIListType">
-        <list itemType="anyURI"/>
-    </simpleType>
-
-    <element name="KeyDescriptor" type="md:KeyDescriptorType"/>
-    <complexType name="KeyDescriptorType">
-        <sequence>
-            <element ref="ds:KeyInfo"/>
-            <element ref="md:EncryptionMethod" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="use" type="md:KeyTypes" use="optional"/>
-    </complexType>
-    <simpleType name="KeyTypes">
-        <restriction base="string">
-            <enumeration value="encryption"/>
-            <enumeration value="signing"/>
-        </restriction>
-    </simpleType>
-    <element name="EncryptionMethod" type="xenc:EncryptionMethodType"/>
-    
-    <complexType name="SSODescriptorType" abstract="true">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:ArtifactResolutionService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:SingleLogoutService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:ManageNameIDService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="ArtifactResolutionService" type="md:IndexedEndpointType"/>
-    <element name="SingleLogoutService" type="md:EndpointType"/>
-    <element name="ManageNameIDService" type="md:EndpointType"/>
-    <element name="NameIDFormat" type="anyURI"/>
-
-    <element name="IDPSSODescriptor" type="md:IDPSSODescriptorType"/>
-    <complexType name="IDPSSODescriptorType">
-        <complexContent>
-            <extension base="md:SSODescriptorType">
-                <sequence>
-                    <element ref="md:SingleSignOnService" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDMappingService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="WantAuthnRequestsSigned" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SingleSignOnService" type="md:EndpointType"/>
-    <element name="NameIDMappingService" type="md:EndpointType"/>
-    <element name="AssertionIDRequestService" type="md:EndpointType"/>
-    <element name="AttributeProfile" type="anyURI"/>
-    
-    <element name="SPSSODescriptor" type="md:SPSSODescriptorType"/>
-    <complexType name="SPSSODescriptorType">
-        <complexContent>
-            <extension base="md:SSODescriptorType">
-                <sequence>
-                    <element ref="md:AssertionConsumerService" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeConsumingService" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="AuthnRequestsSigned" type="boolean" use="optional"/>
-                <attribute name="WantAssertionsSigned" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AssertionConsumerService" type="md:IndexedEndpointType"/>
-    <element name="AttributeConsumingService" type="md:AttributeConsumingServiceType"/>
-    <complexType name="AttributeConsumingServiceType">
-        <sequence>
-            <element ref="md:ServiceName" maxOccurs="unbounded"/>
-            <element ref="md:ServiceDescription" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:RequestedAttribute" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="index" type="unsignedShort" use="required"/>
-        <attribute name="isDefault" type="boolean" use="optional"/>
-    </complexType>
-    <element name="ServiceName" type="md:localizedNameType"/>
-    <element name="ServiceDescription" type="md:localizedNameType"/>
-    <element name="RequestedAttribute" type="md:RequestedAttributeType"/>
-    <complexType name="RequestedAttributeType">
-        <complexContent>
-            <extension base="saml:AttributeType">
-                <attribute name="isRequired" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-  
-    <element name="AuthnAuthorityDescriptor" type="md:AuthnAuthorityDescriptorType"/>
-    <complexType name="AuthnAuthorityDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AuthnQueryService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthnQueryService" type="md:EndpointType"/>
-
-    <element name="PDPDescriptor" type="md:PDPDescriptorType"/>
-    <complexType name="PDPDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AuthzService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthzService" type="md:EndpointType"/>
-
-    <element name="AttributeAuthorityDescriptor" type="md:AttributeAuthorityDescriptorType"/>
-    <complexType name="AttributeAuthorityDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AttributeService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AttributeService" type="md:EndpointType"/>
-   
-    <element name="AffiliationDescriptor" type="md:AffiliationDescriptorType"/>
-    <complexType name="AffiliationDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:AffiliateMember" maxOccurs="unbounded"/>
-            <element ref="md:KeyDescriptor" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="affiliationOwnerID" type="md:entityIDType" use="required"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="AffiliateMember" type="md:entityIDType"/>
-</schema>
diff --git a/xml/shibboleth-metadata-1.0.xsd b/xml/shibboleth-metadata-1.0.xsd
deleted file mode 100644
index be1441dd..00000000
--- a/xml/shibboleth-metadata-1.0.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<schema targetNamespace="urn:mace:shibboleth:metadata:1.0"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	elementFormDefault="unqualified"
-	attributeFormDefault="unqualified"
-	version="1.0">
-
-	<import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
-
-	<element name="Scope">
-		<annotation>
-			<documentation>
-			SAML metadata extension used to regulate allowable attribute scopes.
-			</documentation>
-		</annotation>
-		<complexType>
-			<simpleContent>
-				<extension base="string">
-					<attribute name="regexp" type="boolean" use="optional" default="false"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-
-	<element name="KeyAuthority">
-		<annotation>
-			<documentation>
-			Binds keying authorities to the system entity/entities to which the enclosing
-			metadata element applies.
-			</documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element ref="ds:KeyInfo" maxOccurs="unbounded"/>
-			</sequence>
-			<attribute name="VerifyDepth" type="unsignedByte" use="optional" default="1"/>
-			<anyAttribute namespace="##other" processContents="lax"/>
-		</complexType>
-	</element>
-
-</schema>
diff --git a/xml/sstc-metadata-attr.xsd b/xml/sstc-metadata-attr.xsd
deleted file mode 100644
index 5a445e21..00000000
--- a/xml/sstc-metadata-attr.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:oasis:names:tc:SAML:metadata:attribute" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" elementFormDefault="unqualified" attributeFormDefault="unqualified" blockDefault="substitution" version="2.0">
-
-  <annotation>
-    <documentation>
-      Document title: SAML V2.0 Metadata Extention for Entity Attributes Schema
-      Document identifier: sstc-metadata-attr.xsd
-      Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
-      Revision history:
-      V1.0 (November 2008):
-        Initial version.
-    </documentation>
-  </annotation>
-
-  <import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="saml-schema-assertion-2.0.xsd"/>
-
-  <element name="EntityAttributes" type="mdattr:EntityAttributesType"/>
-  <complexType name="EntityAttributesType">
-    <choice maxOccurs="unbounded">
-      <element ref="saml:Attribute"/>
-      <element ref="saml:Assertion"/>
-    </choice>
-  </complexType>
-
-</schema>
\ No newline at end of file
diff --git a/xml/sstc-request-initiation.xsd b/xml/sstc-request-initiation.xsd
deleted file mode 100644
index 10318f15..00000000
--- a/xml/sstc-request-initiation.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-    xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="1.0">
-    <annotation>
-        <documentation>
-            Document identifier: sstc-request-initiation
-            Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
-            Revision history:
-            V1.0 (March 2010):
-              Initial version.
-        </documentation>
-    </annotation>
-    <import namespace="urn:oasis:names:tc:SAML:2.0:metadata"
-        schemaLocation="saml-schema-metadata-2.0.xsd"/>
-    <element name="RequestInitiator" type="md:EndpointType"/>
-</schema>
-
diff --git a/xml/sstc-saml-holder-of-key-browser-sso.xsd b/xml/sstc-saml-holder-of-key-browser-sso.xsd
deleted file mode 100644
index 7860d029..00000000
--- a/xml/sstc-saml-holder-of-key-browser-sso.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xs:schema
-  targetNamespace="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  elementFormDefault="qualified"
-  attributeFormDefault="unqualified"
-  blockDefault="substitution"
-  version="2.0">
-
-  <xs:annotation>
-    <xs:documentation>
-      Document title: Schema for SAML V2.0 Holder-of-Key Web Browser SSO Profile
-      Document identifier: sstc-saml-holder-of-key-browser-sso.xsd
-      Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
-      Revision history:
-	V1.2 (2 November 2008):
-	  Renamed attribute from protocol to ProtocolBinding; targetNamespace changed in accordance with new conventions
-	V1.1 (6 August 2008):
-	  string type changed to anyURI to match original SAML2Meta schema
-        V1.0 (4 August 2008):
-          Initial version.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:attribute name="ProtocolBinding" type="xs:anyURI"/>
-
-</xs:schema>
diff --git a/xml/sstc-saml-idp-discovery.xsd b/xml/sstc-saml-idp-discovery.xsd
deleted file mode 100644
index a2c03820..00000000
--- a/xml/sstc-saml-idp-discovery.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-    xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <annotation>
-        <documentation>
-            Document identifier: sstc-saml-idp-discovery
-            Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
-            Revision history:
-            V1.0 (January 2007):
-              Initial version.
-        </documentation>
-    </annotation>
-    <import namespace="urn:oasis:names:tc:SAML:2.0:metadata"
-        schemaLocation="saml-schema-metadata-2.0.xsd"/>
-    <element name="DiscoveryResponse" type="md:IndexedEndpointType"/>
-</schema>
diff --git a/xml/sstc-saml-metadata-algsupport-v1.0.xsd b/xml/sstc-saml-metadata-algsupport-v1.0.xsd
deleted file mode 100644
index c4e0f58b..00000000
--- a/xml/sstc-saml-metadata-algsupport-v1.0.xsd
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-    SAML v2.0 Metadata Profile for Algorithm Support Version 1.0
-    Committee Specification 01
-    21 February 2011
-    Copyright (c) OASIS Open 2011.   All rights reserved.
-    Source: http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-algsupport-v1.0-cs01.xsd
-
--->
-
-<schema 
-  targetNamespace="urn:oasis:names:tc:SAML:metadata:algsupport"
-  xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
-  elementFormDefault="unqualified"
-  attributeFormDefault="unqualified"
-  blockDefault="substitution"
-  version="1.0">
-
-  <annotation>
-    <documentation>
-      Document title: Metadata Extension Schema for SAML V2.0 Metadata Profile for Algorithm Support Version 1.0
-      Document identifier: sstc-saml-metadata-algsupport.xsd
-      Location: http://docs.oasis-open.org/security/saml/Post2.0/
-      Revision history:
-      V1.0 (June 2010):
-        Initial version.
-      (October 2010):
-        Add processContents="lax" to wildcards.
-    </documentation>
-  </annotation>
-
-  <element name="DigestMethod" type="alg:DigestMethodType"/>
-  <complexType name="DigestMethodType">
-    <sequence>
-      <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/>
-  </complexType>
-
-  <element name="SigningMethod" type="alg:SigningMethodType"/>
-  <complexType name="SigningMethodType">
-    <sequence>
-      <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/>
-    <attribute name="MinKeySize" type="positiveInteger"/>
-    <attribute name="MaxKeySize" type="positiveInteger"/>
-  </complexType>
-
-</schema>
-
diff --git a/xml/sstc-saml-metadata-ui-v1.0.xsd b/xml/sstc-saml-metadata-ui-v1.0.xsd
deleted file mode 100644
index 66a4a8ba..00000000
--- a/xml/sstc-saml-metadata-ui-v1.0.xsd
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  SAML V2.0 Metadata Extensions for Login and Discovery User Interface Version 1.0
-  Committee Specification 01
-  03 April 2012
-  Copyright (c) OASIS Open 2012.  All rights reserved.
-  Source: http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/cs01/xsd/
--->
-
-<schema 
-  targetNamespace="urn:oasis:names:tc:SAML:metadata:ui"
-  xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-  xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-  elementFormDefault="unqualified"
-  attributeFormDefault="unqualified"
-  blockDefault="substitution"
-  version="1.0">
-
-  <annotation>
-    <documentation>
-      Document title: Metadata Extension Schema for SAML V2.0 Metadata Extensions for Login and Discovery User Interface Version 1.0
-      Document identifier: sstc-saml-metadata-ui-v1.0.xsd
-      Location: http://docs.oasis-open.org/security/saml/Post2.0/
-      Revision history:
-      01 November 2010
-        Changed filename.
-      September 2010:
-        Initial version.
-    </documentation>
-  </annotation>
-
-  <import namespace="urn:oasis:names:tc:SAML:2.0:metadata"
-    schemaLocation="saml-schema-metadata-2.0.xsd"/>
-  <import namespace="http://www.w3.org/XML/1998/namespace"
-    schemaLocation="xml.xsd"/>
-
-  <element name="UIInfo" type="mdui:UIInfoType" />
-  <complexType name="UIInfoType">
-    <choice minOccurs="0" maxOccurs="unbounded">
-      <element ref="mdui:DisplayName"/>
-      <element ref="mdui:Description"/>
-      <element ref="mdui:Keywords"/>
-      <element ref="mdui:Logo"/>
-      <element ref="mdui:InformationURL"/>
-      <element ref="mdui:PrivacyStatementURL"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </complexType>
-
-  <element name="DisplayName" type="md:localizedNameType"/>
-  <element name="Description" type="md:localizedNameType"/>
-  <element name="InformationURL" type="md:localizedURIType"/>
-  <element name="PrivacyStatementURL" type="md:localizedURIType"/>
-
-  <element name="Keywords" type="mdui:KeywordsType"/>
-  <complexType name="KeywordsType">
-    <simpleContent>
-      <extension base="mdui:listOfStrings">
-        <attribute ref="xml:lang" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  
-  <simpleType name="listOfStrings">
-    <list itemType="string"/>
-  </simpleType>
-
-  <element name="Logo" type="mdui:LogoType"/>
-  <complexType name="LogoType">
-    <simpleContent>
-      <extension base="anyURI">
-        <attribute name="height" type="positiveInteger" use="required"/>
-        <attribute name="width" type="positiveInteger" use="required"/>
-        <attribute ref="xml:lang"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <element name="DiscoHints" type="mdui:DiscoHintsType"/>
-  <complexType name="DiscoHintsType">
-    <choice minOccurs="0" maxOccurs="unbounded">
-      <element ref="mdui:IPHint"/>
-      <element ref="mdui:DomainHint"/>
-      <element ref="mdui:GeolocationHint"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </complexType>
-
-  <element name="IPHint" type="string"/>
-  <element name="DomainHint" type="string"/>	
-  <element name="GeolocationHint" type="anyURI"/>
-
-</schema>
-
diff --git a/xml/uk-fed-label.xsd b/xml/uk-fed-label.xsd
deleted file mode 100644
index 83213fb8..00000000
--- a/xml/uk-fed-label.xsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-    targetNamespace="http://ukfederation.org.uk/2006/11/label"
-    version="2014-07-22"
-    elementFormDefault="qualified">
-    
-    <annotation>
-        <documentation>
-            This schema describes the UK federation label namespace.
-            
-            For additional information, see the Federation Technical Specification.
-            
-            This version of the schema follows FTS edition 1.1 of 1-June-2007.
-        </documentation>
-    </annotation>
-    
-    <complexType name="basicLabel">
-        <annotation>
-            <documentation>
-                Most elements defined in the UK federation label namespace
-                are basic labels: empty elements whose presence or absence
-                is all that is important.
-            </documentation>
-        </annotation>
-        <!--
-            No content elements are defined, so a basicLabel may contain
-            neither text nor nested elements.
-        -->
-    </complexType>
-    
-    <complexType name="datedLabel">
-        <annotation>
-            <documentation>
-                A datedLabel is like a basicLabel, but with a single
-                additional mandatory date attribute.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="ukfedlabel:basicLabel">
-                <attribute name="date" type="date" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <element name="UKFederationMember" type="ukfedlabel:basicLabel">
-        <annotation>
-            <documentation>
-                Indicates an entity whose owner is a member in good standing
-                of the UK federation.
-            </documentation>
-        </annotation>
-    </element>
-    
-    <element name="AccountableUsers" type="ukfedlabel:basicLabel">
-        <annotation>
-            <documentation>
-                Indicates an identity provider entity whose owner has
-                asserted to the UK federation that the entity provides
-                user accountability in terms of the definition given
-                in section 6 of the federation's Rules of Membership.
-            </documentation>
-        </annotation>
-    </element>
-    
-    <element name="Software">
-        <annotation>
-            <documentation>
-                Indicates the software used to implement the entity, and
-                optionally both general and specific indications of the
-                version of software used.  This information is added to
-                an entity only if it has been received from the deployer
-                of the entity on the indicated date.
-                
-                This information is used in entity fragment files only,
-                and is not included in the metadata published by the
-                UK federation.  Its principal use is in classifying
-                entities for statistical purposes.
-            </documentation>
-        </annotation>
-        <complexType>
-            <complexContent>
-                <extension base="ukfedlabel:datedLabel">
-                    <attribute name="name" use="required" type="token">
-                        <annotation>
-                            <documentation>
-                                The name of the software used to implement the entity.
-                                Although not described as such in this schema, the name
-                                should be picked from the controlled vocabulary understood
-                                by the federation statistics scripts.
-                            </documentation>
-                        </annotation>
-                    </attribute>
-                    
-                    <attribute name="version" use="optional" type="token">
-                        <annotation>
-                            <documentation>
-                                The general version of the software in use.  This should
-                                only be specific enough to identify the broad functionality
-                                of the entity, for example "1.3" vs. "2.0" would be sufficient
-                                for Shibboleth entities.
-                            </documentation>
-                        </annotation>
-                    </attribute>
-                    
-                    <attribute name="fullVersion" use="optional" type="token">
-                        <annotation>
-                            <documentation>
-                                The specific version of the software in use, if known.
-                            </documentation>
-                        </annotation>
-                    </attribute>
-                </extension>
-            </complexContent>
-        </complexType>
-    </element>
-    
-    <element name="ExportOptIn" type="ukfedlabel:datedLabel">
-        <annotation>
-            <documentation>
-                Indicates that the entity has been opted-in to inclusion in
-                the UK federation export aggregate.
-            </documentation>
-        </annotation>
-    </element>
-    
-    <element name="ExportOptOut" type="ukfedlabel:datedLabel">
-        <annotation>
-            <documentation>
-                Indicates that the entity has been opted-out from inclusion in
-                the UK federation export aggregate.
-            </documentation>
-        </annotation>
-    </element>
-    
-</schema>
\ No newline at end of file
diff --git a/xml/uk-wayf.xsd b/xml/uk-wayf.xsd
deleted file mode 100644
index 1139a62c..00000000
--- a/xml/uk-wayf.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-    targetNamespace="http://sdss.ac.uk/2006/06/WAYF"
-    version="2015-04-16"
-    elementFormDefault="qualified">
-    
-    <annotation>
-        <documentation>
-            This schema describes the WAYF namespace, used internally by the
-            UK federation for the "HideFromWAYF" label.
-            
-            For additional information, see the Federation Technical Specification.
-        </documentation>
-    </annotation>
-    
-    <complexType name="basicLabel">
-        <annotation>
-            <documentation>
-                Basic labels are empty elements whose presence or absence
-                is all that is important.
-            </documentation>
-        </annotation>
-        <!--
-            No content elements are defined, so a basicLabel may contain
-            neither text nor nested elements.
-        -->
-    </complexType>
-    
-    <element name="HideFromWAYF" type="wayf:basicLabel">
-        <annotation>
-            <documentation>
-                Indicates an entity which should be hidden from the
-                Central Discovery Service.
-            </documentation>
-        </annotation>
-    </element>
-
-</schema>
diff --git a/xml/ws-addr.xsd b/xml/ws-addr.xsd
deleted file mode 100644
index 47362edb..00000000
--- a/xml/ws-addr.xsd
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    W3C XML Schema defined in the Web Services Addressing 1.0 specification
-    http://www.w3.org/TR/ws-addr-core
-
-   Copyright © 2005 World Wide Web Consortium,
-
-   (Massachusetts Institute of Technology, European Research Consortium for
-   Informatics and Mathematics, Keio University). All Rights Reserved. This
-   work is distributed under the W3C® Software License [1] in the hope that
-   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-   $Id: ws-addr.xsd,v 1.2 2008/07/23 13:38:16 plehegar Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified">
-	
-	<!-- Constructs from the WS-Addressing Core -->
-
-	<xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
-	<xs:complexType name="EndpointReferenceType" mixed="false">
-		<xs:sequence>
-			<xs:element name="Address" type="tns:AttributedURIType"/>
-			<xs:element ref="tns:ReferenceParameters" minOccurs="0"/>
-			<xs:element ref="tns:Metadata" minOccurs="0"/>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute namespace="##other" processContents="lax"/>
-	</xs:complexType>
-	
-	<xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/>
-	<xs:complexType name="ReferenceParametersType" mixed="false">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute namespace="##other" processContents="lax"/>
-	</xs:complexType>
-	
-	<xs:element name="Metadata" type="tns:MetadataType"/>
-	<xs:complexType name="MetadataType" mixed="false">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute namespace="##other" processContents="lax"/>
-	</xs:complexType>
-	
-	<xs:element name="MessageID" type="tns:AttributedURIType"/>
-	<xs:element name="RelatesTo" type="tns:RelatesToType"/>
-	<xs:complexType name="RelatesToType" mixed="false">
-		<xs:simpleContent>
-			<xs:extension base="xs:anyURI">
-				<xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
-				<xs:anyAttribute namespace="##other" processContents="lax"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	
-	<xs:simpleType name="RelationshipTypeOpenEnum">
-		<xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
-	</xs:simpleType>
-	
-	<xs:simpleType name="RelationshipType">
-		<xs:restriction base="xs:anyURI">
-			<xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
-	<xs:element name="From" type="tns:EndpointReferenceType"/>
-	<xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
-	<xs:element name="To" type="tns:AttributedURIType"/>
-	<xs:element name="Action" type="tns:AttributedURIType"/>
-
-	<xs:complexType name="AttributedURIType" mixed="false">
-		<xs:simpleContent>
-			<xs:extension base="xs:anyURI">
-				<xs:anyAttribute namespace="##other" processContents="lax"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	
-	<!-- Constructs from the WS-Addressing SOAP binding -->
-
-	<xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
-	
-	<xs:simpleType name="FaultCodesOpenEnumType">
-		<xs:union memberTypes="tns:FaultCodesType xs:QName"/>
-	</xs:simpleType>
-	
-	<xs:simpleType name="FaultCodesType">
-		<xs:restriction base="xs:QName">
-			<xs:enumeration value="tns:InvalidAddressingHeader"/>
-			<xs:enumeration value="tns:InvalidAddress"/>
-			<xs:enumeration value="tns:InvalidEPR"/>
-			<xs:enumeration value="tns:InvalidCardinality"/>
-			<xs:enumeration value="tns:MissingAddressInEPR"/>
-			<xs:enumeration value="tns:DuplicateMessageID"/>
-			<xs:enumeration value="tns:ActionMismatch"/>
-			<xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
-			<xs:enumeration value="tns:DestinationUnreachable"/>
-			<xs:enumeration value="tns:ActionNotSupported"/>
-			<xs:enumeration value="tns:EndpointUnavailable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
-	<xs:complexType name="AttributedUnsignedLongType" mixed="false">
-		<xs:simpleContent>
-			<xs:extension base="xs:unsignedLong">
-				<xs:anyAttribute namespace="##other" processContents="lax"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	
-	<xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
-	<xs:complexType name="AttributedQNameType" mixed="false">
-		<xs:simpleContent>
-			<xs:extension base="xs:QName">
-				<xs:anyAttribute namespace="##other" processContents="lax"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	
-	<xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
-	
-	<xs:element name="ProblemAction" type="tns:ProblemActionType"/>
-	<xs:complexType name="ProblemActionType" mixed="false">
-		<xs:sequence>
-			<xs:element ref="tns:Action" minOccurs="0"/>
-			<xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
-		</xs:sequence>
-		<xs:anyAttribute namespace="##other" processContents="lax"/>
-	</xs:complexType>
-	
-</xs:schema>
diff --git a/xml/ws-authorization.xsd b/xml/ws-authorization.xsd
deleted file mode 100644
index 5b8ae986..00000000
--- a/xml/ws-authorization.xsd
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the 
-implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; 
-neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS 
-specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made 
-available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users 
-of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may 
-cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright © OASIS Open 2002-2007. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist 
-in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the 
-above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified 
-in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, 
-in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate 
-it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an AS IS basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF 
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-  -->
-
-<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
-       xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'    
-		   xmlns:tns='http://docs.oasis-open.org/wsfed/authorization/200706'
-		   targetNamespace='http://docs.oasis-open.org/wsfed/authorization/200706'
-		   elementFormDefault='qualified' >
-  <xs:import namespace='http://www.w3.org/2001/04/xmlenc#'
-             schemaLocation='xenc-schema.xsd'/>
-  
-  <!-- Section 9.2 -->
-  <xs:element name='AdditionalContext' type='tns:AdditionalContextType' />
-  <xs:complexType name='AdditionalContextType' >
-    <xs:sequence>
-      <xs:element name='ContextItem' type='tns:ContextItemType' minOccurs='0' maxOccurs='unbounded' />
-      <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-    </xs:sequence>
-    <xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <xs:complexType name='ContextItemType' >
-    <xs:choice minOccurs='0'>
-      <xs:element name='Value' type='xs:string' minOccurs='1' maxOccurs='1' />
-      <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
-    </xs:choice>
-    <xs:attribute name='Name' type='xs:anyURI' use='required' />
-	<xs:attribute name='Scope' type='xs:anyURI' use='optional' />
-	<xs:anyAttribute namespace='##other' processContents='lax' />	
-  </xs:complexType>
-
-  <!-- Section 9.3 -->
-  <xs:element name='ClaimType' type='tns:ClaimType' />
-  <xs:complexType name='ClaimType' >
-    <xs:sequence>
-      <xs:element name="DisplayName" type="tns:DisplayNameType" minOccurs="0" maxOccurs="1" />
-      <xs:element name="Description" type="tns:DescriptionType" minOccurs="0" maxOccurs="1" />
-      <xs:element name="DisplayValue" type="tns:DisplayValueType" minOccurs="0" maxOccurs="1" />
-      <xs:choice minOccurs='0'>
-	      <xs:element name='Value' type='xs:string' minOccurs='1' maxOccurs='1' />
-        <xs:element name='EncryptedValue' type='tns:EncryptedValueType' minOccurs='1' maxOccurs='1' />
-        <xs:element name='StructuredValue' type='tns:StructuredValueType' minOccurs='1' maxOccurs='1' />
-        <xs:element name='ConstrainedValue' type='tns:ConstrainedValueType' minOccurs='1' maxOccurs='1' />
- 	      <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
-	    </xs:choice>
-    </xs:sequence>
-	<xs:attribute name='Uri' type='xs:anyURI' use='required' />
-	<xs:attribute name='Optional' type='xs:boolean' use='optional' />
-	<xs:anyAttribute namespace='##other' processContents='lax' />	
-  </xs:complexType>
-
-  <xs:complexType name="DisplayNameType">
-    <xs:simpleContent>
-     <xs:extension base="xs:string">
-        <xs:anyAttribute namespace="##other" processContents="lax" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="DescriptionType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:anyAttribute namespace="##other" processContents="lax" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="DisplayValueType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:anyAttribute namespace="##other" processContents="lax" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:complexType name="EncryptedValueType">
-    <xs:sequence>
-      <xs:element ref="xenc:EncryptedData" minOccurs="1" maxOccurs="1"/>
-    </xs:sequence>
-    <xs:attribute name="DecryptionCondition" type="xs:anyURI" use="optional"/>
-  </xs:complexType>
-
-  <xs:complexType name="StructuredValueType">
-    <xs:sequence>
-      <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='unbounded' />
-    </xs:sequence>
-    <xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <!-- Section 9.3.1 -->
-
-  <xs:complexType name='ConstrainedValueType'>
-    <xs:sequence>
-      <xs:choice minOccurs='1'>
-        <xs:element name='ValueLessThan' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
-        <xs:element name='ValueLessThanOrEqual' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
-        <xs:element name='ValueGreaterThan' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
-        <xs:element name='ValueGreaterThanOrEqual' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
-        <xs:element name='ValueInRangen' type='tns:ValueInRangeType' minOccurs='1' maxOccurs='1'/>
-        <xs:element name='ValueOneOf' type='tns:ConstrainedManyValueType' minOccurs='1' maxOccurs='1'/>
-      </xs:choice>
-      <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='unbounded' />
-    </xs:sequence>
-    <xs:attribute name='AssertConstraint' type='xs:boolean' use='optional' />
-  </xs:complexType>
-  <xs:complexType name='ValueInRangeType'>
-    <xs:sequence>
-      <xs:element name='ValueUpperBound' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
-      <xs:element name='ValueLowerBound' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <xs:complexType name='ConstrainedSingleValueType'>
-    <xs:choice minOccurs='0'>
-      <xs:element name='Value' type='xs:string' minOccurs='1' maxOccurs='1' />
-      <xs:element name='StructuredValue' type='tns:StructuredValueType' minOccurs='1' maxOccurs='1' />
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name='ConstrainedManyValueType'>
-    <xs:choice minOccurs='0'>
-      <xs:element name='Value' type='xs:string' minOccurs='1' maxOccurs='unbounded' />
-      <xs:element name='StructuredValue' type='tns:StructuredValueType' minOccurs='1' maxOccurs='unbounded' />
-    </xs:choice>
-  </xs:complexType>
-
-</xs:schema>
\ No newline at end of file
diff --git a/xml/ws-federation.xsd b/xml/ws-federation.xsd
deleted file mode 100644
index f87059db..00000000
--- a/xml/ws-federation.xsd
+++ /dev/null
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the 
-implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; 
-neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS 
-specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made 
-available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users 
-of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may 
-cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright © OASIS Open 2002-2007. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist 
-in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the 
-above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified 
-in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, 
-in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate 
-it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an AS IS basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF 
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-  -->
-<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
-		   xmlns:sp='http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702'
-		   xmlns:tns='http://docs.oasis-open.org/wsfed/federation/200706'
-		   xmlns:wsa='http://www.w3.org/2005/08/addressing'
-       xmlns:mex='http://schemas.xmlsoap.org/ws/2004/09/mex'
-       xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
-		   xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd'
-       xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'
-       xmlns:auth='http://docs.oasis-open.org/wsfed/authorization/200706'
-		   targetNamespace='http://docs.oasis-open.org/wsfed/federation/200706'
-		   elementFormDefault='qualified' >
-
-  <xs:import namespace='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
-			 schemaLocation='oasis-200401-wss-wssecurity-secext-1.0.xsd' />
-  <xs:import namespace='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd'
-			 schemaLocation='oasis-200401-wss-wssecurity-utility-1.0.xsd' />
-  <xs:import namespace='http://www.w3.org/2005/08/addressing'
-			 schemaLocation='ws-addr.xsd' />
-  <xs:import namespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
-			 schemaLocation='MetadataExchange.xsd' />
-  <xs:import namespace='urn:oasis:names:tc:SAML:2.0:metadata'
-			 schemaLocation='saml-schema-metadata-2.0.xsd' />
-  <xs:import namespace='http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702'
-			 schemaLocation='ws-securitypolicy-1.2.xsd'/>
-  <xs:import namespace='http://docs.oasis-open.org/wsfed/authorization/200706'
-             schemaLocation='ws-authorization.xsd'/>
-
-  <!-- Section 3.1 -->
-  <!-- Note: Use of this root element is discouraged in favor of use of md:EntitiesDescriptor or md EntityDescriptor -->
-  <xs:element name='FederationMetadata' type='tns:FederationMetadataType' />
-
-  <xs:complexType name='FederationMetadataType' >
-    <xs:sequence>
-	  <!--
-		  *** Accurate content model is nondeterministic ***
-		  <xs:element name='Federation' type='tns:FederationType' minOccurs='1' maxOccurs='unbounded' />
-		  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-	  -->
-	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <xs:complexType name='FederationType' >
-	<xs:sequence>
-	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:attribute name='FederationID' type='xs:anyURI' />
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <!-- Section 3.1.2.1 -->
-  <xs:complexType name="WebServiceDescriptorType" abstract="true">
-    <xs:complexContent>
-      <xs:extension base="md:RoleDescriptorType">
-        <xs:sequence>
-          <xs:element ref="tns:LogicalServiceNamesOffered" minOccurs="0" maxOccurs="1" />
-          <xs:element ref="tns:TokenTypesOffered" minOccurs="0" maxOccurs="1" />
-          <xs:element ref="tns:ClaimDialectsOffered" minOccurs="0" maxOccurs="1" />
-          <xs:element ref="tns:ClaimTypesOffered" minOccurs="0" maxOccurs="1" />
-          <xs:element ref="tns:ClaimTypesRequested" minOccurs="0" maxOccurs="1" />
-          <xs:element ref="tns:AutomaticPseudonyms" minOccurs="0" maxOccurs="1"/>
-          <xs:element ref="tns:TargetScopes" minOccurs="0" maxOccurs="1"/>
-        </xs:sequence>
-        <xs:attribute name="ServiceDisplayName" type="xs:string" use="optional"/>
-        <xs:attribute name="ServiceDescription" type="xs:string" use="optional"/>
-    </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name='LogicalServiceNamesOffered' type='tns:LogicalServiceNamesOfferedType' />
-  <xs:element name='TokenTypesOffered' type='tns:TokenTypesOfferedType' />
-  <xs:element name='ClaimDialectsOffered' type='tns:ClaimDialectsOfferedType' />
-  <xs:element name='ClaimTypesOffered' type='tns:ClaimTypesOfferedType' />
-  <xs:element name='ClaimTypesRequested' type='tns:ClaimTypesRequestedType' />
-  <xs:element name="AutomaticPseudonyms" type="xs:boolean"/>
-  <xs:element name='TargetScopes' type='tns:EndpointType'/>
-
-  <!-- Section 3.1.2.2 -->
-  <xs:complexType name="SecurityTokenServiceType">
-    <xs:complexContent>
-      <xs:extension base="tns:WebServiceDescriptorType">
-        <xs:sequence>
-          <xs:element ref="tns:SecurityTokenServiceEndpoint" minOccurs="1" maxOccurs="unbounded"/>
-          <xs:element ref="tns:SingleSignOutSubscriptionEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element ref="tns:SingleSignOutNotificationEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element ref="tns:PassiveRequestorEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="SecurityTokenServiceEndpoint" type="tns:EndpointType"/>
-  <xs:element name="SingleSignOutSubscriptionEndpoint" type="tns:EndpointType"/>
-  <xs:element name="SingleSignOutNotificationEndpoint" type="tns:EndpointType"/>
-  <xs:element name="PassiveRequestorEndpoint" type="tns:EndpointType"/>
-
-  <!-- Section 3.1.2.3 -->
-  <xs:complexType name="PseudonymServiceType">
-    <xs:complexContent>
-      <xs:extension base="tns:WebServiceDescriptorType">
-        <xs:sequence>
-          <xs:element ref="tns:PseudonymServiceEndpoint" minOccurs="1" maxOccurs="unbounded"/>
-          <xs:element ref="tns:SingleSignOutNotificationEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="PseudonymServiceEndpoint" type="tns:EndpointType"/>
-  <!-- Defined above -->
-  <!-- <xs:element name="SingleSignOutNotificationEndpoint" type="tns:EndpointType"/> -->
-
-  <!-- Section 3.1.2.4 -->
-  <xs:complexType name="AttributeServiceType">
-    <xs:complexContent>
-      <xs:extension base="tns:WebServiceDescriptorType">
-        <xs:sequence>
-          <xs:element ref="tns:AttributeServiceEndpoint" minOccurs="1" maxOccurs="unbounded"/>
-          <xs:element ref="tns:SingleSignOutNotificationEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="AttributeServiceEndpoint" type="tns:EndpointType"/>
-  <!-- Defined above -->
-  <!-- <xs:element name="SingleSignOutNotificationEndpoint" type="tns:EndpointType"/> -->
-
-  <!-- Section 3.1.2.5 -->
-  <xs:complexType name="ApplicationServiceType">
-    <xs:complexContent>
-      <xs:extension base="tns:WebServiceDescriptorType">
-        <xs:sequence>
-          <xs:element ref="tns:ApplicationServiceEndpoint" minOccurs="1" maxOccurs="unbounded"/>
-          <xs:element ref="tns:SingleSignOutNotificationEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element ref="tns:PassiveRequestorEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="ApplicationServiceEndpoint" type="tns:EndpointType"/>
-  <!-- Defined above -->
-  <!-- <xs:element name="SingleSignOutNotificationEndpoint" type="tns:EndpointType"/> -->
-  <!-- <xs:element name="PassiveRequestorEndpoint" type="tns:EndpointType"/> -->
-
-
-  <!-- Section 3.1.3 -->
-  <!-- Defined above -->
-  <!--<xs:element name='LogicalServiceNamesOffered' type='tns:LogicalServiceNamesOfferedType' />-->
-
-  <xs:complexType name='LogicalServiceNamesOfferedType' >
-	<xs:sequence>
-	  <xs:element name='IssuerName' type='tns:IssuerNameType' minOccurs='1' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <xs:complexType name='IssuerNameType' >
-	<xs:attribute name='Uri' type='xs:anyURI' use='required' />
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>  
-  
-  <!-- Section 3.1.4 -->
-  <xs:element name='PsuedonymServiceEndpoints' type='tns:EndpointType' />
-  <xs:complexType name='EndpointType' >
-    <xs:sequence>
-      <xs:element ref='wsa:EndpointReference' minOccurs='1' maxOccurs='unbounded'/>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <!-- Section 3.1.5 -->
-  <xs:element name='AttributeServiceEndpoints' type='tns:EndpointType' />
-
-  <!-- Section 3.1.6 -->
-  <xs:element name='SingleSignOutSubscriptionEndpoints' type='tns:EndpointType' />
-
-  <!-- Section 3.1.7 -->
-  <xs:element name='SingleSignOutNotificationEndpoints' type='tns:EndpointType' />
-
-  <!-- Section 3.1.8 -->
-  <!-- Defined above -->
-  <!--<xs:element name='TokenTypesOffered' type='tns:TokenTypesOfferedType' />-->
-  <xs:complexType name='TokenTypesOfferedType' >
-	<xs:sequence>
-	  <xs:element name='TokenType' type='tns:TokenType' minOccurs='1' maxOccurs='unbounded' />
-	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <xs:complexType name='TokenType' >
-	<xs:sequence>
-	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:attribute name='Uri' type='xs:anyURI' />
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <!-- Section 3.1.9 -->
-  <!-- Defined above -->
-  <!-- <xs:element name='ClaimTypesOffered' type='tns:ClaimTypesOfferedType' /> -->
-  <xs:complexType name='ClaimTypesOfferedType'>
-	<xs:sequence>
-	  <xs:element ref='auth:ClaimType' minOccurs='1' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-  
-  <!-- Section 3.1.10 -->
-  <!-- Defined above -->
-  <!-- <xs:element name='ClaimTypesRequested' ype='tns:ClaimTypesRequestedType' /> -->
-  <xs:complexType name='ClaimTypesRequestedType'>
-    <xs:sequence>
-      <xs:element ref='auth:ClaimType' minOccurs='1' maxOccurs='unbounded' />
-    </xs:sequence>
-    <xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-  
-  <!-- Section 3.1.11 -->
-  <!-- Defined above -->
-  <!--<xs:element name='ClaimDialectsOffered' type='tns:ClaimDialectsOfferedType' />-->
-  <xs:complexType name='ClaimDialectsOfferedType'>
-    <xs:sequence>
-      <xs:element name='ClaimDialect' type='tns:ClaimDialectType' minOccurs='1' maxOccurs='unbounded' />
-    </xs:sequence>
-    <xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <xs:complexType name='ClaimDialectType' >
-    <xs:sequence>
-      <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-    </xs:sequence>
-    <xs:attribute name='Uri' type='xs:anyURI' />
-    <xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-  
-  <!-- Section 3.1.12 -->
-  <!-- Defined above -->
-  <!-- <xs:element name='AutomaticPseudonyms' type='xs:boolean' /> -->
-
-  <!-- Section 3.1.13 -->
-  <xs:element name='PassiveRequestorEnpoints' type='tns:EndpointType'/>
-  
-  <!-- Section 3.1.14 -->
-  <!-- Defined above -->
-  <!--<xs:element name='TargetScopes' type='tns:EndpointType'/>-->
-  
-  <!-- Section 3.2.4 -->
-  <xs:element name='FederationMetadataHandler' type='tns:FederationMetadataHandlerType' />
-  <xs:complexType name='FederationMetadataHandlerType' >
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <!-- Section 4.1 -->
-  <xs:element name='SignOut' type='tns:SignOutType' />
-  <xs:complexType name='SignOutType' >
-	<xs:sequence>
-	  <xs:element ref='tns:Realm' minOccurs='0' />
-	  <xs:element name='SignOutBasis' type='tns:SignOutBasisType' minOccurs='1' maxOccurs='1' />
-	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:attribute ref='wsu:Id' use='optional' />
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <xs:complexType name='SignOutBasisType' >
-	<xs:sequence>
-	  <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />	
-  </xs:complexType>
-
-  <!-- Section 4.2 -->
-  <xs:element name='Realm' type='xs:anyURI' />
-
-  <!-- Section 6.1 -->
-  <xs:element name='FilterPseudonyms' type='tns:FilterPseudonymsType' />
-  <xs:complexType name='FilterPseudonymsType' >
-	<xs:sequence>
-	  <xs:element ref='tns:PseudonymBasis' minOccurs='0' maxOccurs='1' />
-	  <xs:element ref='tns:RelativeTo' minOccurs='0' maxOccurs='1' />
-	  <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />	
-  </xs:complexType>
-
-  <xs:element name='PseudonymBasis' type='tns:PseudonymBasisType' />
-  <xs:complexType name='PseudonymBasisType' >
- 	<xs:sequence>
-	  <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <xs:element name='RelativeTo' type='tns:RelativeToType' />
-  <xs:complexType name='RelativeToType' >
-	<xs:sequence>
-	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <!-- Section 6.2  -->
-  <xs:element name='Pseudonym' type='tns:PseudonymType' />
-
-  <xs:complexType name='PseudonymType' >
-	<xs:sequence>
-	  <!--
-		  *** Accurate content model is nondeterministic ***
-		  <xs:element ref='tns:PseudonymBasis' minOccurs='1' maxOccurs='1' /> 
-		  <xs:element ref='tns:RelativeTo' minOccurs='1' maxOccurs='1' />
-		  <xs:element ref='wsu:Expires' minOccurs='0' maxOccurs='1' />
-		  <xs:element ref='tns:SecurityToken' minOccurs='0' maxOccurs='unbounded' />
-		  <xs:element ref='tns:ProofToken' minOccurs='0' maxOccurs='unbounded' />
-		  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  
-	  -->
-
-	  <xs:element ref='tns:PseudonymBasis' minOccurs='1' maxOccurs='1' /> 
-	  <xs:element ref='tns:RelativeTo' minOccurs='1' maxOccurs='1' />
-	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />	
-  </xs:complexType>
-
-  <xs:element name='SecurityToken' type='tns:SecurityTokenType' />
-  <xs:complexType name='SecurityTokenType' >
- 	<xs:sequence>
-	  <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <xs:element name='ProofToken' type='tns:ProofTokenType' />
-  <xs:complexType name='ProofTokenType' >
- 	<xs:sequence>
-	  <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <!-- Section 7.1 -->
-  <xs:element name='RequestPseudonym' type='tns:RequestPseudonymType' />
-  <xs:complexType name='RequestPseudonymType' >
-	<xs:sequence>
-	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  
-	</xs:sequence>
-	<xs:attribute name='SingleUse' type='xs:boolean' use='optional' />
-	<xs:attribute name='Lookup' type='xs:boolean' use='optional' />
-	<xs:anyAttribute namespace='##other' processContents='lax' />  
-  </xs:complexType>
-
-  <!-- Section 8.1 -->
-  <xs:element name='ReferenceToken' type='tns:ReferenceTokenType' />
-  <xs:complexType name='ReferenceTokenType'>
-	<xs:sequence>
-	  <xs:element name='ReferenceEPR' type='wsa:EndpointReferenceType' minOccurs='1' maxOccurs='unbounded' />
-	  <xs:element name='ReferenceDigest' type='tns:ReferenceDigestType' minOccurs='0' maxOccurs='1' />
-	  <xs:element name='ReferenceType' type='tns:AttributeExtensibleURI' minOccurs='0' maxOccurs='1' />
-	  <xs:element name='SerialNo' type='tns:AttributeExtensibleURI' minOccurs='0' maxOccurs='1' />
-	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  	  
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />  
-  </xs:complexType>
-
-  <xs:complexType name='ReferenceDigestType' >
-	<xs:simpleContent>
-	  <xs:extension base='xs:base64Binary' >
-		<xs:anyAttribute namespace='##other' processContents='lax' />  
-	  </xs:extension>
-	</xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name='AttributeExtensibleURI' >
-    <xs:simpleContent>
-      <xs:extension base='xs:anyURI' >
-        <xs:anyAttribute namespace='##other' processContents='lax' />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  
-  <!-- Section 8.2 -->
-  <xs:element name='FederationID' type='tns:AttributeExtensibleURI' />
-
-  <!-- Section 8.3 -->
-  <xs:element name='RequestProofToken' type='tns:RequestProofTokenType' />
-  <xs:complexType name='RequestProofTokenType' >
-	<xs:sequence>
-	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <!-- Section 8.4 -->
-  <xs:element name='ClientPseudonym' type='tns:ClientPseudonymType' />
-  <xs:complexType name='ClientPseudonymType' >
-	<xs:sequence>
-	  <xs:element name='PPID' type='tns:AttributeExtensibleString' minOccurs='0' />
-	  <xs:element name='DisplayName' type='tns:AttributeExtensibleString' minOccurs='0' />
-	  <xs:element name='EMail' type='tns:AttributeExtensibleString' minOccurs='0' />
-	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  	  
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />	
-  </xs:complexType>
-
-  <xs:complexType name='AttributeExtensibleString' >
-	<xs:simpleContent>
-	  <xs:extension base='xs:string' >
-		<xs:anyAttribute namespace='##other' processContents='lax' />
-	  </xs:extension>
-	</xs:simpleContent>
-  </xs:complexType>
-
-  <!-- Section 8.5 -->
-  <xs:element name='Freshness' type='tns:Freshness' />
-  <xs:complexType name='Freshness'>
-	<xs:simpleContent>
-	  <xs:extension base='xs:unsignedInt' >
-		<xs:attribute name='AllowCache' type='xs:boolean' use='optional' />
-		<xs:anyAttribute namespace='##other' processContents='lax' />		
-	  </xs:extension>
-	</xs:simpleContent>
-  </xs:complexType>
-
-  <!-- Section 14.1 -->
-  <xs:element name='RequireReferenceToken' type='sp:TokenAssertionType' />
-  <xs:element name='ReferenceToken11' type='tns:AssertionType' />
-
-  <xs:complexType name='AssertionType' >
-	<xs:sequence>
-	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:anyAttribute namespace='##other' processContents='lax' />
-  </xs:complexType>
-
-  <!-- Section 14.2 -->
-  <xs:element name='WebBinding' type='sp:NestedPolicyType' />
-  <xs:element name='AuthenticationToken' type='sp:NestedPolicyType' />
-  <!-- ReferenceToken defined above -->
-  <xs:element name='RequireSignedTokens' type='tns:AssertionType' />
-  <xs:element name='RequireBearerTokens' type='tns:AssertionType' />
-  <xs:element name='RequireSharedCookies' type='tns:AssertionType' />
-  
-
-  <!-- Section 14.3 -->
-  <xs:element name='RequiresGenericClaimDialect' type='tns:AssertionType' />
-  <xs:element name='IssuesSpecificPolicyFault' type='tns:AssertionType' />
-  <xs:element name='AdditionalContextProcessed' type='tns:AssertionType' />
-
-
-</xs:schema>
-
diff --git a/xml/ws-securitypolicy-1.2.xsd b/xml/ws-securitypolicy-1.2.xsd
deleted file mode 100644
index 0e562726..00000000
--- a/xml/ws-securitypolicy-1.2.xsd
+++ /dev/null
@@ -1,1205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the 
-implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; 
-neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS 
-specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made 
-available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users 
-of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may 
-cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright © OASIS Open 2002-2007. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist 
-in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the 
-above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified 
-in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, 
-in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate 
-it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an AS IS basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF 
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
--->
-<xs:schema
-	targetNamespace='http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702'
-  xmlns:tns='http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702'
-	xmlns:wsa="http://www.w3.org/2005/08/addressing"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified"
-	blockDefault="#all" >
-
-  <xs:import namespace="http://www.w3.org/2005/08/addressing" 
-		schemaLocation="ws-addr.xsd" />
-
-  <!--
-	4. Protection Assertions
-	-->
-  <xs:element name="SignedParts" type="tns:SePartsType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        4.1.1 SignedParts Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="EncryptedParts" type="tns:SePartsType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        4.2.1 EncryptedParts Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:complexType name="SePartsType">
-    <xs:sequence>
-      <xs:element name="Body" type="tns:EmptyType" minOccurs="0" />
-      <xs:element name="Header" type="tns:HeaderType" minOccurs="0" maxOccurs="unbounded" />
-      <xs:element name="Attachments" type="tns:EmptyType" minOccurs="0" />
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-  <xs:complexType name="EmptyType" />
-  <xs:complexType name="HeaderType" >
-    <xs:attribute name="Name" type="xs:QName" use="optional" />
-    <xs:attribute name="Namespace" type="xs:anyURI" use="required" />
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="SignedElements" type="tns:SerElementsType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en" >
-        4.1.2 SignedElements Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="EncryptedElements" type="tns:SerElementsType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        4.2.2 EncryptedElements Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequiredElements" type="tns:SerElementsType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en" >
-        4.3.1 RequiredElements Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:complexType name="SerElementsType">
-    <xs:sequence>
-      <xs:element name="XPath" type="xs:string" minOccurs="1" maxOccurs="unbounded" />
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
-    </xs:sequence>
-    <xs:attribute name="XPathVersion" type="xs:anyURI" use="optional" />
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-
-  <!--
-	5. Token Assertions
-	-->
-  <xs:attribute name="IncludeToken" type="tns:IncludeTokenOpenType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.1 Token Inclusion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:simpleType name="IncludeTokenOpenType">
-    <xs:union memberTypes="tns:IncludeTokenType xs:anyURI" />
-  </xs:simpleType>
-  <xs:simpleType name="IncludeTokenType">
-    <xs:restriction base="xs:anyURI" >
-      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/Never" />
-      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/Once" />
-      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/AlwaysToRecipient" />
-      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/AlwaysToInitiator" />
-      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/Always" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="UsernameToken" type="tns:TokenAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en" >
-        5.4.1 UsernameToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:complexType name="TokenAssertionType">
-    <xs:sequence>
-      <xs:choice minOccurs="0">
-        <xs:element name="Issuer" type="wsa:EndpointReferenceType" />
-        <xs:element name="IssuerName" type="xs:anyURI" />
-      </xs:choice>
-      <!--
-			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
-			<xs:element ref="wsp:Policy" minOccurs="0" />
-			-->
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
-    </xs:sequence>
-    <xs:attribute ref="tns:IncludeToken" use="optional" />
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="NoPassword" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.1 UsernameToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="HashPassword" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.1 UsernameToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssUsernameToken10" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.1 UsernameToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssUsernameToken11" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.1 UsernameToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- RequireDerivedKeys defined below. -->
-  <!-- RequireImpliedDerivedKeys defined below. -->
-  <!-- RequireExplicitDerivedKeys defined below. -->
-
-  <xs:complexType name="QNameAssertionType">
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="IssuedToken" type="tns:IssuedTokenType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.2 IssuedToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:complexType name="IssuedTokenType">
-    <xs:sequence>
-      <xs:choice minOccurs="0">
-        <xs:element name="Issuer" type="wsa:EndpointReferenceType" />
-        <xs:element name="IssuerName" type="xs:anyURI" />
-      </xs:choice>
-      <xs:element name="RequestSecurityTokenTemplate" type="tns:RequestSecurityTokenTemplateType" />
-      <!--
-			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
-			<xs:element ref="wsp:Policy" minOccurs="0" />
-			-->
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
-    </xs:sequence>
-    <xs:attribute ref="tns:IncludeToken" use="optional" />
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-  <xs:complexType name="RequestSecurityTokenTemplateType">
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
-    </xs:sequence>
-    <xs:attribute name="TrustVersion" type="xs:anyURI" use="optional" />
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="RequireDerivedKeys" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.2 IssuedToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireImpliedDerivedKeys" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.2 IssuedToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireExplicitDerivedKeys" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.2 IssuedToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireExternalReference" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.2 IssuedToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireInternalReference" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.2 IssuedToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="X509Token" type="tns:TokenAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- RequireDerivedKeys defined above. -->
-  <!-- RequireImpliedDerivedKeys defined above. -->
-  <!-- RequireExplicitDerivedKeys defined above. -->
-  
-  <xs:element name="RequireKeyIdentifierReference" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireIssuerSerialReference" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireEmbeddedTokenReference" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireThumbprintReference" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssX509V3Token10" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssX509Pkcs7Token10" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssX509PkiPathV1Token10" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssX509V1Token11" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssX509V3Token11" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssX509Pkcs7Token11" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssX509PkiPathV1Token11" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.3 X509Token Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="KerberosToken" type="tns:TokenAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.4 KerberosToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- RequireDerivedKeys defined above. -->
-  <!-- RequireImpliedDerivedKeys defined above. -->
-  <!-- RequireExplicitDerivedKeys defined above. -->
-  <!-- RequireKeyIdentifierReference defined above. -->
-
-  <xs:element name="WssKerberosV5ApReqToken11" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.4 KerberosToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssGssKerberosV5ApReqToken11" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.4 KerberosToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SpnegoContextToken" type="tns:SpnegoContextTokenType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en" >
-        5.4.5 SpnegoContextToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:complexType name="SpnegoContextTokenType">
-    <xs:sequence>
-      <xs:choice minOccurs="0">
-        <xs:element name="Issuer" type="wsa:EndpointReferenceType" />
-        <xs:element name="IssuerName" type="xs:anyURI" />
-      </xs:choice>
-      <!--
-			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
-			<xs:element ref="wsp:Policy" minOccurs="0" />
-			-->
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
-    </xs:sequence>
-    <xs:attribute ref="tns:IncludeToken" use="optional" />
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-  <!-- RequireDerivedKeys defined above. -->
-  <!-- RequireImpliedDerivedKeys defined above. -->
-  <!-- RequireExplicitDerivedKeys defined above. -->
-  <xs:element name="MustNotSendCancel" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.5 SpnegoContextToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="MustNotSendAmend" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.5 SpnegoContextToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="MustNotSendRenew" type="tns:QNameAssertionType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.5 SpnegoContextToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SecurityContextToken" type="tns:TokenAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.6 SecurityContextToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- RequireDerivedKeys defined above. -->
-  <!-- RequireImpliedDerivedKeys defined above. -->
-  <!-- RequireExplicitDerivedKeys defined above. -->
-
-  <xs:element name="RequireExternalUriReference" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.6 SecurityContextToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="SC13SecurityContextToken" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.6 SecurityContextToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SecureConversationToken" type="tns:SecureConversationTokenType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.7 SecureConversationToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:complexType name="SecureConversationTokenType">
-    <xs:sequence>
-      <xs:choice minOccurs="0">
-        <xs:element name="Issuer" type="wsa:EndpointReferenceType" />
-        <xs:element name="IssuerName" type="xs:anyURI" />
-      </xs:choice>
-      <!--
-			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
-			<xs:element ref="wsp:Policy" minOccurs="0" />
-			-->
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
-    </xs:sequence>
-    <xs:attribute ref="tns:IncludeToken" use="optional" />
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-  <!-- RequireDerivedKeys defined above. -->
-  <!-- RequireImpliedDerivedKeys defined above. -->
-  <!-- RequireExplicitDerivedKeys defined above. -->
-  <!-- RequireExternalUriReference defined above. -->
-  <!-- SC13SecurityContextToken defined above. -->
-  <!-- MustNotSendCancel defined above. -->
-  <!-- MustNotSendAmend defined above. -->
-  <!-- MustNotSendRenew defined above. -->
-
-  <xs:element name="BootstrapPolicy" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.7 SecureConversationToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SamlToken" type="tns:TokenAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en" >
-        5.4.8 SamlToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- RequireDerivedKeys defined above. -->
-  <!-- RequireImpliedDerivedKeys defined above. -->
-  <!-- RequireExplicitDerivedKeys defined above. -->
-  <!-- RequireKeyIdentifierReference defined above. -->
-
-  <xs:element name="WssSamlV11Token10" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.8 SamlToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssSamlV11Token11" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.8 SamlToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssSamlV20Token11" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.8 SamlToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="RelToken" type="tns:TokenAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.9 RelToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- RequireDerivedKeys defined above. -->
-  <!-- RequireImpliedDerivedKeys defined above. -->
-  <!-- RequireExplicitDerivedKeys defined above. -->
-  <!-- RequireKeyIdentifierReference defined above. -->
-
-  <xs:element name="WssRelV10Token10" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.9 RelToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssRelV20Token10" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.9 RelToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssRelV10Token11" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.9 RelToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="WssRelV20Token11" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.9 RelToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="HttpsToken" type="tns:TokenAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.10 HttpsToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="HttpBasicAuthentication" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.10 HttpsToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="HttpDigestAuthentication" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.10 HttpsToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireClientCertificate" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.10 HttpsToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  
-  <xs:element name="KeyValueToken" type="tns:KeyValueTokenType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.11 KeyValueToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:complexType name="KeyValueTokenType">
-    <xs:sequence>
-      <!--
-			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
-			<xs:element ref="wsp:Policy" minOccurs="0" />
-			-->
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
-    </xs:sequence>
-    <xs:attribute ref="tns:IncludeToken" use="optional" />
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-  <xs:element name="RsaKeyValue" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        5.4.11 KeyValueToken Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  
-  <!--
-	7. Security Binding Assertions
-	-->
-  <xs:element name="AlgorithmSuite" type="tns:NestedPolicyType" >
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:complexType name="NestedPolicyType">
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="Basic256" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic192" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic128" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="TripleDes" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic256Rsa15" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic192Rsa15" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic128Rsa15" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="TripleDesRsa15" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic256Sha256" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic192Sha256" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic128Sha256" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="TripleDesSha256" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic256Sha256Rsa15" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic192Sha256Rsa15" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Basic128Sha256Rsa15" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="TripleDesSha256Rsa15" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="InclusiveC14N" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="SOAPNormalization10" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="STRTransform10" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="XPath10" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="XPathFilter20" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="AbsXPath" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.1 AlgorithmSuite Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="Layout" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.2 Layout Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="Strict" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.2 Layout Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="Lax" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.2 Layout Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="LaxTsFirst" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.2 Layout Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="LaxTsLast" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.2 Layout Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="TransportBinding" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.3 TransportBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="TransportToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.3 TransportBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- Layout defined above. -->
-
-  <xs:element name="IncludeTimestamp" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.3 TransportBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SymmetricBinding" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.4 SymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="EncryptionToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.4 SymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="SignatureToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        8=7.4 SymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="ProtectionToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.4 SymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- Layout defined above. -->
-  <!-- IncludeTimestamp defined above. -->
-
-  <xs:element name="EncryptBeforeSigning" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.4 SymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="EncryptSignature" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.4 SymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="ProtectTokens" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.4 SymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="OnlySignEntireHeadersAndBody" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.4 SymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="AsymmetricBinding" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.5 AsymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="InitiatorToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.5 AsymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="InitiatorSignatureToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.5 AsymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="InitiatorEncryptionToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.5 AsymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="RecipientToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.5 AsymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="RecipientSignatureToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.5 AsymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="RecipientEncryptionToken" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        7.5 AsymmetricBinding Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- Layout defined above. -->
-  <!-- IncludeTimestamp defined above. -->
-  <!-- EncryptBeforeSigning defined above. -->
-  <!-- EncryptSignature defined above. -->
-  <!-- ProtectTokens defined above. -->
-  <!-- OnlySignEntireHeadersAndBody defined above. -->
-
-  <!--
-	8. Supporting Tokens
-	-->
-  <xs:element name="SupportingTokens" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        8.1 SupportingTokens Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- SignedParts defined above. -->
-  <!-- SignedElements defined above. -->
-  <!-- EncryptedParts defined above. -->
-  <!-- EncryptedElements defined above. -->
-
-  <xs:element name="SignedSupportingTokens" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        8.2 SignedSupportingTokens Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- SignedParts defined above. -->
-  <!-- SignedElements defined above. -->
-  <!-- EncryptedParts defined above. -->
-  <!-- EncryptedElements defined above. -->
-
-  <xs:element name="EndorsingSupportingTokens" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        8.3 EndorsingSupportingTokens Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- SignedParts defined above. -->
-  <!-- SignedElements defined above. -->
-  <!-- EncryptedParts defined above. -->
-  <!-- EncryptedElements defined above. -->
-
-  <xs:element name="SignedEndorsingSupportingTokens" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        8.4 SignedEndorsingSupportingTokens Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- SignedParts defined above. -->
-  <!-- SignedElements defined above. -->
-  <!-- EncryptedParts defined above. -->
-  <!-- EncryptedElements defined above. -->
-
-  <xs:element name="SignedEncryptedSupportingTokens" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        8.5 SignedEncryptedSupportingTokens Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- SignedParts defined above. -->
-  <!-- SignedElements defined above. -->
-  <!-- EncryptedParts defined above. -->
-  <!-- EncryptedElements defined above. -->
-
-  <xs:element name="EncryptedSupportingTokens" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        8.6 EncryptedSupportingTokens Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- SignedParts defined above. -->
-  <!-- SignedElements defined above. -->
-  <!-- EncryptedParts defined above. -->
-  <!-- EncryptedElements defined above. -->
-  
-  <xs:element name="EndorsingEncryptedSupportingTokens" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        8.7 EndorsingEncryptedSupportingTokens Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- SignedParts defined above. -->
-  <!-- SignedElements defined above. -->
-  <!-- EncryptedParts defined above. -->
-  <!-- EncryptedElements defined above. -->
-
-  <xs:element name="SignedEndorsingEncryptedSupportingTokens" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        8.8 SignedEndorsingEncryptedSupportingTokens Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- AlgorithmSuite defined above. -->
-  <!-- SignedParts defined above. -->
-  <!-- SignedElements defined above. -->
-  <!-- EncryptedParts defined above. -->
-  <!-- EncryptedElements defined above. -->
-  
-  <!--
-	9. WSS: SOAP Message Security Options
-	-->
-  <xs:element name="Wss10" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        9.1 Wss10 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="MustSupportRefKeyIdentifier" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        9.1 Wss10 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="MustSupportRefIssuerSerial" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        9.1 Wss10 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="MustSupportRefExternalURI" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        9.1 Wss10 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="MustSupportRefEmbeddedToken" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        9.1 Wss10 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="Wss11" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        9.2 Wss11 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <!-- MustSupportRefKeyIdentifier defined above. -->
-  <!-- MustSupportRefIssuerSerial defined above. -->
-  <!-- MustSupportRefExternalURI defined above. -->
-  <!-- MustSupportRefEmbeddedToken defined above. -->
-
-  <xs:element name="MustSupportRefThumbprint" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        9.2 Wss11 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="MustSupportRefEncryptedKey" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        9.2 Wss11 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireSignatureConfirmation" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        9.2 Wss11 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <!--
-	10. WS-Trust Options
-	-->
-  <xs:element name="Trust13" type="tns:NestedPolicyType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        10.1 Trust13 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="MustSupportClientChallenge" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        10.1 Trust13 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="MustSupportServerChallenge" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        10.1 Trust13 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireClientEntropy" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        10.1 Trust13 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireServerEntropy" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        10.1 Trust13 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="MustSupportIssuedTokens" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        10.1 Trust13 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireRequestSecurityTokenCollection" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        10.1 Trust13 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="RequireAppiesTo" type="tns:QNameAssertionType">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        10.1 Trust13 Assertion
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  
-</xs:schema>
\ No newline at end of file
diff --git a/xml/xenc-schema-11.xsd b/xml/xenc-schema-11.xsd
deleted file mode 100644
index 1abb6437..00000000
--- a/xml/xenc-schema-11.xsd
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-#
-# Copyright ©[2011] World Wide Web Consortium 
-# (Massachusetts Institute of Technology,  
-#  European Research Consortium for Informatics and Mathematics, 
-#  Keio University). All Rights Reserved.  
-# This work is distributed under the W3C® Software License [1] in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. 
-# [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-#
--->
-
-<schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
-        xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'
-        xmlns:xenc11='http://www.w3.org/2009/xmlenc11#'
-        xmlns:ds='http://www.w3.org/2000/09/xmldsig#'
-        targetNamespace='http://www.w3.org/2009/xmlenc11#'
-        elementFormDefault='qualified'>
-
-	<import namespace='http://www.w3.org/2000/09/xmldsig#'
-			schemaLocation='xmldsig-core-schema.xsd'/>
-
-	<import namespace='http://www.w3.org/2001/04/xmlenc#'
-			schemaLocation='xenc-schema.xsd'/>
-
-	<element name="ConcatKDFParams" type="xenc11:ConcatKDFParamsType"/>
-	<complexType name="ConcatKDFParamsType">
-		<sequence>
-			<element ref="ds:DigestMethod"/>
-		</sequence>
-		<attribute name="AlgorithmID" type="hexBinary"/>
-		<attribute name="PartyUInfo" type="hexBinary"/>
-		<attribute name="PartyVInfo" type="hexBinary"/>
-		<attribute name="SuppPubInfo" type="hexBinary"/>
-		<attribute name="SuppPrivInfo" type="hexBinary"/>
-	</complexType>
-
-	<element name="DerivedKey" type="xenc11:DerivedKeyType"/>
-	<complexType name="DerivedKeyType">
-		<sequence>
-			<element ref="xenc11:KeyDerivationMethod" minOccurs="0"/>
-			<element ref="xenc:ReferenceList" minOccurs="0"/>
-			<element name="DerivedKeyName" type="string" minOccurs="0"/>
-			<element name="MasterKeyName" type="string" minOccurs="0"/>
-		</sequence>
-		<attribute name="Recipient" type="string" use="optional"/>
-		<attribute name="Id" type="ID" use="optional"/>
-		<attribute name="Type" type="anyURI" use="optional"/>
-	</complexType>
-
-	<element name="KeyDerivationMethod" type="xenc11:KeyDerivationMethodType"/>
-	<complexType name="KeyDerivationMethodType">
-		<sequence>
-			<any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="Algorithm" type="anyURI" use="required"/>
-	</complexType>
-
-	<element name="PBKDF2-params" type="xenc11:PBKDF2ParameterType"/>
-
-	<complexType name="AlgorithmIdentifierType">
-		<sequence>
-			<element name="Parameters" minOccurs="0"/>
-		</sequence>
-        <attribute name="Algorithm" type="anyURI" use="required" />
-	</complexType>
-
-	<complexType name="PRFAlgorithmIdentifierType">
-		<complexContent>
-          <restriction base="xenc11:AlgorithmIdentifierType">
-            <attribute name="Algorithm" type="anyURI" use="required" />
-          </restriction>
-        </complexContent>
-	</complexType>
-
-	<complexType name="PBKDF2ParameterType">
-		<sequence>
-			<element name="Salt">
-				<complexType>
-					<choice>
-						<element name="Specified" type="base64Binary"/>
-						<element name="OtherSource" type="xenc11:AlgorithmIdentifierType"/>
-					</choice>
-				</complexType>
-			</element>
-			<element name="IterationCount" type="positiveInteger"/>
-			<element name="KeyLength" type="positiveInteger"/>
-			<element name="PRF" type="xenc11:PRFAlgorithmIdentifierType"/>
-		</sequence>
-	</complexType>
-
-    <element name="MGF" type="xenc11:MGFType"/>
-    <complexType name="MGFType">
-      <complexContent>
-        <restriction base="xenc11:AlgorithmIdentifierType">
-          <attribute name="Algorithm" type="anyURI" use="required" />
-        </restriction>
-      </complexContent>
-    </complexType>
-
-</schema>
-
-
diff --git a/xml/xenc-schema.xsd b/xml/xenc-schema.xsd
deleted file mode 100644
index cdfc8333..00000000
--- a/xml/xenc-schema.xsd
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-#
-# Copyright ©[2011] World Wide Web Consortium 
-# (Massachusetts Institute of Technology,  
-#  European Research Consortium for Informatics and Mathematics, 
-#  Keio University). All Rights Reserved.  
-# This work is distributed under the W3C® Software License [1] in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. 
-# [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-#
--->
-
-<schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
-        xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'
-        xmlns:ds='http://www.w3.org/2000/09/xmldsig#'
-        targetNamespace='http://www.w3.org/2001/04/xmlenc#'
-        elementFormDefault='qualified'>
-
-  <import namespace='http://www.w3.org/2000/09/xmldsig#' schemaLocation='xmldsig-core-schema.xsd'/>
-
-  <complexType name='EncryptedType' abstract='true'>
-    <sequence>
-      <element name='EncryptionMethod' type='xenc:EncryptionMethodType'
-       minOccurs='0'/>
-      <element ref='ds:KeyInfo' minOccurs='0'/>
-      <element ref='xenc:CipherData'/>
-      <element ref='xenc:EncryptionProperties' minOccurs='0'/>
-    </sequence>
-    <attribute name='Id' type='ID' use='optional'/>
-    <attribute name='Type' type='anyURI' use='optional'/>
-    <attribute name='MimeType' type='string' use='optional'/>
-    <attribute name='Encoding' type='anyURI' use='optional'/>
-  </complexType>
-  
-  <complexType name='EncryptionMethodType' mixed='true'>
-    <sequence>
-      <element name='KeySize' minOccurs='0' type='xenc:KeySizeType'/>
-      <element name='OAEPparams' minOccurs='0' type='base64Binary'/>
-      <!-- note that optional xenc11:MGF element may be used here for
-           RSA-OAEP, when appropriate -->
-      <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
-    </sequence>
-    <attribute name='Algorithm' type='anyURI' use='required'/>
-  </complexType>
-
-    <simpleType name='KeySizeType'>
-      <restriction base="integer"/>
-    </simpleType>
-
-  <element name='CipherData' type='xenc:CipherDataType'/>
-  <complexType name='CipherDataType'>
-     <choice>
-       <element name='CipherValue' type='base64Binary'/>
-       <element ref='xenc:CipherReference'/>
-     </choice>
-    </complexType>
-
-   <element name='CipherReference' type='xenc:CipherReferenceType'/>
-   <complexType name='CipherReferenceType'>
-       <choice>
-         <element name='Transforms' type='xenc:TransformsType' minOccurs='0'/>
-       </choice>
-       <attribute name='URI' type='anyURI' use='required'/>
-   </complexType>
-
-     <complexType name='TransformsType'>
-       <sequence>
-         <element ref='ds:Transform' maxOccurs='unbounded'/>
-       </sequence>
-     </complexType>
-
-
-  <element name='EncryptedData' type='xenc:EncryptedDataType'/>
-  <complexType name='EncryptedDataType'>
-    <complexContent>
-      <extension base='xenc:EncryptedType'>
-       </extension>
-    </complexContent>
-  </complexType>
-
-  <!-- Children of ds:KeyInfo -->
-
-  <element name='EncryptedKey' type='xenc:EncryptedKeyType'/>
-  <complexType name='EncryptedKeyType'>
-    <complexContent>
-      <extension base='xenc:EncryptedType'>
-        <sequence>
-          <element ref='xenc:ReferenceList' minOccurs='0'/>
-          <element name='CarriedKeyName' type='string' minOccurs='0'/>
-        </sequence>
-        <attribute name='Recipient' type='string'
-         use='optional'/>
-      </extension>
-    </complexContent>
-  </complexType>
-
-    <element name="AgreementMethod" type="xenc:AgreementMethodType"/>
-    <complexType name="AgreementMethodType" mixed="true">
-      <sequence>
-        <element name="KA-Nonce" minOccurs="0" type="base64Binary"/>
-        <!-- <element ref="ds:DigestMethod" minOccurs="0"/> -->
-        <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-        <element name="OriginatorKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
-        <element name="RecipientKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
-      </sequence>
-      <attribute name="Algorithm" type="anyURI" use="required"/>
-    </complexType>
-
-  <!-- End Children of ds:KeyInfo -->
-
-  <element name='ReferenceList'>
-    <complexType>
-      <choice minOccurs='1' maxOccurs='unbounded'>
-        <element name='DataReference' type='xenc:ReferenceType'/>
-        <element name='KeyReference' type='xenc:ReferenceType'/>
-      </choice>
-    </complexType>
-  </element>
-
-  <complexType name='ReferenceType'>
-    <sequence>
-      <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
-    </sequence>
-    <attribute name='URI' type='anyURI' use='required'/>
-  </complexType>
-
-
-  <element name='EncryptionProperties' type='xenc:EncryptionPropertiesType'/>
-  <complexType name='EncryptionPropertiesType'>
-    <sequence>
-      <element ref='xenc:EncryptionProperty' maxOccurs='unbounded'/>
-    </sequence>
-    <attribute name='Id' type='ID' use='optional'/>
-  </complexType>
-
-  <element name='EncryptionProperty' type='xenc:EncryptionPropertyType'/>
-  <complexType name='EncryptionPropertyType' mixed='true'>
-    <choice maxOccurs='unbounded'>
-      <any namespace='##other' processContents='lax'/>
-    </choice>
-    <attribute name='Target' type='anyURI' use='optional'/>
-    <attribute name='Id' type='ID' use='optional'/>
-    <anyAttribute namespace="http://www.w3.org/XML/1998/namespace"/>
-  </complexType>
-
-  <!-- Children of ds:KeyValue -->
-
-  <element name="DHKeyValue" type="xenc:DHKeyValueType"/>
-  <complexType name="DHKeyValueType">
-    <sequence>
-      <sequence minOccurs="0">
-        <element name="P" type="ds:CryptoBinary"/>
-        <element name="Q" type="ds:CryptoBinary"/>
-        <element name="Generator" type="ds:CryptoBinary"/>
-      </sequence>
-      <element name="Public" type="ds:CryptoBinary"/>
-      <sequence minOccurs="0">
-        <element name="seed" type="ds:CryptoBinary"/>
-        <element name="pgenCounter" type="ds:CryptoBinary"/>
-      </sequence>
-    </sequence>
-  </complexType>
-
-  <!-- End Children of ds:KeyValue -->
-  
-</schema>
-
diff --git a/xml/xml.xsd b/xml/xml.xsd
deleted file mode 100644
index 38bba34d..00000000
--- a/xml/xml.xsd
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0'?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang" type="xs:language">
-  <xs:annotation>
-   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
diff --git a/xml/xmldsig-core-schema.xsd b/xml/xmldsig-core-schema.xsd
deleted file mode 100644
index 07aad278..00000000
--- a/xml/xmldsig-core-schema.xsd
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Schema for XML Signatures
-    http://www.w3.org/2000/09/xmldsig#
-    $Revision: 1.1 $ on $Date: 2005/03/16 17:40:08 $ by $Author: iay $
-
-    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
-    of Technology, Institut National de Recherche en Informatique et en
-    Automatique, Keio University). All Rights Reserved.
-    http://www.w3.org/Consortium/Legal/
-
-    This document is governed by the W3C Software License [1] as described
-    in the FAQ [2].
-
-    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
--->
-
-
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
-        version="0.1" elementFormDefault="qualified"> 
-
-<!-- Basic Types Defined for Signatures -->
-
-<simpleType name="CryptoBinary">
-  <restriction base="base64Binary">
-  </restriction>
-</simpleType>
-
-<!-- Start Signature -->
-
-<element name="Signature" type="ds:SignatureType"/>
-<complexType name="SignatureType">
-  <sequence> 
-    <element ref="ds:SignedInfo"/> 
-    <element ref="ds:SignatureValue"/> 
-    <element ref="ds:KeyInfo" minOccurs="0"/> 
-    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/>
-</complexType>
-
-  <element name="SignatureValue" type="ds:SignatureValueType"/> 
-  <complexType name="SignatureValueType">
-    <simpleContent>
-      <extension base="base64Binary">
-        <attribute name="Id" type="ID" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-<!-- Start SignedInfo -->
-
-<element name="SignedInfo" type="ds:SignedInfoType"/>
-<complexType name="SignedInfoType">
-  <sequence> 
-    <element ref="ds:CanonicalizationMethod"/> 
-    <element ref="ds:SignatureMethod"/> 
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
-  <complexType name="CanonicalizationMethodType" mixed="true">
-    <sequence>
-      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
-  <complexType name="SignatureMethodType" mixed="true">
-    <sequence>
-      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) external namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- Start Reference -->
-
-<element name="Reference" type="ds:ReferenceType"/>
-<complexType name="ReferenceType">
-  <sequence> 
-    <element ref="ds:Transforms" minOccurs="0"/> 
-    <element ref="ds:DigestMethod"/> 
-    <element ref="ds:DigestValue"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="URI" type="anyURI" use="optional"/> 
-  <attribute name="Type" type="anyURI" use="optional"/> 
-</complexType>
-
-  <element name="Transforms" type="ds:TransformsType"/>
-  <complexType name="TransformsType">
-    <sequence>
-      <element ref="ds:Transform" maxOccurs="unbounded"/>  
-    </sequence>
-  </complexType>
-
-  <element name="Transform" type="ds:TransformType"/>
-  <complexType name="TransformType" mixed="true">
-    <choice minOccurs="0" maxOccurs="unbounded"> 
-      <any namespace="##other" processContents="lax"/>
-      <!-- (1,1) elements from (0,unbounded) namespaces -->
-      <element name="XPath" type="string"/> 
-    </choice>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- End Reference -->
-
-<element name="DigestMethod" type="ds:DigestMethodType"/>
-<complexType name="DigestMethodType" mixed="true"> 
-  <sequence>
-    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-  </sequence>    
-  <attribute name="Algorithm" type="anyURI" use="required"/> 
-</complexType>
-
-<element name="DigestValue" type="ds:DigestValueType"/>
-<simpleType name="DigestValueType">
-  <restriction base="base64Binary"/>
-</simpleType>
-
-<!-- End SignedInfo -->
-
-<!-- Start KeyInfo -->
-
-<element name="KeyInfo" type="ds:KeyInfoType"/> 
-<complexType name="KeyInfoType" mixed="true">
-  <choice maxOccurs="unbounded">     
-    <element ref="ds:KeyName"/> 
-    <element ref="ds:KeyValue"/> 
-    <element ref="ds:RetrievalMethod"/> 
-    <element ref="ds:X509Data"/> 
-    <element ref="ds:PGPData"/> 
-    <element ref="ds:SPKIData"/>
-    <element ref="ds:MgmtData"/>
-    <any processContents="lax" namespace="##other"/>
-    <!-- (1,1) elements from (0,unbounded) namespaces -->
-  </choice>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="KeyName" type="string"/>
-  <element name="MgmtData" type="string"/>
-
-  <element name="KeyValue" type="ds:KeyValueType"/> 
-  <complexType name="KeyValueType" mixed="true">
-   <choice>
-     <element ref="ds:DSAKeyValue"/>
-     <element ref="ds:RSAKeyValue"/>
-     <any namespace="##other" processContents="lax"/>
-   </choice>
-  </complexType>
-
-  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
-  <complexType name="RetrievalMethodType">
-    <sequence>
-      <element ref="ds:Transforms" minOccurs="0"/> 
-    </sequence>  
-    <attribute name="URI" type="anyURI"/>
-    <attribute name="Type" type="anyURI" use="optional"/>
-  </complexType>
-
-<!-- Start X509Data -->
-
-<element name="X509Data" type="ds:X509DataType"/> 
-<complexType name="X509DataType">
-  <sequence maxOccurs="unbounded">
-    <choice>
-      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
-      <element name="X509SKI" type="base64Binary"/>
-      <element name="X509SubjectName" type="string"/>
-      <element name="X509Certificate" type="base64Binary"/>
-      <element name="X509CRL" type="base64Binary"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </sequence>
-</complexType>
-
-<complexType name="X509IssuerSerialType"> 
-  <sequence> 
-    <element name="X509IssuerName" type="string"/> 
-    <element name="X509SerialNumber" type="integer"/> 
-  </sequence>
-</complexType>
-
-<!-- End X509Data -->
-
-<!-- Begin PGPData -->
-
-<element name="PGPData" type="ds:PGPDataType"/> 
-<complexType name="PGPDataType"> 
-  <choice>
-    <sequence>
-      <element name="PGPKeyID" type="base64Binary"/> 
-      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-    <sequence>
-      <element name="PGPKeyPacket" type="base64Binary"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-  </choice>
-</complexType>
-
-<!-- End PGPData -->
-
-<!-- Begin SPKIData -->
-
-<element name="SPKIData" type="ds:SPKIDataType"/> 
-<complexType name="SPKIDataType">
-  <sequence maxOccurs="unbounded">
-    <element name="SPKISexp" type="base64Binary"/>
-    <any namespace="##other" processContents="lax" minOccurs="0"/>
-  </sequence>
-</complexType> 
-
-<!-- End SPKIData -->
-
-<!-- End KeyInfo -->
-
-<!-- Start Object (Manifest, SignatureProperty) -->
-
-<element name="Object" type="ds:ObjectType"/> 
-<complexType name="ObjectType" mixed="true">
-  <sequence minOccurs="0" maxOccurs="unbounded">
-    <any namespace="##any" processContents="lax"/>
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
-  <attribute name="Encoding" type="anyURI" use="optional"/> 
-</complexType>
-
-<element name="Manifest" type="ds:ManifestType"/> 
-<complexType name="ManifestType">
-  <sequence>
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
-<complexType name="SignaturePropertiesType">
-  <sequence>
-    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-   <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
-   <complexType name="SignaturePropertyType" mixed="true">
-     <choice maxOccurs="unbounded">
-       <any namespace="##other" processContents="lax"/>
-       <!-- (1,1) elements from (1,unbounded) namespaces -->
-     </choice>
-     <attribute name="Target" type="anyURI" use="required"/> 
-     <attribute name="Id" type="ID" use="optional"/> 
-   </complexType>
-
-<!-- End Object (Manifest, SignatureProperty) -->
-
-<!-- Start Algorithm Parameters -->
-
-<simpleType name="HMACOutputLengthType">
-  <restriction base="integer"/>
-</simpleType>
-
-<!-- Start KeyValue Element-types -->
-
-<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
-<complexType name="DSAKeyValueType">
-  <sequence>
-    <sequence minOccurs="0">
-      <element name="P" type="ds:CryptoBinary"/>
-      <element name="Q" type="ds:CryptoBinary"/>
-    </sequence>
-    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
-    <element name="Y" type="ds:CryptoBinary"/>
-    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
-    <sequence minOccurs="0">
-      <element name="Seed" type="ds:CryptoBinary"/>
-      <element name="PgenCounter" type="ds:CryptoBinary"/>
-    </sequence>
-  </sequence>
-</complexType>
-
-<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
-<complexType name="RSAKeyValueType">
-  <sequence>
-    <element name="Modulus" type="ds:CryptoBinary"/> 
-    <element name="Exponent" type="ds:CryptoBinary"/> 
-  </sequence>
-</complexType> 
-
-<!-- End KeyValue Element-types -->
-
-<!-- End Signature -->
-
-</schema>
diff --git a/xml/xmldsig11-schema.xsd b/xml/xmldsig11-schema.xsd
deleted file mode 100644
index f03643a3..00000000
--- a/xml/xmldsig11-schema.xsd
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-#
-# Copyright ©[2011] World Wide Web Consortium 
-# (Massachusetts Institute of Technology,  
-#  European Research Consortium for Informatics and Mathematics, 
-#  Keio University). All Rights Reserved.  
-# This work is distributed under the W3C® Software License [1] in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. 
-# [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-#
--->
-
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-        xmlns:dsig11="http://www.w3.org/2009/xmldsig11#"
-        targetNamespace="http://www.w3.org/2009/xmldsig11#"
-        version="0.1" elementFormDefault="qualified">
-
-  <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation='xmldsig-core-schema.xsd'/>
-
-  <element name="ECKeyValue" type="dsig11:ECKeyValueType"/>
-  <complexType name="ECKeyValueType">
-    <sequence>
-      <choice>
-        <element name="ECParameters" type="dsig11:ECParametersType"/>
-        <element name="NamedCurve" type="dsig11:NamedCurveType"/>
-      </choice>
-      <element name="PublicKey" type="dsig11:ECPointType"/>
-    </sequence>
-    <attribute name="Id" type="ID" use="optional"/>
-  </complexType>
-
-  <complexType name="NamedCurveType">
-    <attribute name="URI" type="anyURI" use="required"/>
-  </complexType>
-  
-  <simpleType name="ECPointType">
-    <restriction base="ds:CryptoBinary"/>
-  </simpleType>
-
-  <complexType name="ECParametersType">
-    <sequence>
-      <element name="FieldID" type="dsig11:FieldIDType"/>
-      <element name="Curve" type="dsig11:CurveType"/>
-      <element name="Base" type="dsig11:ECPointType"/>
-      <element name="Order" type="ds:CryptoBinary"/>
-      <element name="CoFactor" type="integer" minOccurs="0"/>
-      <element name="ValidationData"
-               type="dsig11:ECValidationDataType" minOccurs="0"/>
-    </sequence>
-  </complexType>
-  
-  <complexType name="FieldIDType">
-    <choice>
-      <element ref="dsig11:Prime"/>
-      <element ref="dsig11:TnB"/>
-      <element ref="dsig11:PnB"/>
-      <element ref="dsig11:GnB"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </complexType>
-
-  <complexType name="CurveType">
-    <sequence>
-      <element name="A" type="ds:CryptoBinary"/>
-      <element name="B" type="ds:CryptoBinary"/>
-    </sequence>
-  </complexType>
-
-  <complexType name="ECValidationDataType">
-    <sequence>
-      <element name="seed" type="ds:CryptoBinary"/>
-    </sequence>
-    <attribute name="hashAlgorithm" type="anyURI" use="required"/>
-  </complexType>
-
-  <element name="Prime" type="dsig11:PrimeFieldParamsType"/>
-  <complexType name="PrimeFieldParamsType">
-    <sequence>
-      <element name="P" type="ds:CryptoBinary"/>
-    </sequence>
-  </complexType>
-
-  <element name="GnB" type="dsig11:CharTwoFieldParamsType"/>
-  <complexType name="CharTwoFieldParamsType">
-    <sequence>
-      <element name="M" type="positiveInteger"/>
-    </sequence>
-  </complexType>
-  
-  <element name="TnB" type="dsig11:TnBFieldParamsType"/>
-  <complexType name="TnBFieldParamsType">
-    <complexContent>
-      <extension base="dsig11:CharTwoFieldParamsType">
-        <sequence>
-          <element name="K" type="positiveInteger"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-
-  <element name="PnB" type="dsig11:PnBFieldParamsType"/>
-  <complexType name="PnBFieldParamsType">
-    <complexContent>
-      <extension base="dsig11:CharTwoFieldParamsType">
-        <sequence>
-          <element name="K1" type="positiveInteger"/>
-          <element name="K2" type="positiveInteger"/>
-          <element name="K3" type="positiveInteger"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-
-  <element name="DEREncodedKeyValue" type="dsig11:DEREncodedKeyValueType"/>
-  <complexType name="DEREncodedKeyValueType">
-    <simpleContent>
-      <extension base="base64Binary">
-        <attribute name="Id" type="ID" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <element name="KeyInfoReference" type="dsig11:KeyInfoReferenceType"/> 
-  <complexType name="KeyInfoReferenceType">
-    <attribute name="URI" type="anyURI" use="required"/>
-    <attribute name="Id" type="ID" use="optional"/>
-  </complexType>
-
-  <element name="X509Digest" type="dsig11:X509DigestType"/>
-  <complexType name="X509DigestType">
-    <simpleContent>
-      <extension base="base64Binary">
-        <attribute name="Algorithm" type="anyURI" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-</schema>
-