diff --git a/build/uk_master_back.xsl b/build/uk_master_back.xsl
index 295ff2b7..5731da6a 100644
--- a/build/uk_master_back.xsl
+++ b/build/uk_master_back.xsl
@@ -14,11 +14,10 @@
 
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:exsl="http://exslt.org/common"
diff --git a/build/uk_master_export.xsl b/build/uk_master_export.xsl
index a0a21bfc..4feb6dbe 100644
--- a/build/uk_master_export.xsl
+++ b/build/uk_master_export.xsl
@@ -12,16 +12,9 @@
 
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
-	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:exsl="http://exslt.org/common"
@@ -194,10 +187,6 @@
 		<xsl:copy/>
 	</xsl:template>
 	
-	<xsl:template match="shibmd:KeyAuthority//comment()">
-		<xsl:copy/>
-	</xsl:template>
-	
 	<!--
 		Strip all other comments.
 	-->
diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index 4cea8279..a463ec5d 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -13,16 +13,10 @@
 
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
-	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:exsl="http://exslt.org/common"
diff --git a/build/uk_master_unsigned.xsl b/build/uk_master_unsigned.xsl
index 45cd1f8f..a8e26287 100644
--- a/build/uk_master_unsigned.xsl
+++ b/build/uk_master_unsigned.xsl
@@ -10,16 +10,10 @@
 
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
-	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:exsl="http://exslt.org/common"