SWAMID-531, Remove of old SP and IdP from umu.se

9 files changed, 0 insertions, 443 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index de3095cb..9dab38ff 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -7,7 +7,6 @@ accountcheckout.lnu.se.xml
 activate-test.du.se-shibboleth.xml
 aktivera-test.su.se-shibboleth.sso.xml
 aktivera.su.se-shibboleth.sso.xml
-aktivering.db.umu.se-shibboleth.xml
 bedomningshandboken.uhr.se-shibboleth.xml
 beta.lobber.se-shibboleth.xml
 betafoo.nordu.net-shibboleth.xml
@@ -121,9 +120,6 @@ test-ki.pingpong.net-shibboleth.xml
 test.mp.uu.se-Shibboleth.sso.xml
 testshib.msacademicverify.com-shibboleth-sp.xml
 tta-portal.misc.kth.se-shibboleth.xml
-umdac-stdout.umdc.umu.se-shibboleth.xml
-umdac-strike.ad.umu.se-shibboleth.xml
-umdac-utv2.ad.umu.se-shibboleth.xml
 unitcf.se-shibboleth.xml
 uraccess.se-shibboleth-sp.xml
 uu.test.diva-portal.org-shibboleth.xml
diff --git a/swamid-2.0/aktivering.db.umu.se-shibboleth.xml b/swamid-2.0/aktivering.db.umu.se-shibboleth.xml
deleted file mode 100644
index b14a63e2..00000000
--- a/swamid-2.0/aktivering.db.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://aktivering.db.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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aktivering.db.umu.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFgTCCBGmgAwIBAgIRANpx25pROOar5rDRfsK004UwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMTcwMDAwMDBaFw0xMjEyMTYyMzU5NTlaMFcxCzAJBgNV
-BAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MQ4wDAYDVQQLEwVVTURB
-QzEdMBsGA1UEAxMUYWt0aXZlcmluZy5kYi51bXUuc2UwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCi3/sGq/G/+3Q0NF5XHCyXt2A1Pf1bFc6/GTJpqZoZ
-4w6Z4qZukm/m2sg9lZt4eXGzff4J3LYfISl9YNY21qyNNx89vyGmZwreFhTKBgKM
-8HndtqQkhk/469mpVbP6nkYlqB1Yo1z4dknQY0W15/EwwdqoGSi/1RhaN5HeaGHi
-zOaEmOY8USvDg2a9C8eDFEJwr46E9R0aW3Qtanb610FYly7yZw1zq9GZGSfIcuhD
-XjBzUhgx0S+wnzp0t4g1xZa+hNbSuAb+orcy6N/Qf8G/v3TN9Deyy5QszTDh0DfM
-pKgqKlxvFToRLDUxYgMwJhCQqMyQ6su2RL/lqyt4sktczCt4n6k0/PR75TygrC3A
-XNQyGbSOKyTWii5ZTnJpsDhfgzmmS1wvfceMAQhCaEHIOmytrfEKnBhN++RDzzow
-Bes5LX9V+c34UnmbWLYuoRZSgXuDf+uo1M5D4wY/iLMfV8hrR3fxohugeICI5zHr
-dshPHf+1sGkR0GW5FZojA3MCqnvx2JXD/uzRZlklCpdvm7piaWpSUOTuozaiUvQf
-yLGFFhnoEpbABoJSCFSCQO2k2AZkAReA0tYhbYVe+mnxWZsOZRcLaQTMl6l/0uQ5
-SIVjC5S4JcDrHnHSbMLk2OIiiEFa515Maa/hNkS6MwyXKNpwpmJxB9W4rQ3MpQCI
-7wIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFPA2Tckr7sjvWayvY68aF7n0jY4+MA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNV
-HSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9j
-cmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEw
-XzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3Jn
-MB8GA1UdEQQYMBaCFGFrdGl2ZXJpbmcuZGIudW11LnNlMA0GCSqGSIb3DQEBBQUA
-A4IBAQAS33vefF1HZRklXjJfPwwvpFjYN/jp1+HS9yyMxV6xy7KDl9999sdAXv7y
-NzksZxOLrI220LX6vkDno7nHrRDCoJyaD4M8kBfrQFylrlm2Z2+JPFI9HxyQiwNO
-+jfje4/ZjJ5FCGQFS1fJfKS/z/h00HPxRrarCo9JbDx8n628swrUiWeu09ooRan4
-7e0pFS37NOHjDiX4xar/5ZftQdsnz/5M322LhhlMLUU7TPdB9neJnn8QxeSaLDsr
-LBQ+1+ysE+ryWjMO23qmJzxA8uVHHuiD30S2XHSsfL1clX20G2Zb5YAM6h/lZnGS
-9NeFIiSev3CzfBT/GlsNx0aGwTd/
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFgTCCBGmgAwIBAgIRANpx25pROOar5rDRfsK004UwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMTcwMDAwMDBaFw0xMjEyMTYyMzU5NTlaMFcxCzAJBgNV
-BAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MQ4wDAYDVQQLEwVVTURB
-QzEdMBsGA1UEAxMUYWt0aXZlcmluZy5kYi51bXUuc2UwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCi3/sGq/G/+3Q0NF5XHCyXt2A1Pf1bFc6/GTJpqZoZ
-4w6Z4qZukm/m2sg9lZt4eXGzff4J3LYfISl9YNY21qyNNx89vyGmZwreFhTKBgKM
-8HndtqQkhk/469mpVbP6nkYlqB1Yo1z4dknQY0W15/EwwdqoGSi/1RhaN5HeaGHi
-zOaEmOY8USvDg2a9C8eDFEJwr46E9R0aW3Qtanb610FYly7yZw1zq9GZGSfIcuhD
-XjBzUhgx0S+wnzp0t4g1xZa+hNbSuAb+orcy6N/Qf8G/v3TN9Deyy5QszTDh0DfM
-pKgqKlxvFToRLDUxYgMwJhCQqMyQ6su2RL/lqyt4sktczCt4n6k0/PR75TygrC3A
-XNQyGbSOKyTWii5ZTnJpsDhfgzmmS1wvfceMAQhCaEHIOmytrfEKnBhN++RDzzow
-Bes5LX9V+c34UnmbWLYuoRZSgXuDf+uo1M5D4wY/iLMfV8hrR3fxohugeICI5zHr
-dshPHf+1sGkR0GW5FZojA3MCqnvx2JXD/uzRZlklCpdvm7piaWpSUOTuozaiUvQf
-yLGFFhnoEpbABoJSCFSCQO2k2AZkAReA0tYhbYVe+mnxWZsOZRcLaQTMl6l/0uQ5
-SIVjC5S4JcDrHnHSbMLk2OIiiEFa515Maa/hNkS6MwyXKNpwpmJxB9W4rQ3MpQCI
-7wIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFPA2Tckr7sjvWayvY68aF7n0jY4+MA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNV
-HSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9j
-cmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEw
-XzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3Jn
-MB8GA1UdEQQYMBaCFGFrdGl2ZXJpbmcuZGIudW11LnNlMA0GCSqGSIb3DQEBBQUA
-A4IBAQAS33vefF1HZRklXjJfPwwvpFjYN/jp1+HS9yyMxV6xy7KDl9999sdAXv7y
-NzksZxOLrI220LX6vkDno7nHrRDCoJyaD4M8kBfrQFylrlm2Z2+JPFI9HxyQiwNO
-+jfje4/ZjJ5FCGQFS1fJfKS/z/h00HPxRrarCo9JbDx8n628swrUiWeu09ooRan4
-7e0pFS37NOHjDiX4xar/5ZftQdsnz/5M322LhhlMLUU7TPdB9neJnn8QxeSaLDsr
-LBQ+1+ysE+ryWjMO23qmJzxA8uVHHuiD30S2XHSsfL1clX20G2Zb5YAM6h/lZnGS
-9NeFIiSev3CzfBT/GlsNx0aGwTd/
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aktivering.db.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aktivering.db.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aktivering.db.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivering.db.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivering.db.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aktivering.db.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aktivering.db.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivering.db.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivering.db.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivering.db.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aktivering.db.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivering.db.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivering.db.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aktivering.db.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aktivering.db.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml
deleted file mode 100644
index ea63847c..00000000
--- a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp2.test.umu.se/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-05-13T13:37:50Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp2.test.umu.se/saml2/idp/metadata.php">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEeDCCA2CgAwIBAgIQSNslvGdmCXnbM5xzWOyrwTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDkwMTAwMDAwMFoXDTEzMDgzMTIzNTk1OVowUzELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDjAMBgNVBAsTBVVNREFDMRkwFwYDVQQDExBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqnsLBvs8DxJffl1zqULjBc1a+c1+mH+eW2BgUxNOG9FJCZqWAJFO8T4m3c1kO9VSQRSFqCMhQd08bfzySevDwgjX3+mR0UfJbtvcCLujDbSnE/1KgMv9EWcqzqyHsw8sL4ShG21pKaCjlP7Abq9T1flRixM+y47LEqnMlHOPKzNG4+366YzKIudsqNeiqwwAmEE4FZEwooBj8paWl800tNL4fUc7Y4sBxfs3j9e0h3sr32LRhQCL8wAa3OrRmoBrbEp/QDygQZ/XE+cjgbDSPzV/Ii4av4CF8OU+lYysrIZMDkTWjbXwkofm7HwbWgb+ukGO4RQdlf1gTG3pn15fQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBRq/M6MhWNHffNKe9OpmRL57m17MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGlkcDIudGVzdC51bXUuc2UwDQYJKoZIhvcNAQEFBQADggEBALNp2cyl51WNMXfW6YKwmZ6uOu07sGb5ONvteQ8L3qw8bN5ftBiGGi4LeckZj1K2/ql6roW2AeBdH2ZbsSPzfbgZUGVvZMqm0t/Ty24bhAcBtGmJd8oxDH5z8EwMA3Ko5y/n3Mxgn4kjwmDAuF44aVQG8s7Hh9eVvkQyD81ABpUACj+iqs1ynACdQAk2/As4zsCE0iaew/NQ52R7awPB5KitXABpiaj5pDTEsMVRuSKnTErLNTNE9gE0eeuN8bGsU3Hj7ndohqt8bSQLapIHU8odY52Ekjaq8L4etnipjTxrvZqu5TSskrkb9uOViUWND9DB1fKmTUaAeKWlOS/B0X0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.test.umu.se/saml2/idp/ArtifactResolutionService.php" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.test.umu.se/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.test.umu.se/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">UmU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå University (New)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet (Ny)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.umu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@umdac.umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
deleted file mode 100644
index 0866be28..00000000
--- a/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://umdac-humpdac.ad.umu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIB7TCCAVagAwIBAgIJAPLebS0CGJJJMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3VtZGFjLWh1bXBkYWMuYWQudW11LnNlMB4XDTA3MDMxMzEwNTkzNloXDTA4MDMxMjEwNTkzNlowIjEgMB4GA1UEAxMXdW1kYWMtaHVtcGRhYy5hZC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALA5VqzzCDXki71HDlWq9gwowL+0FBFZC9bCRmjKOGe9lmZveHhJ1oWN7g5wbAbC+oAciHe5vzUoEIrkl9enqqFCgOww3LhAURSuebJzbF8fz3zjdFlyzqDIlLet54YTvfdZmro4345Z46KW/dX5QOAEslLcSUev1Eq1F1rgXMV/AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAOHWzEvOqLpAeLm19FAZS/qG5i97eH5bx7opjABmDU7IIMT2jEhBykYL6BXbfYljLT2pyBEE2oILetNT/U09Angm2Lf8JzenPUgqS8qFGl54/Gw2GcIiDBbvmPuBWqw8CRYdfBQjBZmKs+jN+Lr1uvEvim/B4PPQg2Eypp8iz/VM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-humpdac.ad.umu.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>UMDAC</Company>
-    <GivenName>Tommy</GivenName>
-    <SurName>Larsson</SurName>
-    <EmailAddress>mailto:tommy.larsson@umdac.umu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/umdac-stdout.umdc.umu.se-shibboleth.xml b/swamid-2.0/umdac-stdout.umdc.umu.se-shibboleth.xml
deleted file mode 100644
index 7474dcac..00000000
--- a/swamid-2.0/umdac-stdout.umdc.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://umdac-stdout.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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>umdac-stdout.umdc.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=umdac-stdout.umdc.umu.se,OU=Test Certificates,O=Umea universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELDCCAxSgAwIBAgICAYswDQYJKoZIhvcNAQEFBQAwdDELMAkGA1UEBhMCU0Ux
-GTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGjAYBgNVBAsTEVRlc3QgQ2VydGlm
-aWNhdGVzMRQwEgYDVQQDEwtVbVUgVGVzdCBDQTEYMBYGCSqGSIb3DQEJARYJY2FA
-dW11LnNlMB4XDTA5MTEwMjE1NDkyMVoXDTEwMTAyODE1NDkyMVowZzELMAkGA1UE
-BhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGjAYBgNVBAsTEVRlc3Qg
-Q2VydGlmaWNhdGVzMSEwHwYDVQQDExh1bWRhYy1zdGRvdXQudW1kYy51bXUuc2Uw
-gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALW8cJS327S7dbj5m35I8ir4mPrC
-gMe6h7/9VSYwKNwlLgd88Vr+VaVBT3lTZTe1XiHvK6keYXCpRKgzhL9GWPpPzlX4
-4D+NGePVIQzP6yC3Be5AamsA8xYzDzxtWsn+xEpfzo1eeNG7mxCu7Eh4c1Xh1Fo9
-k7wVoCo84ui9iV+1AgMBAAGjggFXMIIBUzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHQ4EFgQUV29zu1B/v7I2bvj0NSEYZfX9nR4wgZ4GA1UdIwSBljCBk4AU
-jXOYXAXzhT5d63px9eWem3+tpNuheKR2MHQxCzAJBgNVBAYTAlNFMRkwFwYDVQQK
-ExBVbWVhIHVuaXZlcnNpdGV0MRowGAYDVQQLExFUZXN0IENlcnRpZmljYXRlczEU
-MBIGA1UEAxMLVW1VIFRlc3QgQ0ExGDAWBgkqhkiG9w0BCQEWCWNhQHVtdS5zZYIB
-ADAJBgNVHREEAjAAMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2EudW11
-LnNlL3Rlc3RjYS9jcmxfdjIuY3JsMBEGCWCGSAGG+EIBAQQEAwIGQDAiBglghkgB
-hvhCAQ0EFRYTT25seSBmb3IgdGVzdCB1c2FnZTANBgkqhkiG9w0BAQUFAAOCAQEA
-knTqV4ZqO4JEuv30s9Hc5o5VrWwiIm1++PZLn+VVx6fzx3X+hjo6UuXsTYvT/Cwh
-Pc/+Xi9cHaYh3na269+0eZ49W/XFRKp2MRUZeIWB2d2XVH4xVos0N8BWsvLWqOfk
-cTwgoijo/badxi74ZSPRh7kOp/t9qm16Zx2+b4EX+4Kofp1PtxWDQj4//McjgEfu
-m87g+4FTwxmeYEobc/9Njk3sKz0ecjxhJF60Sr1IuipOroVfaVkfkeOdvIgOaeeR
-kp4lNB24SaDlqLpb4ZbVOSAdnrBo/oA3hZfj24cXm8/p3+NNm8ryrC+fi5CZcZFT
-pxWTuR+O1MsLut2Mjqaq5Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>umdac-stdout.umdc.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=umdac-stdout.umdc.umu.se,OU=Test Certificates,O=Umea universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELDCCAxSgAwIBAgICAYswDQYJKoZIhvcNAQEFBQAwdDELMAkGA1UEBhMCU0Ux
-GTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGjAYBgNVBAsTEVRlc3QgQ2VydGlm
-aWNhdGVzMRQwEgYDVQQDEwtVbVUgVGVzdCBDQTEYMBYGCSqGSIb3DQEJARYJY2FA
-dW11LnNlMB4XDTA5MTEwMjE1NDkyMVoXDTEwMTAyODE1NDkyMVowZzELMAkGA1UE
-BhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGjAYBgNVBAsTEVRlc3Qg
-Q2VydGlmaWNhdGVzMSEwHwYDVQQDExh1bWRhYy1zdGRvdXQudW1kYy51bXUuc2Uw
-gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALW8cJS327S7dbj5m35I8ir4mPrC
-gMe6h7/9VSYwKNwlLgd88Vr+VaVBT3lTZTe1XiHvK6keYXCpRKgzhL9GWPpPzlX4
-4D+NGePVIQzP6yC3Be5AamsA8xYzDzxtWsn+xEpfzo1eeNG7mxCu7Eh4c1Xh1Fo9
-k7wVoCo84ui9iV+1AgMBAAGjggFXMIIBUzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHQ4EFgQUV29zu1B/v7I2bvj0NSEYZfX9nR4wgZ4GA1UdIwSBljCBk4AU
-jXOYXAXzhT5d63px9eWem3+tpNuheKR2MHQxCzAJBgNVBAYTAlNFMRkwFwYDVQQK
-ExBVbWVhIHVuaXZlcnNpdGV0MRowGAYDVQQLExFUZXN0IENlcnRpZmljYXRlczEU
-MBIGA1UEAxMLVW1VIFRlc3QgQ0ExGDAWBgkqhkiG9w0BCQEWCWNhQHVtdS5zZYIB
-ADAJBgNVHREEAjAAMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2EudW11
-LnNlL3Rlc3RjYS9jcmxfdjIuY3JsMBEGCWCGSAGG+EIBAQQEAwIGQDAiBglghkgB
-hvhCAQ0EFRYTT25seSBmb3IgdGVzdCB1c2FnZTANBgkqhkiG9w0BAQUFAAOCAQEA
-knTqV4ZqO4JEuv30s9Hc5o5VrWwiIm1++PZLn+VVx6fzx3X+hjo6UuXsTYvT/Cwh
-Pc/+Xi9cHaYh3na269+0eZ49W/XFRKp2MRUZeIWB2d2XVH4xVos0N8BWsvLWqOfk
-cTwgoijo/badxi74ZSPRh7kOp/t9qm16Zx2+b4EX+4Kofp1PtxWDQj4//McjgEfu
-m87g+4FTwxmeYEobc/9Njk3sKz0ecjxhJF60Sr1IuipOroVfaVkfkeOdvIgOaeeR
-kp4lNB24SaDlqLpb4ZbVOSAdnrBo/oA3hZfj24cXm8/p3+NNm8ryrC+fi5CZcZFT
-pxWTuR+O1MsLut2Mjqaq5Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-stdout.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://umdac-stdout.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://umdac-stdout.umdc.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/umdac-strike.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-strike.ad.umu.se-shibboleth.xml
deleted file mode 100644
index 06e48297..00000000
--- a/swamid-2.0/umdac-strike.ad.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://umdac-strike.ad.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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.example.org/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>sp.strike.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=datordrift@umdac.umu.se,CN=sp.strike.ad.umu.se,OU=ITS,O=Umea universitet,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE1jCCA76gAwIBAgIJANgp9G5gZX/7MA0GCSqGSIb3DQEBBQUAMIGiMQswCQYD
-VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMRkw
-FwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLEwNJVFMxHDAaBgNVBAMT
-E3NwLnN0cmlrZS5hZC51bXUuc2UxJjAkBgkqhkiG9w0BCQEWF2RhdG9yZHJpZnRA
-dW1kYWMudW11LnNlMB4XDTExMDIxMDEzMjI0MVoXDTEzMTIyNDEzMjI0MVowgaIx
-CzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcTBFVt
-ZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDDAKBgNVBAsTA0lUUzEcMBoG
-A1UEAxMTc3Auc3RyaWtlLmFkLnVtdS5zZTEmMCQGCSqGSIb3DQEJARYXZGF0b3Jk
-cmlmdEB1bWRhYy51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQD3cDW3/Z5H0wDknkiHATmn5+pSap07JCNKUrwBQZquE2Nfr3Idw83A3qMUwY7Z
-EW1jQU69j363dqGv9Ypc8ViQ9jSR5+O9iTaMYIpJHJSiFju3wFHbwZMJckFdsRjt
-jsWCdh1EGU/oJP0HdijvDtr1eM6VjeB3a3oEOlN9ECPkGAR03m+O8CPviRSSwXJD
-yvtJKgBNy6U3t2o13L1i7xgvNNcywRu4vtdkt5K+NI/P7C0H/j1DzAbZzqfyJhBO
-KPW1X2Wetk6nubsw49k2XnRUFkqamvSe6shL4492cwRYpxmKTX+e/RUde0+Ve7VS
-0VaD9+9utUzO/kG/cOeXtzsDAgMBAAGjggELMIIBBzAdBgNVHQ4EFgQUbDEDfqkU
-fWcjQC7Y53yHYNEgGLQwgdcGA1UdIwSBzzCBzIAUbDEDfqkUfWcjQC7Y53yHYNEg
-GLShgaikgaUwgaIxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4x
-DTALBgNVBAcTBFVtZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDDAKBgNV
-BAsTA0lUUzEcMBoGA1UEAxMTc3Auc3RyaWtlLmFkLnVtdS5zZTEmMCQGCSqGSIb3
-DQEJARYXZGF0b3JkcmlmdEB1bWRhYy51bXUuc2WCCQDYKfRuYGV/+zAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAVvAHw6N0vq1/WK6Xgu63vgI3Y6E62
-ioR3z4ysf0RMFCO1X3t3ZV119uINUKcV8IOsQL4yaSSPk25kAd+WELjX03pRfbzx
-pr07qZjmDGQ4+NXeEfQzHNS1ONmWB5ehb07q+BQ3NBO9fNecboLqhKXO4aY6DGd8
-6sUsvhBBTHjDBoIe7VuIA53XdUCLFfvS/SwDBJOPfQeSg+16uzMWF7wpF+xFhvWn
-PyekLl4nWhrS6lKYrMdR4u5gQI8nzSycLqHiWrC3ftlFEYpEau1MskWdOAAd3r8q
-lI1794b9Dm6mV7L0EhmDNsX6gIy5lHdW5rfaW9gTZdImBpGECbBQlehm
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>sp.strike.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=datordrift@umdac.umu.se,CN=sp.strike.ad.umu.se,OU=ITS,O=Umea universitet,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE1jCCA76gAwIBAgIJANgp9G5gZX/7MA0GCSqGSIb3DQEBBQUAMIGiMQswCQYD
-VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMRkw
-FwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLEwNJVFMxHDAaBgNVBAMT
-E3NwLnN0cmlrZS5hZC51bXUuc2UxJjAkBgkqhkiG9w0BCQEWF2RhdG9yZHJpZnRA
-dW1kYWMudW11LnNlMB4XDTExMDIxMDEzMjI0MVoXDTEzMTIyNDEzMjI0MVowgaIx
-CzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcTBFVt
-ZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDDAKBgNVBAsTA0lUUzEcMBoG
-A1UEAxMTc3Auc3RyaWtlLmFkLnVtdS5zZTEmMCQGCSqGSIb3DQEJARYXZGF0b3Jk
-cmlmdEB1bWRhYy51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQD3cDW3/Z5H0wDknkiHATmn5+pSap07JCNKUrwBQZquE2Nfr3Idw83A3qMUwY7Z
-EW1jQU69j363dqGv9Ypc8ViQ9jSR5+O9iTaMYIpJHJSiFju3wFHbwZMJckFdsRjt
-jsWCdh1EGU/oJP0HdijvDtr1eM6VjeB3a3oEOlN9ECPkGAR03m+O8CPviRSSwXJD
-yvtJKgBNy6U3t2o13L1i7xgvNNcywRu4vtdkt5K+NI/P7C0H/j1DzAbZzqfyJhBO
-KPW1X2Wetk6nubsw49k2XnRUFkqamvSe6shL4492cwRYpxmKTX+e/RUde0+Ve7VS
-0VaD9+9utUzO/kG/cOeXtzsDAgMBAAGjggELMIIBBzAdBgNVHQ4EFgQUbDEDfqkU
-fWcjQC7Y53yHYNEgGLQwgdcGA1UdIwSBzzCBzIAUbDEDfqkUfWcjQC7Y53yHYNEg
-GLShgaikgaUwgaIxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4x
-DTALBgNVBAcTBFVtZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDDAKBgNV
-BAsTA0lUUzEcMBoGA1UEAxMTc3Auc3RyaWtlLmFkLnVtdS5zZTEmMCQGCSqGSIb3
-DQEJARYXZGF0b3JkcmlmdEB1bWRhYy51bXUuc2WCCQDYKfRuYGV/+zAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAVvAHw6N0vq1/WK6Xgu63vgI3Y6E62
-ioR3z4ysf0RMFCO1X3t3ZV119uINUKcV8IOsQL4yaSSPk25kAd+WELjX03pRfbzx
-pr07qZjmDGQ4+NXeEfQzHNS1ONmWB5ehb07q+BQ3NBO9fNecboLqhKXO4aY6DGd8
-6sUsvhBBTHjDBoIe7VuIA53XdUCLFfvS/SwDBJOPfQeSg+16uzMWF7wpF+xFhvWn
-PyekLl4nWhrS6lKYrMdR4u5gQI8nzSycLqHiWrC3ftlFEYpEau1MskWdOAAd3r8q
-lI1794b9Dm6mV7L0EhmDNsX6gIy5lHdW5rfaW9gTZdImBpGECbBQlehm
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.example.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.example.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.example.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.example.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.example.org/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.example.org/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.example.org/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.example.org/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.example.org/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.example.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.example.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.example.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.example.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.example.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml
deleted file mode 100644
index f2224f71..00000000
--- a/swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://umdac-utv2.ad.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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>Tommy Larsson</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=tommy.larsson@adm.umu.se,CN=Tommy Larsson,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEnjCCA4agAwIBAgIJAIDYaU8/yyu2MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQww
-CgYDVQQKEwNJVFMxDDAKBgNVBAsTA0lUUzEWMBQGA1UEAxMNVG9tbXkgTGFyc3Nv
-bjEnMCUGCSqGSIb3DQEJARYYdG9tbXkubGFyc3NvbkBhZG0udW11LnNlMB4XDTEx
-MDIwMzA4MzM0NloXDTEzMTIxNzA4MzM0NlowgZAxCzAJBgNVBAYTAlNFMRUwEwYD
-VQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcTBFVtZWExDDAKBgNVBAoTA0lUUzEM
-MAoGA1UECxMDSVRTMRYwFAYDVQQDEw1Ub21teSBMYXJzc29uMScwJQYJKoZIhvcN
-AQkBFhh0b21teS5sYXJzc29uQGFkbS51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCwJB8hLp6xfRSvszffewqylgUKoW2ToLuSiPeGlHgLdJ68
-4C3nq3eA8REZswiYewrCVAh4Hy8rHTFZY6l1RbmPcVGKM9v+VBv1zLZm0UO3m1N1
-K8I90TvLMw6L5uQqrLwWlNSTUY2ymWIuJ9ySIKVuDp8zrsMDCy1fd8q0fk+uNmJb
-b8cFxiyFZEBS1dzNyiJswo8Coz98qZWUKZKNUZbDFNCD/dts9bjDQF+RbT2sbr8I
-Di3iwVFN1w75T7yEmetfnQYaVZbMbJsLnpuAKGyZJP4rEHsSHxmwd7R162OcWGON
-dvXNTBQ+ktgbLO+GM2T3tOPdCwtFWRRxt4oKfHYLAgMBAAGjgfgwgfUwHQYDVR0O
-BBYEFHhciuUqHJCUY3mPFShUUaYl5wSBMIHFBgNVHSMEgb0wgbqAFHhciuUqHJCU
-Y3mPFShUUaYl5wSBoYGWpIGTMIGQMQswCQYDVQQGEwJTRTEVMBMGA1UECBMMVmFz
-dGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQwwCgYDVQQKEwNJVFMxDDAKBgNVBAsT
-A0lUUzEWMBQGA1UEAxMNVG9tbXkgTGFyc3NvbjEnMCUGCSqGSIb3DQEJARYYdG9t
-bXkubGFyc3NvbkBhZG0udW11LnNlggkAgNhpTz/LK7YwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEApDIyfp40njKA2PkfcYFwgQ9D8inVeSoo+KoT1V5/
-G830v6ktogoFYZlFjNDw5fLLnHzR7ackx4Q9cqwwrh98Y1HNu9q2O9PjSfa8xlBx
-bKgEGLA2dfz16TwGrz5Iiuhc52dCM+ku3o5wnq1ErnEjistoyw4oaaM5GvbHjacr
-uChj7vnqXL6TWRUDNudQHxv2OrI0ackn0E0xJ0kFVC0F0bs3JqzJhXptJKxSwt4U
-IwcvNZ22AhW8bZD/RMUowQiX33v/36OxNsF+tkYhjgpFKVnVUBCzSjoHXG8hYRbi
-o8j07LCWpvQalz9EX/Vzzp3OYkp52mwu4bYgg//8pASD0A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-utv2.ad.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 65225297..9574a3ec 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -50,10 +50,7 @@
   <xi:include href="swamid-2.0/shib1.oru.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp-nya.bth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/accountcheckout.lnu.se.xml"/>
-  <xi:include href="swamid-2.0/umdac-stdout.umdc.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/aktivering.db.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.it.gu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/umdac-strike.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/aktivera.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/account.mdh.se-shibboleth.xml"/>
@@ -64,7 +61,6 @@
   <xi:include href="swamid-2.0/shibboleth.ebscohost.com.xml"/>
   <xi:include href="swamid-2.0/www3.genuinetext.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/umdac-humpdac.ad.umu.se-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"/>
@@ -100,7 +96,6 @@
   <xi:include href="swamid-2.0/vlab-chemsub.explizit.se-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/umdac-utv2.ad.umu.se-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"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 3897a454..5a60ccfd 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -15,7 +15,6 @@
   <xi:include href="swamid-2.0/minastudier.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/bhb-00.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibboleth.umu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.suni.se-adfs-services-trust.xml"/>