Removed non-resolvable Sunet hosts

6 files changed, 0 insertions, 378 deletions

diff --git a/swamid-2.0/coip-test.sunet.se-shibboleth.xml b/swamid-2.0/coip-test.sunet.se-shibboleth.xml
deleted file mode 100644
index 06f7bfe2..00000000
--- a/swamid-2.0/coip-test.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://coip-test.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://coip-test.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>coip-test.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=coip-test.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAMJwrBkmzHKJMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmNvaXAtdGVzdC5zdW5ldC5zZTAeFw0xMDEyMDcwOTM0NTFaFw0yMDEyMDQw
-OTM0NTFaMB0xGzAZBgNVBAMTEmNvaXAtdGVzdC5zdW5ldC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMR4JETtaGG+7n5+NksVT/7LnmveeNwbGuPS
-CyW1GY+7yYBwjMnnsFnnprl2curgER/HeOXf3bBxnoxbSVFdaZILPRVStLngzhYJ
-7qGOGWHWdukDDzgCDfdOVEOwLAiV4TXhCoKzaRKaUV63Ul9pEG2ogkQHlsW7zTmX
-4DJNdpBgmB/ohjuAceY3xUrKj9TBZf9KPKYE1D8xoig5qCUhWUqWrltxBBbNubsa
-UIXun9Hf1zemgViLuPI2s5/RD5uY3x6FpkXeNGRHvPT7+LnKrPNi4g41m1FZ+wvj
-xPkNVXBLJgEIsHtYTKvY8dXaA+k1xyFvqjWf1RjuG8TYIlvHoDkCAwEAAaNAMD4w
-HQYDVR0RBBYwFIISY29pcC10ZXN0LnN1bmV0LnNlMB0GA1UdDgQWBBR/jp1zUgjw
-rKZimB05qmprVJvYEDANBgkqhkiG9w0BAQUFAAOCAQEAeAYegf9tMG2Lg7AW2tIq
-5bTbaMwRzLtFkB1KZrh17RUSneiF1FrRD5Qo4O1/rh0PrxO9+R1M9VpYXrcEg48u
-TLOo7EEaJaF7+Eh9Z/UaJjY5zL6hhQSW+nxHHtluuIRCJwH26oF04v9Ty9TC+4Ax
-g6NuvysrzRWhdeWh4voY1lBi1po+/MqUWufXS/uxrHBT9XNSb6dvqWTvUEe09Sj9
-UTHOU967H8PfFKB6w8/lIqCd66P3PnZrNQVmfbjDkrASkmvhUKEMc//Nn/+MS02T
-uXfFMclNeY0vwkDmtQCDB2o8DGQS8H3hpXb2MmJtFgu/81yZRqX/0uRC3kGBQXyd
-cA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>coip-test.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=coip-test.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAMJwrBkmzHKJMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmNvaXAtdGVzdC5zdW5ldC5zZTAeFw0xMDEyMDcwOTM0NTFaFw0yMDEyMDQw
-OTM0NTFaMB0xGzAZBgNVBAMTEmNvaXAtdGVzdC5zdW5ldC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMR4JETtaGG+7n5+NksVT/7LnmveeNwbGuPS
-CyW1GY+7yYBwjMnnsFnnprl2curgER/HeOXf3bBxnoxbSVFdaZILPRVStLngzhYJ
-7qGOGWHWdukDDzgCDfdOVEOwLAiV4TXhCoKzaRKaUV63Ul9pEG2ogkQHlsW7zTmX
-4DJNdpBgmB/ohjuAceY3xUrKj9TBZf9KPKYE1D8xoig5qCUhWUqWrltxBBbNubsa
-UIXun9Hf1zemgViLuPI2s5/RD5uY3x6FpkXeNGRHvPT7+LnKrPNi4g41m1FZ+wvj
-xPkNVXBLJgEIsHtYTKvY8dXaA+k1xyFvqjWf1RjuG8TYIlvHoDkCAwEAAaNAMD4w
-HQYDVR0RBBYwFIISY29pcC10ZXN0LnN1bmV0LnNlMB0GA1UdDgQWBBR/jp1zUgjw
-rKZimB05qmprVJvYEDANBgkqhkiG9w0BAQUFAAOCAQEAeAYegf9tMG2Lg7AW2tIq
-5bTbaMwRzLtFkB1KZrh17RUSneiF1FrRD5Qo4O1/rh0PrxO9+R1M9VpYXrcEg48u
-TLOo7EEaJaF7+Eh9Z/UaJjY5zL6hhQSW+nxHHtluuIRCJwH26oF04v9Ty9TC+4Ax
-g6NuvysrzRWhdeWh4voY1lBi1po+/MqUWufXS/uxrHBT9XNSb6dvqWTvUEe09Sj9
-UTHOU967H8PfFKB6w8/lIqCd66P3PnZrNQVmfbjDkrASkmvhUKEMc//Nn/+MS02T
-uXfFMclNeY0vwkDmtQCDB2o8DGQS8H3hpXb2MmJtFgu/81yZRqX/0uRC3kGBQXyd
-cA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coip-test.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coip-test.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coip-test.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coip-test.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coip-test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coip-test.sunet.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coip-test.sunet.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coip-test.sunet.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coip-test.sunet.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coip-test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://coip-test.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coip-test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://coip-test.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://coip-test.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://coip-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml b/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml
deleted file mode 100644
index e1b58fd7..00000000
--- a/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://grr.cert.sunet.se:8443/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-12-01T16:03:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SUNET GRR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET GRR</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">GRR tjänst hos SUNET</mdui:Description>
-        <mdui:Description xml:lang="en">GRR service run by SUNET</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>grr.cert.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=grr.cert.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAL/AhZwDvMkMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWdyci5jZXJ0LnN1bmV0LnNlMB4XDTE3MTIwMTEzNDQwMloXDTI3MTEyOTEz
-NDQwMlowHDEaMBgGA1UEAxMRZ3JyLmNlcnQuc3VuZXQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDGPDNAwMfhpYhpCiUJjaD8rCUZkO/2kYcxP3m1
-GhS4gorDnaciWmiXmL1tXI/vCPgwbnnwuLr2fiBJBAcZCzKtQYgQAx1pD/cfhysf
-KbyWbH8kFZVRAf6r6CmaT1HdyszX10VoXZFqSED/LkvUbQFzkbEIrTjh0v2wN0Za
-qWpbQzBIPrEx3Pj2tpkZ37cezVAjkSCWcSZpBtvae2x5Rr6UVAhj2gIBZQ+oiyE8
-n3cA1q2fvb40vDMOt3lNAUcC/FVFWpwEaZUyVnHFCcffuOQmIxUcViSOm15LJVg8
-eCtYgTLifKRrRZfJZFEMGA6w+rgAkbX8uuaGVvCQjJRPhIwFAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEWdyci5jZXJ0LnN1bmV0LnNlMB0GA1UdDgQWBBRPAQWwuIPlxepF
-jkRveeZps7yciTANBgkqhkiG9w0BAQUFAAOCAQEAvZZ/X3IFO/JmtAI3ZGlUTV5L
-Z0U0eVXDbeTJQPM0+amTH4YQtkCYakUabDEw2bo2PHtEPkxV+VbzfPXsTCJRuuNI
-5ndF9odGlqMxE722/u5nSygVRqzXSx3dNlqf2F/K7eGYucmiwyJwQ/AOmGTmEoe7
-hztMPTqLCulCJhkwz3Gkj2dM0o1fO3gEc5PYfs2t5iGni+oJQYP9tNSinzk5QVE8
-mdrZOulcm4PbeG2aIPXAsqvnL8Z7OiQugAoUA7KJzW7GC3q7dyZ+2CtTOlCZKfJc
-U2CMeWihvrXOFYyKBmlMNt78NqegrleUURtdyMWCMuiU6sMdPbT0g3vrgnOV9w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mds-test.sunet.se-shibboleth.xml b/swamid-2.0/mds-test.sunet.se-shibboleth.xml
deleted file mode 100644
index 92a7a322..00000000
--- a/swamid-2.0/mds-test.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mds-test.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mds-test.sunet.se/Shibboleth.sso/DS/ds.sunet.se"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mds-test.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>mds-test.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mds-test.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAM5Yhbpd3TmcMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW1kcy10ZXN0LnN1bmV0LnNlMB4XDTExMTExNzE0NTUyMVoXDTIxMTExNDE0
-NTUyMVowHDEaMBgGA1UEAxMRbWRzLXRlc3Quc3VuZXQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDCqEcLC0Zdpy/RH2bhjc149216gnMdiz1q8agv
-eZNbww+9f6DNvQzevyr1U7nnKzY3mZRsMoLXCbgYSfe7d7GXv/fRyx3Nx9g1sG5F
-C3ydosS2/1aWWLwMjFRYr/QIqTZa7ihWLQhetJ+dObCGPO43PmIC0fIvBUJ/KX7B
-DJXNKbA+PR2Xyiavv153DoT46/KVsPIgkCMlMTltLUB5030Bm3IwMs+sHFhnVx8Y
-TZ7phNR7kGrgmody+YIvoAz4vtuuvlPHO8l0d3HTO4M9Z4H7OufTN6ivxdPIcfsn
-z0baiuQpWziayeeAHrLwC09RS3FMFeadR5ZTcDW0eY0ralsNAgMBAAGjUjBQMC8G
-A1UdEQQoMCaCEW1kcy10ZXN0LnN1bmV0LnNlhhFtZHMtdGVzdC5zdW5ldC5zZTAd
-BgNVHQ4EFgQUokBRRHpa+5pznLea5K03GSgBG80wDQYJKoZIhvcNAQEFBQADggEB
-AAEucvMd1uSQnSDcMkd9jVS9rtTy9R32Zik2OWjYzW6HbM2/8jU7XFscqlgmunuA
-0+k3i9BtmSc+SbI3n3QejeUleINWah19CJ+VdKUJGN9GKiGPaK3EGz8OLqhXHIpN
-HGCYy1/df0OtdqptbrRiVMlqXIBJhLmenczTb9fw6ercngudu3ftIu2/+85ZER3p
-otlxWXhbXhBVUmi89hDXmtUL4ulDy3Ufx1zAtuxf5CWTmMQukSSSg2m+QYraFyPL
-ZNCOgNyiOFcrqr9kcDc2fsyVUlAKmm/sG2P+mCEj/zRhLCpUWbG2vg3r84H3lNKv
-VtHMCV6pEmWvRxvRGMxUfw8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds-test.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds-test.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds-test.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds-test.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds-test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds-test.sunet.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds-test.sunet.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds-test.sunet.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds-test.sunet.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mds.sunet.se-shibboleth.xml b/swamid-2.0/mds.sunet.se-shibboleth.xml
deleted file mode 100644
index c2c68abd..00000000
--- a/swamid-2.0/mds.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mds.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mds.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>mds.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mds.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+TCCAeGgAwIBAgIJAOvVefVlKf4tMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDG1kcy5zdW5ldC5zZTAeFw0xMTEwMDMwOTIwMDRaFw0yMTA5MzAwOTIwMDRa
-MBcxFTATBgNVBAMTDG1kcy5zdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMM1mRFzygysIo9Qw7XabyoIe0nbATiS428GJ2oB3PSDLjmnf1CI
-kXwSBogHyAvdmQF04QCxeGki39cib/hTsxEbA14iGc/uyEbs4tFMgPvSPh3t8Uos
-1a8iHngnjpA0VuBH7VP3w0nCvj1eV5EobHKVk0NLgtXDgl87w6COPEre/5QN9IBf
-0/M7uO7zueXhpAzyO2+u+tZN2uacy5L2KTdiFxvFHAjaEjMnlVzbD7wehALIXNBg
-xtHUSITj2nwTjq7X/3sQbrusYL9DrW7RKLzzLSuHxRr4Dz+PESOjZUxBjTcwE4uJ
-2fmPuHfCtsxXHUnm7Ap3Df5I1exmSjc3inkCAwEAAaNIMEYwJQYDVR0RBB4wHIIM
-bWRzLnN1bmV0LnNlhgxtZHMuc3VuZXQuc2UwHQYDVR0OBBYEFB+CPP645D+t0FSk
-/40HaWtGmOP6MA0GCSqGSIb3DQEBBQUAA4IBAQAz/rf6fDHJU8Dp6hahHkVNRWRu
-cdVruda7guUIJ6MQWgl1N9Twfm2OvUSaM5fPtsqfoYTkv4ThVs8vGYyw+Y2oAnBa
-XKvUeP6S6et7cKQZCtpi9UgK8s1dHK7oqJaluW9tGes1Mcer/qKFdYunLlXYi8PA
-PRgEOb2hquFNE5V+0vXeiVqo/fAhlHxZ5jJbSQ2RnnN7ycVCQDZZlaEYPrGpaZVS
-9gYHwnECD5EPl8QsVymK2Co28pXAwpdo4btmWAeDhmy+8yOMjoS+T3k+/wiEmLLp
-dnjCadQzQamnqs4mfuypLT2wWWjkat9QKAM9gHkMwcC1Uv2RM2QeR8FDySJX
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>mds.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mds.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+TCCAeGgAwIBAgIJAOvVefVlKf4tMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDG1kcy5zdW5ldC5zZTAeFw0xMTEwMDMwOTIwMDRaFw0yMTA5MzAwOTIwMDRa
-MBcxFTATBgNVBAMTDG1kcy5zdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMM1mRFzygysIo9Qw7XabyoIe0nbATiS428GJ2oB3PSDLjmnf1CI
-kXwSBogHyAvdmQF04QCxeGki39cib/hTsxEbA14iGc/uyEbs4tFMgPvSPh3t8Uos
-1a8iHngnjpA0VuBH7VP3w0nCvj1eV5EobHKVk0NLgtXDgl87w6COPEre/5QN9IBf
-0/M7uO7zueXhpAzyO2+u+tZN2uacy5L2KTdiFxvFHAjaEjMnlVzbD7wehALIXNBg
-xtHUSITj2nwTjq7X/3sQbrusYL9DrW7RKLzzLSuHxRr4Dz+PESOjZUxBjTcwE4uJ
-2fmPuHfCtsxXHUnm7Ap3Df5I1exmSjc3inkCAwEAAaNIMEYwJQYDVR0RBB4wHIIM
-bWRzLnN1bmV0LnNlhgxtZHMuc3VuZXQuc2UwHQYDVR0OBBYEFB+CPP645D+t0FSk
-/40HaWtGmOP6MA0GCSqGSIb3DQEBBQUAA4IBAQAz/rf6fDHJU8Dp6hahHkVNRWRu
-cdVruda7guUIJ6MQWgl1N9Twfm2OvUSaM5fPtsqfoYTkv4ThVs8vGYyw+Y2oAnBa
-XKvUeP6S6et7cKQZCtpi9UgK8s1dHK7oqJaluW9tGes1Mcer/qKFdYunLlXYi8PA
-PRgEOb2hquFNE5V+0vXeiVqo/fAhlHxZ5jJbSQ2RnnN7ycVCQDZZlaEYPrGpaZVS
-9gYHwnECD5EPl8QsVymK2Co28pXAwpdo4btmWAeDhmy+8yOMjoS+T3k+/wiEmLLp
-dnjCadQzQamnqs4mfuypLT2wWWjkat9QKAM9gHkMwcC1Uv2RM2QeR8FDySJX
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds.sunet.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds.sunet.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds.sunet.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds.sunet.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mds.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mds.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/tcs-test.sunet.se-shibboleth.xml b/swamid-2.0/tcs-test.sunet.se-shibboleth.xml
deleted file mode 100644
index 55bd6acf..00000000
--- a/swamid-2.0/tcs-test.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://tcs-test.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>tcs-test.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tcs-test.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAJu2W9h/GQn5MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXRjcy10ZXN0LnN1bmV0LnNlMB4XDTA5MDkwNDA5MzU0N1oXDTE5MDkwMjA5
-MzU0N1owHDEaMBgGA1UEAxMRdGNzLXRlc3Quc3VuZXQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDfOz1hNo/wrI+MBbauT55gEx1IsbEK+KGhWCEG
-N18M2XU+Afad8tG5zPjKDBGNz3JDVQRb+Dldi9VnhbIliPjMpXgpnXjNN8+bYe6X
-SrJHGOOCs3aXixtcqCvkD/kkplLf/RsfVfe3FP49JDApguR4jH3vtNCNJoECUhCH
-VTBFB3BiEx2iky2v+f3NzDoSod8o2NAXLBOC25xCk7VjRa70uiPx32eE7+izsJLs
-VJkaqKmW2n1yZsOS+9puYcr19vNSQ4awo/3uRMbPrPe8Z4cMyAJB1+xZ30VXLhV/
-6nnraUZuF1w6xNp8mFbJlwd4m41bPTitJO2AqvZMzOxrgucTAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXRjcy10ZXN0LnN1bmV0LnNlMB0GA1UdDgQWBBQjlFq8PSW2QiXN
-5RWltu60z8K8djANBgkqhkiG9w0BAQUFAAOCAQEAVgyGn2VUctqIqVUqv/AAa7MU
-Do3b3uFe4ezNCe433XJiVJBf1ys5ifBSMEPCtexBlDAKOidaiZfylb6JudgzuDSZ
-fef2y/6Fk8wiub64E4ayKDU5LlsAs43PlOQjufDsq09BesJJFXxBBDIhP4UCL+XO
-nhVX7PZBnBPhjTmt+iUtgBkkMZJMhgDyJJZiYjLcbVfPKKQqTWRK9QUj4fc6JldX
-CmO/ILoP5fWaKzwlK5ybhHyoYH6RYjuV0CBiUlZS6iejpsRokr/aQrQ3JHPWLId+
-VExt5K7bqNQpM9wqLuSjrlCueO4wNjuSTevHKZO6uB4DcnFnNMxWsvB81dLUdg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>tcs-test.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tcs-test.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAJu2W9h/GQn5MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXRjcy10ZXN0LnN1bmV0LnNlMB4XDTA5MDkwNDA5MzU0N1oXDTE5MDkwMjA5
-MzU0N1owHDEaMBgGA1UEAxMRdGNzLXRlc3Quc3VuZXQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDfOz1hNo/wrI+MBbauT55gEx1IsbEK+KGhWCEG
-N18M2XU+Afad8tG5zPjKDBGNz3JDVQRb+Dldi9VnhbIliPjMpXgpnXjNN8+bYe6X
-SrJHGOOCs3aXixtcqCvkD/kkplLf/RsfVfe3FP49JDApguR4jH3vtNCNJoECUhCH
-VTBFB3BiEx2iky2v+f3NzDoSod8o2NAXLBOC25xCk7VjRa70uiPx32eE7+izsJLs
-VJkaqKmW2n1yZsOS+9puYcr19vNSQ4awo/3uRMbPrPe8Z4cMyAJB1+xZ30VXLhV/
-6nnraUZuF1w6xNp8mFbJlwd4m41bPTitJO2AqvZMzOxrgucTAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXRjcy10ZXN0LnN1bmV0LnNlMB0GA1UdDgQWBBQjlFq8PSW2QiXN
-5RWltu60z8K8djANBgkqhkiG9w0BAQUFAAOCAQEAVgyGn2VUctqIqVUqv/AAa7MU
-Do3b3uFe4ezNCe433XJiVJBf1ys5ifBSMEPCtexBlDAKOidaiZfylb6JudgzuDSZ
-fef2y/6Fk8wiub64E4ayKDU5LlsAs43PlOQjufDsq09BesJJFXxBBDIhP4UCL+XO
-nhVX7PZBnBPhjTmt+iUtgBkkMZJMhgDyJJZiYjLcbVfPKKQqTWRK9QUj4fc6JldX
-CmO/ILoP5fWaKzwlK5ybhHyoYH6RYjuV0CBiUlZS6iejpsRokr/aQrQ3JHPWLId+
-VExt5K7bqNQpM9wqLuSjrlCueO4wNjuSTevHKZO6uB4DcnFnNMxWsvB81dLUdg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tcs-test.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-test.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-test.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tcs-test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tcs-test.sunet.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-test.sunet.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-test.sunet.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tcs-test.sunet.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tcs-test.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tcs-test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tcs-test.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tcs-test.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tcs-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index cef3c1e7..0e722771 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -61,7 +61,6 @@
   <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/converis.info-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/tcs-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/uu.test.diva-portal.org-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www4.genuinetext.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.diva-portal.org-shibboleth.xml"/>
@@ -77,19 +76,16 @@
   <xi:include href="swamid-2.0/connect.uninett.no-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/smd-dev.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/coip-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/betafoo.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowdtest.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ni.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/mds.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/meta.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/meta2.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/meetingtools.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.sunet.se.xml"/>
   <xi:include href="swamid-2.0/mds.lan.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/mds-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nagios-vm.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nagios.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml"/>
@@ -262,7 +258,6 @@
   <xi:include href="swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rt.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rt-test.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml"/>
   <xi:include href="swamid-2.0/comanage.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/comanage-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml"/>