From a6155f948e008056b2de3d92577817102a7054b3 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 2 May 2017 14:08:06 +0100
Subject: [PATCH] Abolish WAYF namespace

See ukf/ukf-meta#71.
---
 attic/extract_entityids.xsl       |  3 +-
 build/extract_addresses.xsl       |  3 +-
 build/extract_locs.xsl            |  3 +-
 build/extract_nk_nocert_locs.xsl  |  3 +-
 build/extract_nocert_locs.xsl     |  3 +-
 mdx/_rules/check_future_0.xsl     |  1 -
 mdx/_rules/check_future_1.xsl     |  1 -
 mdx/_rules/check_future_2.xsl     |  1 -
 mdx/_rules/check_future_3.xsl     |  1 -
 mdx/_rules/check_future_4.xsl     |  1 -
 mdx/_rules/check_namespaces.xsl   |  5 ----
 mdx/_rules/check_uk_wayf.xsl      | 46 -------------------------------
 mdx/common-beans.xml              | 14 ----------
 mdx/ns_norm.xsl                   |  7 -----
 mdx/schema/uk-wayf.xsd            | 39 --------------------------
 mdx/uk/beans.xml                  | 25 -----------------
 mdx/uk/generate.xml               |  6 ----
 mdx/uk/import.xsl                 |  1 -
 mdx/uk/ns_norm_back.xsl           |  3 +-
 mdx/uk/ns_norm_cds.xsl            |  3 +-
 mdx/uk/ns_norm_export.xsl         |  3 +-
 mdx/uk/ns_norm_export_preview.xsl |  3 +-
 mdx/uk/ns_norm_fragment.xsl       |  1 -
 mdx/uk/ns_norm_test.xsl           |  3 +-
 mdx/uk/ns_norm_uk.xsl             |  3 +-
 mdx/uk/sp_mdui_test.xsl           |  3 +-
 mdx/validation-beans.xml          |  7 -----
 utilities/normalise_fragment      |  2 --
 28 files changed, 12 insertions(+), 182 deletions(-)
 delete mode 100644 mdx/_rules/check_uk_wayf.xsl
 delete mode 100644 mdx/schema/uk-wayf.xsd

diff --git a/attic/extract_entityids.xsl b/attic/extract_entityids.xsl
index dc915ee3..95de7af2 100644
--- a/attic/extract_entityids.xsl
+++ b/attic/extract_entityids.xsl
@@ -14,8 +14,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="md ds wayf">
+	exclude-result-prefixes="md ds">
 
 	<!-- Output is plain text -->
 	<xsl:output method="text"/>
diff --git a/build/extract_addresses.xsl b/build/extract_addresses.xsl
index 24bcf16a..8a0415ba 100644
--- a/build/extract_addresses.xsl
+++ b/build/extract_addresses.xsl
@@ -15,8 +15,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="md ds wayf">
+	exclude-result-prefixes="md ds">
 
 	<!--Force UTF-8 encoding for the output.-->
 	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
diff --git a/build/extract_locs.xsl b/build/extract_locs.xsl
index db55917b..b5411589 100644
--- a/build/extract_locs.xsl
+++ b/build/extract_locs.xsl
@@ -14,8 +14,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="md ds wayf">
+	exclude-result-prefixes="md ds">
 
 	<!-- Output is plain text -->
 	<xsl:output method="text"/>
diff --git a/build/extract_nk_nocert_locs.xsl b/build/extract_nk_nocert_locs.xsl
index fae05589..bd038a08 100644
--- a/build/extract_nk_nocert_locs.xsl
+++ b/build/extract_nk_nocert_locs.xsl
@@ -15,8 +15,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="md ds wayf">
+	exclude-result-prefixes="md ds">
 
 	<!-- Output is plain text -->
 	<xsl:output method="text"/>
diff --git a/build/extract_nocert_locs.xsl b/build/extract_nocert_locs.xsl
index 335e0fc7..a67c1f1c 100644
--- a/build/extract_nocert_locs.xsl
+++ b/build/extract_nocert_locs.xsl
@@ -15,8 +15,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="md ds wayf">
+	exclude-result-prefixes="md ds">
 
 	<!-- Output is plain text -->
 	<xsl:output method="text"/>
diff --git a/mdx/_rules/check_future_0.xsl b/mdx/_rules/check_future_0.xsl
index f503721c..7604ebd8 100644
--- a/mdx/_rules/check_future_0.xsl
+++ b/mdx/_rules/check_future_0.xsl
@@ -17,7 +17,6 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:set="http://exslt.org/sets"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 
diff --git a/mdx/_rules/check_future_1.xsl b/mdx/_rules/check_future_1.xsl
index fef00c40..5ef23c5d 100644
--- a/mdx/_rules/check_future_1.xsl
+++ b/mdx/_rules/check_future_1.xsl
@@ -17,7 +17,6 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:set="http://exslt.org/sets"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 
diff --git a/mdx/_rules/check_future_2.xsl b/mdx/_rules/check_future_2.xsl
index c944e5b4..0226d724 100644
--- a/mdx/_rules/check_future_2.xsl
+++ b/mdx/_rules/check_future_2.xsl
@@ -17,7 +17,6 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:set="http://exslt.org/sets"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 
diff --git a/mdx/_rules/check_future_3.xsl b/mdx/_rules/check_future_3.xsl
index f0e655b9..4b83d777 100644
--- a/mdx/_rules/check_future_3.xsl
+++ b/mdx/_rules/check_future_3.xsl
@@ -17,7 +17,6 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:set="http://exslt.org/sets"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 
diff --git a/mdx/_rules/check_future_4.xsl b/mdx/_rules/check_future_4.xsl
index 7c8ae169..11cfa927 100644
--- a/mdx/_rules/check_future_4.xsl
+++ b/mdx/_rules/check_future_4.xsl
@@ -17,7 +17,6 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:set="http://exslt.org/sets"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 
diff --git a/mdx/_rules/check_namespaces.xsl b/mdx/_rules/check_namespaces.xsl
index 315d39ca..2bb9f7fa 100644
--- a/mdx/_rules/check_namespaces.xsl
+++ b/mdx/_rules/check_namespaces.xsl
@@ -22,7 +22,6 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 	
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -86,10 +85,6 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 	
-	<xsl:template match="wayf:*">
-		<xsl:apply-templates/>
-	</xsl:template>
-	
 	<xsl:template match="xenc:*">
 		<xsl:apply-templates/>
 	</xsl:template>
diff --git a/mdx/_rules/check_uk_wayf.xsl b/mdx/_rules/check_uk_wayf.xsl
deleted file mode 100644
index c2e443cd..00000000
--- a/mdx/_rules/check_uk_wayf.xsl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	check_uk_wayf.xsl
-	
-	Checking ruleset for the SDSS/UK federation WAYF namespace.
-	
-	Author: Ian A. Young <ian@iay.org.uk>
-
--->
-<xsl:stylesheet version="1.0"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-
-	<!--
-		Common support functions.
-	-->
-	<xsl:import href="check_framework.xsl"/>
-
-	<!--
-		Check for misspelled elements.
-		
-		This covers the case where elements from this namespace are used in a context
-		where lax validation applies.
-	-->
-	<xsl:template match="wayf:*[local-name()!='HideFromWAYF']">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">
-				<xsl:text>unknown element name wayf:</xsl:text>
-				<xsl:value-of select="local-name()"/>
-			</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
-
-	<!--
-		Check for misplaced HideFromWAYF elements.
-	-->
-	<xsl:template match="wayf:HideFromWAYF[not(parent::md:Extensions) or not(parent::*/parent::md:EntityDescriptor)]">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">misplaced wayf:HideFromWAYF element</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index ea4e9541..40a4fe49 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -170,7 +170,6 @@
     <bean id="samlp_namespace"      parent="String" c:_="urn:oasis:names:tc:SAML:2.0:protocol"/>
     <bean id="shibmd_namespace"     parent="String" c:_="urn:mace:shibboleth:metadata:1.0"/>
     <bean id="ukfedlabel_namespace" parent="String" c:_="http://ukfederation.org.uk/2006/11/label"/>
-    <bean id="wayf_namespace"       parent="String" c:_="http://sdss.ac.uk/2006/06/WAYF"/>
     <bean id="xenc_namespace"       parent="String" c:_="http://www.w3.org/2001/04/xmlenc#"/>
     <bean id="xenc11_namespace"     parent="String" c:_="http://www.w3.org/2009/xmlenc11#"/>
     <bean id="xml_namespace"        parent="String" c:_="http://www.w3.org/XML/1998/namespace"/>
@@ -203,7 +202,6 @@
                 <entry key="samlp"      value-ref="samlp_namespace"/>
                 <entry key="shibmd"     value-ref="shibmd_namespace"/>
                 <entry key="ukfedlabel" value-ref="ukfedlabel_namespace"/>
-                <entry key="wayf"       value-ref="wayf_namespace"/>
                 <entry key="xenc"       value-ref="xenc_namespace"/>
                 <entry key="xenc11"     value-ref="xenc11_namespace"/>
                 <entry key="xs"         value-ref="xs_namespace"/>
@@ -261,14 +259,6 @@
     <bean id="stripUkfedlabelNamespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="ukfedlabel_namespace"/>
     
-    <!--
-        stripWayfNamespace
-        
-        Remove the UK federation WAYF namespace.
-    -->
-    <bean id="stripWayfNamespace" parent="mda.NamespaceStrippingStage"
-        p:namespace-ref="wayf_namespace"/>
-    
     <!--
         normaliseNamespaces
         
@@ -857,10 +847,6 @@
             <!-- no imports -->
             <constructor-arg value="schema/uk-fed-label.xsd"/>
         </bean>
-        <bean parent="ClassPathResource">
-            <!-- no imports -->
-            <constructor-arg value="schema/uk-wayf.xsd"/>
-        </bean>
         <bean parent="ClassPathResource">
             <!-- imports xenc-schema.xsd -->
             <constructor-arg value="schema/ws-authorization.xsd"/>
diff --git a/mdx/ns_norm.xsl b/mdx/ns_norm.xsl
index 2c907602..78ab442c 100644
--- a/mdx/ns_norm.xsl
+++ b/mdx/ns_norm.xsl
@@ -45,7 +45,6 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 	
 	exclude-result-prefixes="md"
@@ -179,12 +178,6 @@
 			<xsl:apply-templates select="node()|@*"/>
 		</xsl:element>
 	</xsl:template>
-	
-	<xsl:template match="wayf:*">
-		<xsl:element name="wayf:{local-name()}">
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:element>
-	</xsl:template>
 
 	<xsl:template match="xenc:*">
 		<xsl:element name="xenc:{local-name()}">
diff --git a/mdx/schema/uk-wayf.xsd b/mdx/schema/uk-wayf.xsd
deleted file mode 100644
index 1139a62c..00000000
--- a/mdx/schema/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/mdx/uk/beans.xml b/mdx/uk/beans.xml
index a1a450b0..8bfa1255 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -284,31 +284,6 @@
                 <ref bean="uk_default_regauth"/>
                 <ref bean="populateRegistrationAuthorities"/>
                 
-                <!--
-                    Add REFEDS Hide from Discovery category as a standardised
-                    equivalent to our HideFromWAYF element.
-                -->
-                <bean id="uk_addHideFromDiscovery" parent="mda.SplitMergeStage">
-                    <!-- select entities with HideFromWayf label -->
-                    <property name="selectionStrategy">
-                        <bean parent="mda.XPathItemSelectionStrategy">
-                            <constructor-arg value="/md:EntityDescriptor[md:Extensions/wayf:HideFromWAYF]"/>
-                            <constructor-arg ref="commonNamespaces"/>
-                        </bean>
-                    </property>
-                    
-                    <property name="selectedItemPipeline">
-                        <bean id="selectedItemPipeline" parent="mda.SimplePipeline">
-                            <property name="stages">
-                                <bean id="addHideFromDiscovery" parent="ukf.EntityAttributeAddingStage"
-                                    p:attributeValue="http://refeds.org/category/hide-from-discovery"
-                                    p:addingFirstChild="true"/>
-                            </property>
-                        </bean>
-                    </property>
-
-                </bean>
-                
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_std"/>
                 <bean id="check_ukfedlabel" parent="mda.XSLValidationStage"
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index defd00f4..528cf9a0 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -269,7 +269,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="stripWayfNamespace"/>
                 <ref bean="uk_finaliseProduction"/>
                 <ref bean="uk_normaliseNamespaces"/>
                 
@@ -376,7 +375,6 @@
                 <ref bean="stripMdattrNamespace"/>
                 <ref bean="stripMdrpiNamespace"/>
                 <ref bean="stripUkfedlabelNamespace"/>
-                <ref bean="stripWayfNamespace"/>
                 
                 <ref bean="stripArtifactResolutionService"/>
                 <ref bean="stripAttributeAuthorityDescriptor"/>
@@ -508,7 +506,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="stripWayfNamespace"/>
                 <ref bean="stripEmptyExtensions"/>
                 <ref bean="uk_finaliseFallback"/>
                 <ref bean="uk_normaliseFallback"/>
@@ -561,7 +558,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="stripWayfNamespace"/>
                 <ref bean="uk_finaliseTest"/>
                 <ref bean="uk_normaliseTest"/>
                 
@@ -683,7 +679,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="stripUkfedlabelNamespace"/>
-                <ref bean="stripWayfNamespace"/>
                 <ref bean="uk_assemble"/>
                 <ref bean="stripEntityScopes"/>
                 <ref bean="stripEmptyExtensions"/>
@@ -799,7 +794,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="stripUkfedlabelNamespace"/>
-                <ref bean="stripWayfNamespace"/>
                 <ref bean="uk_assemble"/>
                 <ref bean="stripEntityScopes"/>
                 <ref bean="stripEmptyExtensions"/>
diff --git a/mdx/uk/import.xsl b/mdx/uk/import.xsl
index c413f8c6..900cd105 100644
--- a/mdx/uk/import.xsl
+++ b/mdx/uk/import.xsl
@@ -75,7 +75,6 @@
             urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd
             http://ukfederation.org.uk/2006/11/label uk-fed-label.xsd
             http://refeds.org/metadata refeds-metadata.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">
diff --git a/mdx/uk/ns_norm_back.xsl b/mdx/uk/ns_norm_back.xsl
index 0d2402c2..e59ac8ce 100644
--- a/mdx/uk/ns_norm_back.xsl
+++ b/mdx/uk/ns_norm_back.xsl
@@ -37,11 +37,10 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 	
-	exclude-result-prefixes="alg md wayf xenc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	exclude-result-prefixes="alg md xenc"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
diff --git a/mdx/uk/ns_norm_cds.xsl b/mdx/uk/ns_norm_cds.xsl
index 718dba73..3eac4726 100644
--- a/mdx/uk/ns_norm_cds.xsl
+++ b/mdx/uk/ns_norm_cds.xsl
@@ -20,9 +20,8 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
-	exclude-result-prefixes="alg ds init md mdattr saml shibmd ukfedlabel wayf xsi"
+	exclude-result-prefixes="alg ds init md mdattr saml shibmd ukfedlabel xsi"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
diff --git a/mdx/uk/ns_norm_export.xsl b/mdx/uk/ns_norm_export.xsl
index 0d2b762f..4ee1d693 100644
--- a/mdx/uk/ns_norm_export.xsl
+++ b/mdx/uk/ns_norm_export.xsl
@@ -31,10 +31,9 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 	
-	exclude-result-prefixes="alg md ukfedlabel wayf xenc"
+	exclude-result-prefixes="alg md ukfedlabel xenc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
diff --git a/mdx/uk/ns_norm_export_preview.xsl b/mdx/uk/ns_norm_export_preview.xsl
index cb79a27c..6bbe0cb8 100644
--- a/mdx/uk/ns_norm_export_preview.xsl
+++ b/mdx/uk/ns_norm_export_preview.xsl
@@ -31,10 +31,9 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 	
-	exclude-result-prefixes="alg md ukfedlabel wayf xenc"
+	exclude-result-prefixes="alg md ukfedlabel xenc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
diff --git a/mdx/uk/ns_norm_fragment.xsl b/mdx/uk/ns_norm_fragment.xsl
index 9d58ec58..e7cab1d4 100644
--- a/mdx/uk/ns_norm_fragment.xsl
+++ b/mdx/uk/ns_norm_fragment.xsl
@@ -26,7 +26,6 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
 	exclude-result-prefixes="md"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/uk/ns_norm_test.xsl b/mdx/uk/ns_norm_test.xsl
index b05bf888..71fdaee4 100644
--- a/mdx/uk/ns_norm_test.xsl
+++ b/mdx/uk/ns_norm_test.xsl
@@ -37,10 +37,9 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 	
-	exclude-result-prefixes="alg md wayf xenc"
+	exclude-result-prefixes="alg md xenc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl
index 20930f67..8e5bf095 100644
--- a/mdx/uk/ns_norm_uk.xsl
+++ b/mdx/uk/ns_norm_uk.xsl
@@ -37,10 +37,9 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 	
-	exclude-result-prefixes="alg md wayf xenc"
+	exclude-result-prefixes="alg md xenc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
diff --git a/mdx/uk/sp_mdui_test.xsl b/mdx/uk/sp_mdui_test.xsl
index b1e2a0e1..f23e6816 100644
--- a/mdx/uk/sp_mdui_test.xsl
+++ b/mdx/uk/sp_mdui_test.xsl
@@ -16,13 +16,12 @@
     xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:members="http://ukfederation.org.uk/2007/01/members"
-    xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
     xmlns:math="http://exslt.org/math"
     xmlns:date="http://exslt.org/dates-and-times"
     xmlns:dyn="http://exslt.org/dynamic"
     xmlns:set="http://exslt.org/sets"
     xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-    exclude-result-prefixes="xsl ds md mdui xsi members wayf math date dyn set idpdisc"
+    exclude-result-prefixes="xsl ds md mdui xsi members math date dyn set idpdisc"
     version="1.0">
 
     <xsl:output method="html" omit-xml-declaration="yes"/>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 247156e6..cd4f5786 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -368,12 +368,6 @@
     -->
     <bean id="check_uk_trust" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_uk_trust.xsl"/>
-    
-    <!--
-        check_uk_wayf
-    -->
-    <bean id="check_uk_wayf" parent="mda.XSLValidationStage"
-        p:XSLResource="classpath:_rules/check_uk_wayf.xsl"/>
 
 
     <!--
@@ -670,7 +664,6 @@
                 <ref bean="check_sp_tls"/>
                 <ref bean="check_uk_algorithms"/>
                 <ref bean="check_uk_trust"/>
-                <ref bean="check_uk_wayf"/>
             </list>
         </property>
     </bean>
diff --git a/utilities/normalise_fragment b/utilities/normalise_fragment
index a5cc93ac..9e7231ac 100755
--- a/utilities/normalise_fragment
+++ b/utilities/normalise_fragment
@@ -55,7 +55,6 @@ ED_TEMPLATE = Template('''<?xml version="1.0" encoding="UTF-8"?>
     xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
     xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-    xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     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
@@ -68,7 +67,6 @@ ED_TEMPLATE = Template('''<?xml version="1.0" encoding="UTF-8"?>
         urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd
         http://ukfederation.org.uk/2006/11/label uk-fed-label.xsd
         http://refeds.org/metadata refeds-metadata.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"