Removed Umeå SPs that no longer resolves

* cambro-test-26.umdc.umu.se
* cambro-tst1.umdc.umu.se
* cambro-utv1.umdc.umu.se

4 files changed, 0 insertions, 253 deletions

diff --git a/swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml b/swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml
deleted file mode 100644
index 4fc914be..00000000
--- a/swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,58 +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://cambro-test-26.umdc.umu.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://cambro-test-26.umdc.umu.se/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/IDP"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/IDPUMU"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/IDPTST2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/CAMBROLOGIN"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>cambro-test-26.umdc.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=support@umdac.umu.se,CN=cambro-test-26.umdc.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIICqzCCAhQCCQDVX0RWVzQSBzANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
-U0UxFTATBgNVBAgMDFZhc3RlcmJvdHRlbjENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDSVRTMQwwCgYDVQQLDANJVFMxIzAhBgNVBAMMGmNhbWJyby10ZXN0LTI2LnVt
-ZGMudW11LnNlMSMwIQYJKoZIhvcNAQkBFhRzdXBwb3J0QHVtZGFjLnVtdS5zZTAe
-Fw0xMjA1MTYxMTEzNDhaFw0xNzA1MTUxMTEzNDhaMIGZMQswCQYDVQQGEwJTRTEV
-MBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQwwCgYDVQQKDANJ
-VFMxDDAKBgNVBAsMA0lUUzEjMCEGA1UEAwwaY2FtYnJvLXRlc3QtMjYudW1kYy51
-bXUuc2UxIzAhBgkqhkiG9w0BCQEWFHN1cHBvcnRAdW1kYWMudW11LnNlMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDb+dHecvFHT1wRDICdogQp6T7knOMuxDii
-u1UBfemwQAWkB8f5q8C+9v37NeBCr+QoZayw3fBCTT/o+zMjeA1PbNoU/2iR6/2K
-7o2r8eoYYosZpOJg3n2vFNWdo6ewfxWWwJ0l5cSvact0kkV0ofJsrBrzN1vE3cQT
-3RJBJSs8+wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBALg4w+Ata45FRiN333JwqWqe
-G0TlordU57tDpoVJ/CJrYg+1+jbkmgTu6qnVajo6vMdIKtWA+xXscEvpgzMUJfna
-DkaGWa/QXoo1dZB6ixU2qztCtoNnvikugb+vJ/aPhy98zrL2XI3kiPblbKJ8/zqd
-XOi6QTTaGpYW3p3/v0OI
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml b/swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml
deleted file mode 100644
index ce173667..00000000
--- a/swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://cambro-tst1.umdc.umu.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://cambro-tst1.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>cambro-tst1.umdc.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cambro-tst1.umdc.umu.se,OU=UMDAC,O=Ume\C3\A5 universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEhzCCA2+gAwIBAgIQNCZ6Wao5rCiMh8bMn8dl9DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDEwNDAwMDAwMFoXDTEzMDEwMzIzNTk1OVowWzELMAkGA1UE
-BhMCU0UxGjAYBgNVBAoMEVVtZcOlIHVuaXZlcnNpdGV0MQ4wDAYDVQQLEwVVTURB
-QzEgMB4GA1UEAxMXY2FtYnJvLXRzdDEudW1kYy51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQD35dREFJcNZx8SrndY6t23IFA+HZPzlqSlYqgb
-sh5Es7k7pg2T0XllCoc8NfJB/g2OtJSVZr3ANKFaIei4q4u/blN3BFwEKQsyXbly
-lqJXKvPlOvyPzmC67vPB+2gWlLAOa2bRpGa/VkUFGis+yk+WITMwfNiHnap/Bq4Q
-gmgH9EgNDssTEHU1CCh7IrUKIpKfQVsoVLUGxoWxYLFMfGhgJfq3OtMQvvydN6hN
-ecvoeVydOvdXegI/OZGxKGGYeiWH3kqMjTmfHzCLnw5YexBr3WHxgoxar2XfQPwB
-I/5wTtVLjQZkF4QoMkP/82Q1MshaPwHpoOV40sQ3nYwgZiFVAgMBAAGjggFqMIIB
-ZjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+HiE
-q3c7HVUR0vHnWLyyDOdQCyUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYB
-BAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIX
-Y2FtYnJvLXRzdDEudW1kYy51bXUuc2UwDQYJKoZIhvcNAQEFBQADggEBALzxzMtR
-o8BxLXRi9FB72jRQeNu7KfRgpSrqLmAMlKQRamNl3VjinUOAuNXR7Ri4tKJ+9oAN
-vneP9Hion4ppXksU6OSUE/6zByAdF21zVe62DaczHS77urZMqgXIThDVwl0XOtai
-LlDHkbIs6OVYwrp//pPTNQ/j4GnPZOA1Ghnw+FXRHRLD1sOqZWGkCXzWJETZIH7y
-uBq90+cT5Jw5XHICeLGVy5QipR08cJS7JJTcdVPxDMqgzv0gsgVG7n4GUMkedSmI
-NRAsAsB2WLZT+aJN5LHLkPGEq64W8hV8QPUUZfsIMbnSdwpQNFG5FrA9MwCjQqe5
-n5/yB4LGJWrAQjc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>cambro-tst1.umdc.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cambro-tst1.umdc.umu.se,OU=UMDAC,O=Ume\C3\A5 universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEhzCCA2+gAwIBAgIQNCZ6Wao5rCiMh8bMn8dl9DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDEwNDAwMDAwMFoXDTEzMDEwMzIzNTk1OVowWzELMAkGA1UE
-BhMCU0UxGjAYBgNVBAoMEVVtZcOlIHVuaXZlcnNpdGV0MQ4wDAYDVQQLEwVVTURB
-QzEgMB4GA1UEAxMXY2FtYnJvLXRzdDEudW1kYy51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQD35dREFJcNZx8SrndY6t23IFA+HZPzlqSlYqgb
-sh5Es7k7pg2T0XllCoc8NfJB/g2OtJSVZr3ANKFaIei4q4u/blN3BFwEKQsyXbly
-lqJXKvPlOvyPzmC67vPB+2gWlLAOa2bRpGa/VkUFGis+yk+WITMwfNiHnap/Bq4Q
-gmgH9EgNDssTEHU1CCh7IrUKIpKfQVsoVLUGxoWxYLFMfGhgJfq3OtMQvvydN6hN
-ecvoeVydOvdXegI/OZGxKGGYeiWH3kqMjTmfHzCLnw5YexBr3WHxgoxar2XfQPwB
-I/5wTtVLjQZkF4QoMkP/82Q1MshaPwHpoOV40sQ3nYwgZiFVAgMBAAGjggFqMIIB
-ZjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+HiE
-q3c7HVUR0vHnWLyyDOdQCyUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYB
-BAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIX
-Y2FtYnJvLXRzdDEudW1kYy51bXUuc2UwDQYJKoZIhvcNAQEFBQADggEBALzxzMtR
-o8BxLXRi9FB72jRQeNu7KfRgpSrqLmAMlKQRamNl3VjinUOAuNXR7Ri4tKJ+9oAN
-vneP9Hion4ppXksU6OSUE/6zByAdF21zVe62DaczHS77urZMqgXIThDVwl0XOtai
-LlDHkbIs6OVYwrp//pPTNQ/j4GnPZOA1Ghnw+FXRHRLD1sOqZWGkCXzWJETZIH7y
-uBq90+cT5Jw5XHICeLGVy5QipR08cJS7JJTcdVPxDMqgzv0gsgVG7n4GUMkedSmI
-NRAsAsB2WLZT+aJN5LHLkPGEq64W8hV8QPUUZfsIMbnSdwpQNFG5FrA9MwCjQqe5
-n5/yB4LGJWrAQjc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml b/swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml
deleted file mode 100644
index b1bed22c..00000000
--- a/swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://cambro-utv1.umdc.umu.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://cambro-utv1.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>cambro-utv1.umdc.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cambro-utv1.umdc.umu.se,O=Umea universitet,L=Umea,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEtTCCA52gAwIBAgILAQAAAAABH9HgmtcwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
-MDMwNDEzMjcxMVoXDTEyMDMwNDEzMjcxMVowWTELMAkGA1UEBhMCU0UxDTALBgNV
-BAcTBFVtZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxIDAeBgNVBAMTF2Nh
-bWJyby11dHYxLnVtZGMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA5TaLPTlLKk0TeGGRD4LP2f/PrRrFpKunsr++6ui9EsRGwRlla2lNVqsW
-AEpNFFUfQzOrrtMgbBZeCRdzWjaF5v+RDD5y7TGt+V2hqneIzCP0UlRCsYfDynVK
-3MMtIOziTGbX+W1yoSRO4U+t5kS0Ezyq3kly2sp0HRdpJOkRekaq0wOPO7b4I7M3
-w72Xa9cKsGEpqC4BVKhwLpPNvEg8Q2yQWHVEGBADRpxq8c+37w3UCpsW5lXZSTIX
-e5Bup0DzpEAofaYXYR7+xozWA5np/DttV0XES8OPySTKz4uJF12TdXtQDO71jriy
-jb1p4PzwRDWKyeV01NuAKB+pOgUpwQIDAQABo4IBdjCCAXIwUAYDVR0gBEkwRzBF
-BgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5u
-ZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAW
-gBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUWekEey2KnDs/ydaenF3j
-DgQDzxswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5l
-dC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNo
-dHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5j
-cnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdEQQbMBmCF2Nh
-bWJyby11dHYxLnVtZGMudW11LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQB0Tg84TC+P
-edgi+MJHZw9giLhPuaw1G7YeNsPelp7BdaGG5mj6NtnObxJxpX/Ac1XFmOWrs/d8
-dIW9cdRoomW9d9fgm4asKmUwj6riLT3KcZoaxqnQrI5RqINs1SGKcRNc4OnK/4WE
-IIODbCqQMNc97u8i++Cxi1DU09qE4awAs7hEz5twv3CPaDSBy/TiQbNs8PuPIZP9
-9wef0YIBiLfnHJpjtlzM4Nm0Gmmj7Q3ikrtd0Y9xH4GLHA4M/aWDgOHT8uQcVw8A
-74ghwcgLAYhaGLgvvisof0SMPG8Fp3A3cQ735bUbCFl1+MQDSHRZOJAPB/5t+Jlu
-gZWpy/ZEPcE5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>cambro-utv1.umdc.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cambro-utv1.umdc.umu.se,O=Umea universitet,L=Umea,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEtTCCA52gAwIBAgILAQAAAAABH9HgmtcwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
-MDMwNDEzMjcxMVoXDTEyMDMwNDEzMjcxMVowWTELMAkGA1UEBhMCU0UxDTALBgNV
-BAcTBFVtZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxIDAeBgNVBAMTF2Nh
-bWJyby11dHYxLnVtZGMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA5TaLPTlLKk0TeGGRD4LP2f/PrRrFpKunsr++6ui9EsRGwRlla2lNVqsW
-AEpNFFUfQzOrrtMgbBZeCRdzWjaF5v+RDD5y7TGt+V2hqneIzCP0UlRCsYfDynVK
-3MMtIOziTGbX+W1yoSRO4U+t5kS0Ezyq3kly2sp0HRdpJOkRekaq0wOPO7b4I7M3
-w72Xa9cKsGEpqC4BVKhwLpPNvEg8Q2yQWHVEGBADRpxq8c+37w3UCpsW5lXZSTIX
-e5Bup0DzpEAofaYXYR7+xozWA5np/DttV0XES8OPySTKz4uJF12TdXtQDO71jriy
-jb1p4PzwRDWKyeV01NuAKB+pOgUpwQIDAQABo4IBdjCCAXIwUAYDVR0gBEkwRzBF
-BgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5u
-ZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAW
-gBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUWekEey2KnDs/ydaenF3j
-DgQDzxswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5l
-dC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNo
-dHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5j
-cnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdEQQbMBmCF2Nh
-bWJyby11dHYxLnVtZGMudW11LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQB0Tg84TC+P
-edgi+MJHZw9giLhPuaw1G7YeNsPelp7BdaGG5mj6NtnObxJxpX/Ac1XFmOWrs/d8
-dIW9cdRoomW9d9fgm4asKmUwj6riLT3KcZoaxqnQrI5RqINs1SGKcRNc4OnK/4WE
-IIODbCqQMNc97u8i++Cxi1DU09qE4awAs7hEz5twv3CPaDSBy/TiQbNs8PuPIZP9
-9wef0YIBiLfnHJpjtlzM4Nm0Gmmj7Q3ikrtd0Y9xH4GLHA4M/aWDgOHT8uQcVw8A
-74ghwcgLAYhaGLgvvisof0SMPG8Fp3A3cQ735bUbCFl1+MQDSHRZOJAPB/5t+Jlu
-gZWpy/ZEPcE5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cambro-utv1.umdc.umu.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 150e4d8a..d44e65d3 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -50,7 +50,6 @@
   <xi:include href="swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.lhs.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.cambro.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kurser.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/webwork.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/etenta.math.su.se-shibboleth.xml"/>
@@ -58,7 +57,6 @@
   <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"/>
-  <xi:include href="swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.proxy.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/confluence.it.su.se-shibboleth.sso.xml"/>
@@ -76,7 +74,6 @@
   <xi:include href="swamid-2.0/mds.lan.kth.se-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"/>
-  <xi:include href="swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
   <xi:include href="swamid-2.0/play.hig.se.xml"/>
   <xi:include href="swamid-2.0/maps.slu.se-shibboleth.xml"/>