metadata files renamed to <entityid>.xml

nya-08.ladok.umu.se duplicated, removed
idp.kau.se.xml duplicate, removed
luigi.umdc.umu.se-dw-idp.xml duplicate, removed
luigi.umdc.umu.se-shibboleth-idp.xml duplicate, removed
swamid-1.0/ladok3-*gui-sp* duplicates, removed
old e5.onthehub.com in swamid-testing-1.0.xml replaced by swamid-2.0 metadata
www.bmcmediatek.uu.se.xml duplicate of ws3.bmc.uu.se-shibboleth.xml, removed
bad entityid of www2.teol.uu.se.xml, removed
bad entityid of dev.teol.uu.se.xml (sp.example.org-shibboleth.xml), removed

317 files changed, 0 insertions, 981 deletions

diff --git a/swamid-1.0/account-test.unit.liu.se.xml b/swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml
index 203c84e4..203c84e4 100644
--- a/swamid-1.0/account-test.unit.liu.se.xml
+++ b/swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/account.liu.se.xml b/swamid-1.0/account.liu.se-shibboleth-sp.xml
index 2b269277..2b269277 100644
--- a/swamid-1.0/account.liu.se.xml
+++ b/swamid-1.0/account.liu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/account.mdh.se.xml b/swamid-1.0/account.mdh.se-shibboleth.xml
index d5233268..d5233268 100644
--- a/swamid-1.0/account.mdh.se.xml
+++ b/swamid-1.0/account.mdh.se-shibboleth.xml
diff --git a/swamid-1.0/adfs01.fhs.se.xml b/swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml
index 12076db4..12076db4 100644
--- a/swamid-1.0/adfs01.fhs.se.xml
+++ b/swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml
diff --git a/swamid-1.0/akino.hh.se.xml b/swamid-1.0/akino.hh.se-shibboleth.xml
index 232c0992..232c0992 100644
--- a/swamid-1.0/akino.hh.se.xml
+++ b/swamid-1.0/akino.hh.se-shibboleth.xml
diff --git a/swamid-1.0/aktivering.db.umu.se.xml b/swamid-1.0/aktivering.db.umu.se-shibboleth.xml
index 67e6f1a7..67e6f1a7 100644
--- a/swamid-1.0/aktivering.db.umu.se.xml
+++ b/swamid-1.0/aktivering.db.umu.se-shibboleth.xml
diff --git a/swamid-1.0/alpha.kib.ki.se.xml b/swamid-1.0/alpha.kib.ki.se-shibboleth.xml
index 7b2a61d1..7b2a61d1 100644
--- a/swamid-1.0/alpha.kib.ki.se.xml
+++ b/swamid-1.0/alpha.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/amiga.kib.ki.se.xml b/swamid-1.0/amiga.kib.ki.se-shibboleth.xml
index 95c70064..95c70064 100644
--- a/swamid-1.0/amiga.kib.ki.se.xml
+++ b/swamid-1.0/amiga.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/at11_idp-metadata.xml b/swamid-1.0/at11.ladok.umu.se-ecs-idp.xml
index 259c96c3..259c96c3 100644
--- a/swamid-1.0/at11_idp-metadata.xml
+++ b/swamid-1.0/at11.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/bardo.kib.ki.se.xml b/swamid-1.0/bardo.kib.ki.se-shibboleth.xml
index 26826491..26826491 100644
--- a/swamid-1.0/bardo.kib.ki.se.xml
+++ b/swamid-1.0/bardo.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/beta.kib.ki.se.xml b/swamid-1.0/beta.kib.ki.se-shibboleth.xml
index 8e672714..8e672714 100644
--- a/swamid-1.0/beta.kib.ki.se.xml
+++ b/swamid-1.0/beta.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/beta.lobber.se.xml b/swamid-1.0/beta.lobber.se-shibboleth.xml
index 7ec7370e..7ec7370e 100644
--- a/swamid-1.0/beta.lobber.se.xml
+++ b/swamid-1.0/beta.lobber.se-shibboleth.xml
diff --git a/swamid-1.0/betafoo.nordu.net-8000-saml2.xml b/swamid-1.0/betafoo.nordu.net-saml2-metadata-.xml
index c44cf9ed..c44cf9ed 100644
--- a/swamid-1.0/betafoo.nordu.net-8000-saml2.xml
+++ b/swamid-1.0/betafoo.nordu.net-saml2-metadata-.xml
diff --git a/swamid-1.0/betafoo.nordu.net.xml b/swamid-1.0/betafoo.nordu.net-shibboleth.xml
index f8eff970..f8eff970 100644
--- a/swamid-1.0/betafoo.nordu.net.xml
+++ b/swamid-1.0/betafoo.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/bibliometrics.ki.se.xml b/swamid-1.0/bibliometrics.ki.se-shibboleth.xml
index 7f6063e4..7f6063e4 100644
--- a/swamid-1.0/bibliometrics.ki.se.xml
+++ b/swamid-1.0/bibliometrics.ki.se-shibboleth.xml
diff --git a/swamid-1.0/brainstorm.swami.se.xml b/swamid-1.0/brainstorm.swami.se-shibboleth.xml
index a9a69e42..a9a69e42 100644
--- a/swamid-1.0/brainstorm.swami.se.xml
+++ b/swamid-1.0/brainstorm.swami.se-shibboleth.xml
diff --git a/swamid-1.0/hhs_metadata.xml b/swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
index d46497e5..d46497e5 100644
--- a/swamid-1.0/hhs_metadata.xml
+++ b/swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
diff --git a/swamid-1.0/cambro-test-26.umdc.umu.se.xml b/swamid-1.0/cambro-test-26.umdc.umu.se-shibboleth.xml
index e685e016..e685e016 100644
--- a/swamid-1.0/cambro-test-26.umdc.umu.se.xml
+++ b/swamid-1.0/cambro-test-26.umdc.umu.se-shibboleth.xml
diff --git a/swamid-1.0/cambro-tst1.umdc.umu.se.xml b/swamid-1.0/cambro-tst1.umdc.umu.se-shibboleth.xml
index 3de6f7c2..3de6f7c2 100644
--- a/swamid-1.0/cambro-tst1.umdc.umu.se.xml
+++ b/swamid-1.0/cambro-tst1.umdc.umu.se-shibboleth.xml
diff --git a/swamid-1.0/cambro-utv1.umdc.umu.se.xml b/swamid-1.0/cambro-utv1.umdc.umu.se-shibboleth.xml
index 80da43fa..80da43fa 100644
--- a/swamid-1.0/cambro-utv1.umdc.umu.se.xml
+++ b/swamid-1.0/cambro-utv1.umdc.umu.se-shibboleth.xml
diff --git a/swamid-1.0/captivelan-test.it.su.se.xml b/swamid-1.0/captivelan-test.it.su.se-shibboleth.sso.xml
index 9e340309..9e340309 100644
--- a/swamid-1.0/captivelan-test.it.su.se.xml
+++ b/swamid-1.0/captivelan-test.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/captivelan.it.su.se.xml b/swamid-1.0/captivelan.it.su.se-shibboleth.sso.xml
index 63bc6c1b..63bc6c1b 100644
--- a/swamid-1.0/captivelan.it.su.se.xml
+++ b/swamid-1.0/captivelan.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/cbs-vylvatest.kib.ki.se.xml b/swamid-1.0/cbs-vylvatest.kib.ki.se-shibboleth.xml
index b5f76502..b5f76502 100644
--- a/swamid-1.0/cbs-vylvatest.kib.ki.se.xml
+++ b/swamid-1.0/cbs-vylvatest.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/cdn.nordunet.tv.xml b/swamid-1.0/cdn.nordunet.tv-shibboleth.xml
index c63bdf02..c63bdf02 100644
--- a/swamid-1.0/cdn.nordunet.tv.xml
+++ b/swamid-1.0/cdn.nordunet.tv-shibboleth.xml
diff --git a/swamid-1.0/coip-test.sunet.se.xml b/swamid-1.0/coip-test.sunet.se-idp-shibboleth.xml
index 1502477c..1502477c 100644
--- a/swamid-1.0/coip-test.sunet.se.xml
+++ b/swamid-1.0/coip-test.sunet.se-idp-shibboleth.xml
diff --git a/swamid-1.0/coip-test.sunet.se-sp.xml b/swamid-1.0/coip-test.sunet.se-shibboleth.xml
index 39b70c7c..39b70c7c 100644
--- a/swamid-1.0/coip-test.sunet.se-sp.xml
+++ b/swamid-1.0/coip-test.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/confluence-test.it.su.se.xml b/swamid-1.0/confluence-test.it.su.se-shibboleth.sso.xml
index f5809cbd..f5809cbd 100644
--- a/swamid-1.0/confluence-test.it.su.se.xml
+++ b/swamid-1.0/confluence-test.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/confluence.it.su.se.xml b/swamid-1.0/confluence.it.su.se-shibboleth.sso.xml
index 1fcd5ab3..1fcd5ab3 100644
--- a/swamid-1.0/confluence.it.su.se.xml
+++ b/swamid-1.0/confluence.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/connect-beta.sunet.se.xml b/swamid-1.0/connect-beta.sunet.se-shibboleth.xml
index 762acbeb..762acbeb 100644
--- a/swamid-1.0/connect-beta.sunet.se.xml
+++ b/swamid-1.0/connect-beta.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/connect-stable.sunet.se.xml b/swamid-1.0/connect-stable.sunet.se-shibboleth.xml
index 476f4b44..476f4b44 100644
--- a/swamid-1.0/connect-stable.sunet.se.xml
+++ b/swamid-1.0/connect-stable.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/connect-test.sunet.se.xml b/swamid-1.0/connect-test.sunet.se-shibboleth.xml
index 419b83d1..419b83d1 100644
--- a/swamid-1.0/connect-test.sunet.se.xml
+++ b/swamid-1.0/connect-test.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/connect.sunet.se.xml b/swamid-1.0/connect.sunet.se-shibboleth.xml
index 4c3a28b7..4c3a28b7 100644
--- a/swamid-1.0/connect.sunet.se.xml
+++ b/swamid-1.0/connect.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/connect.uninett.no.xml b/swamid-1.0/connect.uninett.no-shibboleth.xml
index 12c45851..12c45851 100644
--- a/swamid-1.0/connect.uninett.no.xml
+++ b/swamid-1.0/connect.uninett.no-shibboleth.xml
diff --git a/swamid-1.0/converis.info.xml b/swamid-1.0/converis.info-shibboleth.xml
index 21898d0e..21898d0e 100644
--- a/swamid-1.0/converis.info.xml
+++ b/swamid-1.0/converis.info-shibboleth.xml
diff --git a/swamid-1.0/crowd.nordu.net.xml b/swamid-1.0/crowd.nordu.net-shibboleth.xml
index 620e55b1..620e55b1 100644
--- a/swamid-1.0/crowd.nordu.net.xml
+++ b/swamid-1.0/crowd.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/crowdtest.nordu.net.xml b/swamid-1.0/crowdtest.nordu.net-shibboleth.xml
index 89e41b23..89e41b23 100644
--- a/swamid-1.0/crowdtest.nordu.net.xml
+++ b/swamid-1.0/crowdtest.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/dedserv79.levonline.com.xml b/swamid-1.0/dedserv79.levonline.com-shibboleth.xml
index da8d9023..da8d9023 100644
--- a/swamid-1.0/dedserv79.levonline.com.xml
+++ b/swamid-1.0/dedserv79.levonline.com-shibboleth.xml
diff --git a/swamid-1.0/dev.lobber.se.xml b/swamid-1.0/dev.lobber.se-shibboleth.xml
index 93cdff13..93cdff13 100644
--- a/swamid-1.0/dev.lobber.se.xml
+++ b/swamid-1.0/dev.lobber.se-shibboleth.xml
diff --git a/swamid-1.0/dev.teol.uu.se.xml b/swamid-1.0/dev.teol.uu.se.xml
deleted file mode 100644
index 4280a771..00000000
--- a/swamid-1.0/dev.teol.uu.se.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.example.org/shibboleth">
-  <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://dev.teol.uu.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://dev.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>gravis.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gravis.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOCYEsltDIEOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGdyYXZpcy5pdHMudXUuc2UwHhcNMTEwNTMwMTE0MjQ0WhcNMjEwNTI3MTE0
-MjQ0WjAbMRkwFwYDVQQDExBncmF2aXMuaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAqcyKimtM4p/GlAzooApIxPv+/BHyzyJh8gGcLFnH
-XNq/t1eZz1MAFeSg5nWYwCp2VaVSEGGy/C711qeSgCONkl83E4KFrsfjhT4OAgST
-N0MlNscx1bFy/xhY8auGzCO06vtyjo0KAV3b0dJHLdkVPqnZ2adh5NrBW8W+UjuF
-YlkVloBNbtYFkmDJ9TdDRR0lHn9kc8XBsc+tNWRiY8dnbrqrjEi9dhvu329htBKy
-jaXaX7XYO/N3m4bfTv2iLL6LmdIUOldSFg0+hk6haFsexfcpjNXmYW6TOdqEwRKO
-P3WaH3Nw0yfJVWFKiniy6g775F+QXs5PzxlNcLK+jkCOkQIDAQABoz4wPDAbBgNV
-HREEFDASghBncmF2aXMuaXRzLnV1LnNlMB0GA1UdDgQWBBRzUaO3NftSgdTOeqmN
-vB3AFMLi8TANBgkqhkiG9w0BAQUFAAOCAQEAh8KlaKp/LGgJL2w8/ES3nYhEXT6P
-Gy6V4RfqYCq0MKrel66XvB/3Q5F9+yoA39DjXFAVaZUB3xI0WeoHorQ7Gx+59gij
-xr6eFVgxL7j7q/dW48sz7tZwZ2znx0ML3LQY4z4Xqq0fGW7o+EsMby27IyM7C3Uk
-ch5H5bJ6FWyiKsG1aH9ZHQHGXKbDbCOL7eO3CEZFj10UWeETomBGBsE0YAwMgOKh
-4ZTYqvTaF7H9YYOOET3DeNeyk9LyhwQmHBkj9qfoA076qW58vWT5JxgOowHhf8Q5
-gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.teol.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.teol.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.teol.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.teol.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.teol.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.teol.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/download.portal.chalmers.se.xml b/swamid-1.0/download.portal.chalmers.se-shibboleth.xml
index 243718db..243718db 100644
--- a/swamid-1.0/download.portal.chalmers.se.xml
+++ b/swamid-1.0/download.portal.chalmers.se-shibboleth.xml
diff --git a/swamid-1.0/downloads.channel8.msdn.com.xml b/swamid-1.0/downloads.channel8.msdn.com-shibboleth-sp.xml
index 269e203f..269e203f 100644
--- a/swamid-1.0/downloads.channel8.msdn.com.xml
+++ b/swamid-1.0/downloads.channel8.msdn.com-shibboleth-sp.xml
diff --git a/swamid-1.0/e5.onthehub.com.xml b/swamid-1.0/e5.onthehub.com.xml
deleted file mode 100644
index 75ecbc29..00000000
--- a/swamid-1.0/e5.onthehub.com.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e5.onthehub.com">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate> MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV 
-						BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0 
-						MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB 
-						BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh 
-						61NT+AD+8+K0m4288Rc4yTuyaYcCc6K+erCPkivkktudh4rVProuClfpXTgEl+IF 
-						YkfHbeZHEc2tMLMrQ6zWpcUBiSPdKjhEgVWGe6q/lW2KWRsmbx2lCufhtSfAwyCb 
-						j/+Nt8tlF8+Tmi5SEZ1HbUhSRMdIKHU8epMkeRd7fPXgO/lqzKF1TIi3eO+L63KW 
-						4zC0O39Uh6ftULWvCvpyxVAhiQGId092CV8CxuqQPY4lXPDtTKcS0pZLtvlAAD3X 
-						UhdVOszNxL43oEVQyv/Vr5abab4C1ghZQ26KGaWpqDkCAwEAAaNWMFQwMwYDVR0R 
-						BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd 
-						BgNVHQ4EFgQUiAUx8mQA/+5rLbZsyk/QgfTIKRgwDQYJKoZIhvcNAQEFBQADggEB 
-						AFl0fsWKeym+vqb8O7lPxICZpAMcr9hXn0/XA7FzTluuno4/+uRTljBn3rsPFoe5 
-						gxl+CtDFQnZ/ZKd6PAv6ulbj1w86JXiQ2dVjzPTSHnIzy408NLHiUKj5p7KmtvP6 
-						VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI 
-						K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq 
-						eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T l8qQhkUldJphTqx2PEHORBM= 
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="1" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="2" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST-SimpleSign" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="3" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/Artifact" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="4" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/ECP" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="5" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/POST" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="6" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/Artifact" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">E-academy, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">E-academy, Inc.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.e-academy.com/index.cfm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Islam Gomaa</GivenName>
-    <EmailAddress>SWAMID@e-academy.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Islam Gomaa</GivenName>
-    <EmailAddress>SWAMID@e-academy.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Islam Gomaa</GivenName>
-    <EmailAddress>SWAMID@e-academy.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/ecsidp.testc.ladok.umu.se_idp-metadata.xml b/swamid-1.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml
index b65392e9..b65392e9 100644
--- a/swamid-1.0/ecsidp.testc.ladok.umu.se_idp-metadata.xml
+++ b/swamid-1.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/ecsidp.testd.ladok.umu.se_idp-metadata.xml b/swamid-1.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml
index 8dd9a984..8dd9a984 100644
--- a/swamid-1.0/ecsidp.testd.ladok.umu.se_idp-metadata.xml
+++ b/swamid-1.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/egiswamid.egi.kth.se.xml b/swamid-1.0/egiswamid.egi.kth.se-shibboleth.xml
index 496c1eba..496c1eba 100644
--- a/swamid-1.0/egiswamid.egi.kth.se.xml
+++ b/swamid-1.0/egiswamid.egi.kth.se-shibboleth.xml
diff --git a/swamid-1.0/ensky.lhs.se.xml b/swamid-1.0/ensky.lhs.se-shibboleth.xml
index 5013ff4b..5013ff4b 100644
--- a/swamid-1.0/ensky.lhs.se.xml
+++ b/swamid-1.0/ensky.lhs.se-shibboleth.xml
diff --git a/swamid-1.0/epc.ub.uu.se.xml b/swamid-1.0/epc.ub.uu.se-shibboleth.xml
index 1a918d28..1a918d28 100644
--- a/swamid-1.0/epc.ub.uu.se.xml
+++ b/swamid-1.0/epc.ub.uu.se-shibboleth.xml
diff --git a/swamid-1.0/expert.antagning.se.xml b/swamid-1.0/expert.antagning.se-ecs-sp.xml
index 4e8a633f..4e8a633f 100644
--- a/swamid-1.0/expert.antagning.se.xml
+++ b/swamid-1.0/expert.antagning.se-ecs-sp.xml
diff --git a/swamid-1.0/flax.nettst.chalmers.se.xml b/swamid-1.0/flax.nettst.chalmers.se-adfs-services-trust.xml
index b7f3fe7a..b7f3fe7a 100644
--- a/swamid-1.0/flax.nettst.chalmers.se.xml
+++ b/swamid-1.0/flax.nettst.chalmers.se-adfs-services-trust.xml
diff --git a/swamid-1.0/fordrop.irt.kth.se.xml b/swamid-1.0/fordrop.irt.kth.se-shibboleth.xml
index 47d16166..47d16166 100644
--- a/swamid-1.0/fordrop.irt.kth.se.xml
+++ b/swamid-1.0/fordrop.irt.kth.se-shibboleth.xml
diff --git a/swamid-1.0/ft11_idp-metadata.xml b/swamid-1.0/ft11.ladok.umu.se-ecs-idp.xml
index d8f952d3..d8f952d3 100644
--- a/swamid-1.0/ft11_idp-metadata.xml
+++ b/swamid-1.0/ft11.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/gallus.scilifelab.se.xml b/swamid-1.0/gallus.scilifelab.se-shibboleth.xml
index 1b6f57aa..1b6f57aa 100644
--- a/swamid-1.0/gallus.scilifelab.se.xml
+++ b/swamid-1.0/gallus.scilifelab.se-shibboleth.xml
diff --git a/swamid-1.0/graduateland.com.xml b/swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index 0b235b7c..0b235b7c 100644
--- a/swamid-1.0/graduateland.com.xml
+++ b/swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
diff --git a/swamid-1.0/hbidp.hb.se.xml b/swamid-1.0/hbidp.hb.se-idp-shibboleth.xml
index 2410b430..2410b430 100644
--- a/swamid-1.0/hbidp.hb.se.xml
+++ b/swamid-1.0/hbidp.hb.se-idp-shibboleth.xml
diff --git a/swamid-1.0/hr.su.se.xml b/swamid-1.0/hr.su.se-shibboleth.xml
index 57a544cb..57a544cb 100644
--- a/swamid-1.0/hr.su.se.xml
+++ b/swamid-1.0/hr.su.se-shibboleth.xml
diff --git a/swamid-1.0/hubbletest.ladok.umu.se.xml b/swamid-1.0/hubbletest.ladok.umu.se-aws-sp.xml
index e5ad3a10..e5ad3a10 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se.xml
+++ b/swamid-1.0/hubbletest.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/hubbletest_idp-metadata.xml b/swamid-1.0/hubbletest.ladok.umu.se-ecs-idp.xml
index a68f30e9..a68f30e9 100644
--- a/swamid-1.0/hubbletest_idp-metadata.xml
+++ b/swamid-1.0/hubbletest.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/identity.mdh.se.xml b/swamid-1.0/identity.mdh.se-idp-shibboleth.xml
index 3ac77e3e..3ac77e3e 100644
--- a/swamid-1.0/identity.mdh.se.xml
+++ b/swamid-1.0/identity.mdh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp-fre-1.eduid.se.xml b/swamid-1.0/idp-fre-1.eduid.se-idp.xml
index c0d390a5..c0d390a5 100644
--- a/swamid-1.0/idp-fre-1.eduid.se.xml
+++ b/swamid-1.0/idp-fre-1.eduid.se-idp.xml
diff --git a/swamid-1.0/idp-test.kau.se.xml b/swamid-1.0/idp-test.kau.se-idp-shibboleth.xml
index 0886f1b2..0886f1b2 100644
--- a/swamid-1.0/idp-test.kau.se.xml
+++ b/swamid-1.0/idp-test.kau.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp-test.nordu.net.xml b/swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml
index 7a77a589..7a77a589 100644
--- a/swamid-1.0/idp-test.nordu.net.xml
+++ b/swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.bth.se.xml b/swamid-1.0/idp.bth.se-idp-shibboleth.xml
index 879f8670..879f8670 100644
--- a/swamid-1.0/idp.bth.se.xml
+++ b/swamid-1.0/idp.bth.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.chalmers.se.xml b/swamid-1.0/idp.chalmers.se-adfs-services-trust.xml
index 766bf3c6..766bf3c6 100644
--- a/swamid-1.0/idp.chalmers.se.xml
+++ b/swamid-1.0/idp.chalmers.se-adfs-services-trust.xml
diff --git a/swamid-1.0/idp.hgo.se.xml b/swamid-1.0/idp.hgo.se-idp-shibboleth.xml
index c861ac14..c861ac14 100644
--- a/swamid-1.0/idp.hgo.se.xml
+++ b/swamid-1.0/idp.hgo.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.hig.se.xml b/swamid-1.0/idp.hig.se-idp-shibboleth.xml
index 418e5e69..418e5e69 100644
--- a/swamid-1.0/idp.hig.se.xml
+++ b/swamid-1.0/idp.hig.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.his.se.xml b/swamid-1.0/idp.his.se-idp-shibboleth.xml
index c4670149..c4670149 100644
--- a/swamid-1.0/idp.his.se.xml
+++ b/swamid-1.0/idp.his.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.hkr.se.xml b/swamid-1.0/idp.hkr.se-idp-shibboleth.xml
index d88772b4..d88772b4 100644
--- a/swamid-1.0/idp.hkr.se.xml
+++ b/swamid-1.0/idp.hkr.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.irf.se.xml b/swamid-1.0/idp.irf.se-idp-shibboleth.xml
index 3bc56d52..3bc56d52 100644
--- a/swamid-1.0/idp.irf.se.xml
+++ b/swamid-1.0/idp.irf.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.it.gu.se.xml b/swamid-1.0/idp.it.gu.se-idp-shibboleth.xml
index 589c1f58..589c1f58 100644
--- a/swamid-1.0/idp.it.gu.se.xml
+++ b/swamid-1.0/idp.it.gu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.it.su.se.xml b/swamid-1.0/idp.it.su.se-idp-shibboleth.xml
index f8eeb2a2..f8eeb2a2 100644
--- a/swamid-1.0/idp.it.su.se.xml
+++ b/swamid-1.0/idp.it.su.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.kau.se-saml2.xml b/swamid-1.0/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml
index ab880659..ab880659 100644
--- a/swamid-1.0/idp.kau.se-saml2.xml
+++ b/swamid-1.0/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml
diff --git a/swamid-1.0/idp.kau.se.xml b/swamid-1.0/idp.kau.se.xml
deleted file mode 100644
index eec3e018..00000000
--- a/swamid-1.0/idp.kau.se.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kau.se/simplesaml/saml2/idp/metadata.php">
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Karlstad university (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Scott</SurName>
-    <EmailAddress>paul.scott@kau.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/idp.kmh.se.xml b/swamid-1.0/idp.kmh.se-idp-shibboleth.xml
index 1ffb44f3..1ffb44f3 100644
--- a/swamid-1.0/idp.kmh.se.xml
+++ b/swamid-1.0/idp.kmh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.konstfack.se.xml b/swamid-1.0/idp.konstfack.se-idp-shibboleth.xml
index eec09d93..eec09d93 100644
--- a/swamid-1.0/idp.konstfack.se.xml
+++ b/swamid-1.0/idp.konstfack.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.lhs.se.xml b/swamid-1.0/idp.lhs.se-identity.xml
index d7b520c3..d7b520c3 100644
--- a/swamid-1.0/idp.lhs.se.xml
+++ b/swamid-1.0/idp.lhs.se-identity.xml
diff --git a/swamid-1.0/idp.lnu.se.xml b/swamid-1.0/idp.lnu.se-idp-shibboleth.xml
index db815b90..db815b90 100644
--- a/swamid-1.0/idp.lnu.se.xml
+++ b/swamid-1.0/idp.lnu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.mah.se.xml b/swamid-1.0/idp.mah.se-idp-shibboleth.xml
index 55b95bbc..55b95bbc 100644
--- a/swamid-1.0/idp.mah.se.xml
+++ b/swamid-1.0/idp.mah.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.nordu.net.xml b/swamid-1.0/idp.nordu.net-idp-shibboleth.xml
index 13f1088e..13f1088e 100644
--- a/swamid-1.0/idp.nordu.net.xml
+++ b/swamid-1.0/idp.nordu.net-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.rkh.se.xml b/swamid-1.0/idp.rkh.se-idp-shibboleth.xml
index e0873003..e0873003 100644
--- a/swamid-1.0/idp.rkh.se.xml
+++ b/swamid-1.0/idp.rkh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.secure.su.se.xml b/swamid-1.0/idp.secure.su.se-identity.xml
index 64d32d23..64d32d23 100644
--- a/swamid-1.0/idp.secure.su.se.xml
+++ b/swamid-1.0/idp.secure.su.se-identity.xml
diff --git a/swamid-1.0/idp.student.bth.se.xml b/swamid-1.0/idp.student.bth.se-idp-shibboleth.xml
index 15d5f744..15d5f744 100644
--- a/swamid-1.0/idp.student.bth.se.xml
+++ b/swamid-1.0/idp.student.bth.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.suni.se.xml b/swamid-1.0/idp.suni.se-adfs-services-trust.xml
index 87016da9..87016da9 100644
--- a/swamid-1.0/idp.suni.se.xml
+++ b/swamid-1.0/idp.suni.se-adfs-services-trust.xml
diff --git a/swamid-1.0/idp.test.umu.se.xml b/swamid-1.0/idp.test.umu.se-identity.xml
index 9b301645..9b301645 100644
--- a/swamid-1.0/idp.test.umu.se.xml
+++ b/swamid-1.0/idp.test.umu.se-identity.xml
diff --git a/swamid-1.0/idp.umu.se-saml2.xml b/swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml
index 5650f360..5650f360 100644
--- a/swamid-1.0/idp.umu.se-saml2.xml
+++ b/swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml
diff --git a/swamid-1.0/idp.umu.se-saml1.xml b/swamid-1.0/idp.umu.se-shib13-idp-metadata.php.xml
index 500b3a78..500b3a78 100644
--- a/swamid-1.0/idp.umu.se-saml1.xml
+++ b/swamid-1.0/idp.umu.se-shib13-idp-metadata.php.xml
diff --git a/swamid-1.0/idp1.irf.se.xml b/swamid-1.0/idp1.irf.se-idp-shibboleth.xml
index 3e14b10f..3e14b10f 100644
--- a/swamid-1.0/idp1.irf.se.xml
+++ b/swamid-1.0/idp1.irf.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp1.unit.liu.se.xml b/swamid-1.0/idp1.unit.liu.se-idp-shibboleth.xml
index 02bffddc..02bffddc 100644
--- a/swamid-1.0/idp1.unit.liu.se.xml
+++ b/swamid-1.0/idp1.unit.liu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp2.hig.se.xml b/swamid-1.0/idp2.hig.se-idp-shibboleth.xml
index 86717c23..86717c23 100644
--- a/swamid-1.0/idp2.hig.se.xml
+++ b/swamid-1.0/idp2.hig.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp2.hv.se.xml b/swamid-1.0/idp2.hv.se-idp-shibboleth.xml
index e29ce4b4..e29ce4b4 100644
--- a/swamid-1.0/idp2.hv.se.xml
+++ b/swamid-1.0/idp2.hv.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp2.kau.se.xml b/swamid-1.0/idp2.kau.se-idp-shibboleth.xml
index a07393bf..a07393bf 100644
--- a/swamid-1.0/idp2.kau.se.xml
+++ b/swamid-1.0/idp2.kau.se-idp-shibboleth.xml
diff --git a/swamid-1.0/iidp3.hv.se.xml b/swamid-1.0/idp3.hv.se-idp-shibboleth.xml
index e0edfb9e..e0edfb9e 100644
--- a/swamid-1.0/iidp3.hv.se.xml
+++ b/swamid-1.0/idp3.hv.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idptest.test.it.gu.se.xml b/swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml
index 3c0c759e..3c0c759e 100644
--- a/swamid-1.0/idptest.test.it.gu.se.xml
+++ b/swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/ilearn.dsv.su.se.xml b/swamid-1.0/ilearn.dsv.su.se-shibboleth.xml
index 4bfc76d3..4bfc76d3 100644
--- a/swamid-1.0/ilearn.dsv.su.se.xml
+++ b/swamid-1.0/ilearn.dsv.su.se-shibboleth.xml
diff --git a/swamid-1.0/it11_idp-metadata.xml b/swamid-1.0/it11.ladok.umu.se-ecs-idp.xml
index 1881bb00..1881bb00 100644
--- a/swamid-1.0/it11_idp-metadata.xml
+++ b/swamid-1.0/it11.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/its-pd0001.ad.umu.se.xml b/swamid-1.0/its-pd0001.ad.umu.se-shibboleth.xml
index e2dfe2ed..e2dfe2ed 100644
--- a/swamid-1.0/its-pd0001.ad.umu.se.xml
+++ b/swamid-1.0/its-pd0001.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/its-pd0030.ad.umu.se.xml b/swamid-1.0/its-pd0030.ad.umu.se-shibboleth.xml
index 95f0e529..95f0e529 100644
--- a/swamid-1.0/its-pd0030.ad.umu.se.xml
+++ b/swamid-1.0/its-pd0030.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/its-pd0062.ad.umu.se.xml b/swamid-1.0/its-pd0062.ad.umu.se-shibboleth-sp.xml
index 87ea54c1..87ea54c1 100644
--- a/swamid-1.0/its-pd0062.ad.umu.se.xml
+++ b/swamid-1.0/its-pd0062.ad.umu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/jabber.nordu.net.xml b/swamid-1.0/jabber.nordu.net-shibboleth.xml
index fb6c4bd0..fb6c4bd0 100644
--- a/swamid-1.0/jabber.nordu.net.xml
+++ b/swamid-1.0/jabber.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/jira-test.it.su.se.xml b/swamid-1.0/jira-test.it.su.se-shibboleth.sso.xml
index 8449c4f4..8449c4f4 100644
--- a/swamid-1.0/jira-test.it.su.se.xml
+++ b/swamid-1.0/jira-test.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/jira.it.su.se.xml b/swamid-1.0/jira.it.su.se-shibboleth.sso.xml
index e7527c99..e7527c99 100644
--- a/swamid-1.0/jira.it.su.se.xml
+++ b/swamid-1.0/jira.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/kib.ki.se.xml b/swamid-1.0/kib.ki.se-shibboleth.xml
index baa4cbc8..baa4cbc8 100644
--- a/swamid-1.0/kib.ki.se.xml
+++ b/swamid-1.0/kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/kiidp.ki.se.xml b/swamid-1.0/kiidp.ki.se-idp-shibboleth.xml
index 2348f570..2348f570 100644
--- a/swamid-1.0/kiidp.ki.se.xml
+++ b/swamid-1.0/kiidp.ki.se-idp-shibboleth.xml
diff --git a/swamid-1.0/kilwdev.it.ki.se.xml b/swamid-1.0/kilwdev.it.ki.se-shibboleth.xml
index 69df0b77..69df0b77 100644
--- a/swamid-1.0/kilwdev.it.ki.se.xml
+++ b/swamid-1.0/kilwdev.it.ki.se-shibboleth.xml
diff --git a/swamid-1.0/kurser.math.su.se.xml b/swamid-1.0/kurser.math.su.se-shibboleth.xml
index 5f5a0956..5f5a0956 100644
--- a/swamid-1.0/kurser.math.su.se.xml
+++ b/swamid-1.0/kurser.math.su.se-shibboleth.xml
diff --git a/swamid-1.0/kurser3.math.su.se.xml b/swamid-1.0/kurser3.math.su.se-shibboleth.xml
index 25906657..25906657 100644
--- a/swamid-1.0/kurser3.math.su.se.xml
+++ b/swamid-1.0/kurser3.math.su.se-shibboleth.xml
diff --git a/swamid-1.0/ladok-test.su.se.xml b/swamid-1.0/ladok-test.su.se-shibboleth.sso.xml
index d0b8e327..d0b8e327 100644
--- a/swamid-1.0/ladok-test.su.se.xml
+++ b/swamid-1.0/ladok-test.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/ladok.su.se.xml b/swamid-1.0/ladok.su.se-shibboleth.sso.xml
index 02b43720..02b43720 100644
--- a/swamid-1.0/ladok.su.se.xml
+++ b/swamid-1.0/ladok.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index 0296f2df..00000000
--- a/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-00.ladok.umu.se/gui-sp">
-  <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://ladok3-00.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-00.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJANyLphmqAiCsMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTIwNjI2MTMwNDAyWhcNMjIw
-NjI0MTMwNDAyWjAhMR8wHQYDVQQDExZsYWRvazMtMDAubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4lukmN1u10uEnOWVd7LjVUjl
-9U0U4UKGSy8/zJBKqatk5E+JW6LVB9wZDx85kUPOrflBc72brXWx2x03yne06X6n
-Ywr7a1Gp2bQKyw8IuXAxoTgG6IYEWtpoFmX/IKkOwCgb9qBnaije51BKDbFz9GMy
-n7FaSy6lHm5QrzYAXJDKippsEInJYEChhjYNuFImGySYxYVkmgqXVqW7caZYOwQC
-xERDtsPJwUluO8dRbzzcmQxlhstzr0GQkAnwodtP9cCmvO2SUboNVbxNQmL4Er9D
-Vzn+EiTW1jZaYOfQi+BfLSwZt/aWPBLMg2q3voeu3u7gCyMGcdN3SoG8dEoU4QID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDAubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wMC5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBS8Q9eh
-YSdw4S9o1UfOdXlrgS5owTANBgkqhkiG9w0BAQUFAAOCAQEAM3LCbyt/tuBMlNap
-X3OCJlCz/sQOiSbDgG154z3VzXLVYM1seUjCFWwPpO7kw3hS0kvNxAEQS59eaJkD
-MIno0z+OT3OTnr30ERGZAVZ4cX79Ww2nX1mtWJN1WB9M40XeUFXGIvoVR5LckNyH
-ax8gu3I2/RzG8yS0F4fH5Kz1eDZaaSBtQV2mWkps3x4fEOvh3qFc373bUmL1Ms2g
-eWORbwxcAgGd59kxtofZzDjrx6o2qT8ELV5iD7yQteLe91Flh1/5U07EXlvJLMz3
-kqFto5NOuXUYh/srUMR0mzAVUbECgIbU7Os7gpUno65QsP8rJEdwHzig9WNLpoy0
-w5aKug==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index 4a342d44..00000000
--- a/swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-01.ladok.umu.se/gui-sp">
-  <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://ladok3-01.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-01.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAIp2R64De+1HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTE0NzE4WhcNMjIw
-NjI3MTE0NzE4WjAhMR8wHQYDVQQDExZsYWRvazMtMDEubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwt+lqNvFGei/9H+xjcCTR6r
-gI5yUPlyK2ysVPvEk74oeWxFaCcHuvaiNUGjMwTyPiHSGijnyX9rHPfDTjphasn0
-M+OXn0j4RIBv6+tfLWr0NVM4CDK11/Dl34OivYe0bIx0hLhT+bXGddtb7AhNrzyi
-yN7eMtH8xVE4W0aZerCO0u7RR8fH/M8NE/Ge13cnoBgZH/oTVnQw4ZxwHmjGP9Ex
-tigoTyTwfYYGLt/Yx2Vg2dxJJPQ2oIiiaWN0/XxDy/hd3A5M9m5ZuJIzeflmVJLh
-4b9XsBzlbsK8KKiEKxDOUl9Gd8Lngl77kpFeephnngOMZoGQelFXPPalEndiUQID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDEubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wMS5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBTOzWRf
-EnLCvB5g3eADi4xLMzCoszANBgkqhkiG9w0BAQUFAAOCAQEAST3NMUyn+LDBfrts
-dfWxEJqOwHRplwn8eLNJHIdHkGjuLoR4cd1p40TLoMZrA/p6zU65oNrH9RYGiAOx
-Aac35aJFgxDJm1R/x1mt6cAa7OmuJ0Zt2m4TCUsapPbpkKlZFwwH3JLqAyUXo/8d
-xcMCpGhUSP5Cs4L/HeJhFwQpf1UnQB1s8z4dfctQtzTkj5z3uZeHYir6U+slvK7w
-0zvLTz/CibUY0lmIhwyt5TvkJBqQ2ybSOwOtHL5ysMthtFoNGIXznFAITAMk8eOu
-/HIhJOQBcAW1bMonM41YOZsCP/FtAoskCFRWYck704VF6IKzZAxoq0PiN22YFjL7
-p012eg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index a1a0c69e..00000000
--- a/swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-02.ladok.umu.se/gui-sp">
-  <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://ladok3-02.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-02.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAKkfw5OYQuJUMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wMi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA1WhcNMjIw
-NjI3MTIwODA1WjAhMR8wHQYDVQQDExZsYWRvazMtMDIubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrKdicJ4U684dz98qpSo/0xy
-Yj0eXFxZAiEXwrs/YXbu7D3ARFj8+Yjq0/Ivbfn8eeVmmnbrVpusH0rNsmoqj0Cw
-tgEKDYVqc1yS3DPBai8ro59y2YCU31o9tkFlyW6s2DlXXt4M2uchzwpFTN9Z9VaL
-qGz31NByU91OoQN6j88s7RqNbcrr2It57WzJksVFyr/3I/q6RJfuPgNbvMtB9iHd
-xjo+llICYfgyWrPTsTwNNtMTYQqb92kzPpqfNAVs/sv7900yWqMOxWUwS9PKsGP8
-yEdUAIoCIB5XEPnHwG06xZk0yJUnxzMZvQGBt+dDQZCrVlDtdcZtUDMx9o7WUQID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDIubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wMi5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBRNewi9
-E/XWeyPWMU8CQFjIWzR/PzANBgkqhkiG9w0BAQUFAAOCAQEAJa0DqwF6oXNoINMS
-xfzcgT11I2w1bkQLONHD/8Tt1KK42ipRD6C77dwiDYbm4b7U9LnGzq6O9idbPIlm
-iARDunfFl5xa4Xdi6JhQOKcaTJJdazX1xRFAhGGanqWqe6v6VAmlQ2vPSXvcDwtc
-uBkmvzHRQbue9i7dlahS/vDcgMljFBLIG46/JHR4KUYSZ0L1Py4Mjz6VDaWa9/3a
-j/197cLFOqRKhCGGDqc11/lxeVe9dARi1hPzBcvXvQUzj9kSOg7i3aG1ZdMLBWGR
-C4VzPRIzsz/8B2XRLTrkuN72pl/sHIW2kyR5OY1F3+Q5etKnEXeEsE6W5gX7QTr/
-BeVqTg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index 855b100c..00000000
--- a/swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-03.ladok.umu.se/gui-sp">
-  <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://ladok3-03.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-03.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAPlFHKS4Gb/vMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wMy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA3WhcNMjIw
-NjI3MTIwODA3WjAhMR8wHQYDVQQDExZsYWRvazMtMDMubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3ah5ehmINht8OmgX38/BIvlm
-z1njTjAKgpEX5jVpl2wzd5+S5+xBLLjVjePow/KrhdtqohschKyTh8Axu0lWaCfP
-B8RHa2ZhC4Rg4pQ6tmePL/KiGshP30CTmHd2rQZXFWLLwjOJZC+PfBOFl6hZmd7z
-YiFsUkgvebqTRqZL9bBFgg7OyacxbSKIR474C1ovObnJ8ro/EcFkVU2l/e6QixWR
-w/orVGYIUnBfG1ThnzE2b5DxqH/t4NBbKuf6LI/ldzKZaGyTwkQF1q7z0yzwzWpo
-BRMRD9CUftWzmKDwUcu1GH4BSiqXRKUHAkE3ZtDnSy5+ElQ7WhQhZ5HpXyeQMwID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDMubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wMy5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBRne1Xp
-EA2MWtH1uhd7IKhfx+4QqDANBgkqhkiG9w0BAQUFAAOCAQEAivdVwn1RFPCcbr6p
-LU/dmlhNii5kLwYP3kDsWuLW2MoYrvP2EpfxmNNatPXNZbZuUEWZXt5yH55iLMa2
-qrKr6BXjYqokCxyngchltd6Gv4GN0Fl7nnbSxfy/I7W8zqGZxfA72P4sgS+seX11
-NcNpFMV6o10QNJ6rgoO/LR4qAesMLbEl1BWNgyKkvCrOptvN24n0EiZy5U8tBOoT
-FqLiIetDB2M7PnLP7SjVhbVpn6u5+GAUx0qIXpX9LNHwQs047tUWijEDWSHaTtyv
-Eg6T84xmStOZ2LpNTlFI8wnu2j8D1CrExsUpCOiuddPGp3zI7se2DGqXo9ZGe4tO
-OqxKbw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index 3d9d28b6..00000000
--- a/swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-04.ladok.umu.se/gui-sp">
-  <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://ladok3-04.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-04.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJANPtBqZBdS0tMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wNC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA5WhcNMjIw
-NjI3MTIwODA5WjAhMR8wHQYDVQQDExZsYWRvazMtMDQubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5xFv5om6PNpOo9l6kxcd0+KK
-BC/qKPFtgmDrgU5ab/0QUBGwyr5NRQcXBFtuXtLTr1wVlggmJg8ScdC/6WGFaj/6
-sC9OUIxAN18DjXUySvTtLWTPo9QGVNGeTKkanLmuE+ZbkKzMkWqs92BdqcrybB6I
-qP/34M83u0Dl11aQUanBEzp7dddEXvpwjGNUjGhg+7Yp2KIx4BLECXPKH6e7jq+F
-joT7kduaSI/uGqgrWhuOX9fjzQmFn1/nC7ofd6NTRLvX2NmxiACIp+yJ1M7lPfjp
-dF4YRwRRXkkWFcX1b2ZiP/ByQ9imytgi3T+A9e/MX74u1ag4/MI03GbCwt7ANQID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDQubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wNC5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBTAG+rA
-GMVRIVIHzxQ9UdKzBjEujjANBgkqhkiG9w0BAQUFAAOCAQEACfVBkZuIyVuDCdV3
-HCmZ2eWfp/htS3tuCig2SABtx7KNR1TAVNRofyM7uBKOxCwI5XLRkoyKUWYfQbSY
-Tn3Rl/T5lPkRnJDAHBQJXFtkqB9NLYQc7EtSjxoyYVaxqIwZIkUvZmt1Bk2vTy0H
-iSjjrebMwzKsUeJvZvD2OaSO1Q0itMJjwlKydSNCefLVGZ1kGutzoz+jgJr8dw7w
-m5TVPtJ9JYyx7rxk0bE1Q/Z9r1VfWJYRMeEur8OttyxzlJj0gkI6zLgPwyXaDE7p
-psn62LqB/yCbuQgQ9UDHa3SvDgg9HGAEvk+xvT9upqmmvXTP1Afr0gB0EW6PvcVP
-AMLCoA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index 70c2fcfd..00000000
--- a/swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-05.ladok.umu.se/gui-sp">
-  <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://ladok3-05.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-05.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAPDhwPdGcyx3MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wNS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEwWhcNMjIw
-NjI3MTIwODEwWjAhMR8wHQYDVQQDExZsYWRvazMtMDUubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxWwMUAWTSXZEZna0VhGPOocl
-jY+eNJ1VdGfNKH4naUenG3KRqK87K9hKiwI4t1e8YU28hTR2uRtxyeUF3iHBU1DM
-wAT0C0AJ5dCYMq24BTrkvs98/mpkWTFgT3l2zNjNUBASWjXvgTeeIlqeX+Dh/Nzw
-EfWx50yfKNOiWPWV14QhdwjMJvIJPBHWbzxhmURlGzUQ3/H8HwuW1vqe/gU4zCOR
-qE5EccNgWzzy2tZheRAi0Upm0+Ge4c9QrrrQLQQrorkuLVxCSgoIO2/4vLz9O39W
-0fxQdt9vIk94IMdGGB+1IAzMNiHDYUY9odU8wdkHinzZhWaWQ6F8mmBs1y+h/wID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDUubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wNS5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBRIMIrP
-tMdrVcWNtYYFCXhZzcu7/jANBgkqhkiG9w0BAQUFAAOCAQEAD31ZFs87nSUzgMGM
-RCR6WZ+sYYejsjikiq7nPvCclHWPoa2cn0q8LPtKGuWAfTR6u+3NXUpHHvpR+MEZ
-WHeoF7atdEl4ecvk+cWO830Cq4Kthwzd3hHQnqe4YNLPwNiVHeizZLxDrtXuQtqW
-0lPCIu9EsRhIHw1R0oxZ8b/rCmHyGFtVjv9Sre3nAlGC4ZwRM04jc5NoUfTfFjZi
-Q5cOumnObMzqS5d00Hr0BvCuUng2Ms/ZpF+BzxLyyw6LGq8oE10+d1NMMwrYqiRk
-qmThXK3vArMK9TCy4XBUdjbsXhwMSJ1Zez2abXJmkykRHgoWHKdULuGjAld/gaWm
-Ij/QYw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index 67c94c4e..00000000
--- a/swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-06.ladok.umu.se/gui-sp">
-  <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://ladok3-06.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-06.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJALk1rPJOG1teMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wNi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEwWhcNMjIw
-NjI3MTIwODEwWjAhMR8wHQYDVQQDExZsYWRvazMtMDYubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy7RjhC7f4/gfQK127LuRggwD
-6VUcajCmZ8HpXZp29b/ghxNhgVlLDiIrLpD+bDaRoyJ20VssaWJ7KdLj2jFAjOmz
-CfPhvAd3kVmLLvVVOG12XlOh81RdQKZBm6qkvC/kTS6fxUHkympbGzFPmhGt6kEs
-z6BbdoOTzXTlXO4/H5N7N9ShspBhbc9NETinrPtIIykgjHSbfWMVdYQqCJbIdbM7
-y61Re55wfl8m6ppNra+oykYly2jhvlN0Vb4QGqpJBB0XzOAVh/DHt9oEDryxxaeG
-6JVhDwD15vx4tdm6ypd7qwNXp0c9nYteYNiSL+qXisKVJZ/JLcllxC7dLZ6GHQID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDYubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wNi5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBRK+n8d
-wSrEb8l1peNFBoe/bchVGjANBgkqhkiG9w0BAQUFAAOCAQEAqV8BTMudvEvzIUu1
-7bdjIVNCvNRb914WsPmQR6KhKhRzHVRJFqeSkMtvzCTi4YzaNE59l6iKcFG20ffZ
-O5WwEUhy8TtPgLrdK+Zi1rYfE3pULUs+LQLxz3h0reEW35y084ahB9uhYdkfjqEU
-/8LYg09v4gGOnjCLLj+mOEjpH7oVMWPuLSPbgL8RMfBX1SF51pDs1tp+rjGdbc7c
-PsCzYLHD+n9ygXpZsmmVmYi0YjZbrpYOLJlg/IU+jTfQ8ag4d8QEEz6Zfv+BL8iy
-U5ov36jyE84soQ3NsxFo3cndYZE3Epi7pMNaKAO2OUlS2R2R+l/9pdyzQqcOU6bq
-z181Cw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index 491d4462..00000000
--- a/swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-07.ladok.umu.se/gui-sp">
-  <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://ladok3-07.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-07.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJALmf8Dsfzo7FMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wNy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODExWhcNMjIw
-NjI3MTIwODExWjAhMR8wHQYDVQQDExZsYWRvazMtMDcubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzEG4o2J3L67j6nYIHR3QLRDG
-UHr3fslU7DbyUWXCt/KFZ0kvKPMu8tZRhMDyY30sPcb+q/Y3j2sLAL+e9zfw99Jb
-3FWya100c8/G+Rj0MB/YKGE+FDqknSCCz4Lqq24ZTBcx/PZeg7dOD1PuNPLcf70q
-Jq2Sv20JCV1HWx1IcYXy2lz7xOelBem0l80J7Wvmmxm2lXNwDFk8BieMAZB3IILy
-czbEkv57c7n7nladzP8h+N6Tjl1970/FSONPjzmCluzA+1HEBV+k74xL4UqhzVeT
-4qtb1U+1SjT1ptXMZXrSdTQu6OJZsHHkRlcQ3tXyV6mcERGlgfKjmMPGYFEcVwID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDcubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wNy5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBSZUY2a
-I5a11kJUImB9vYgmMRHMXTANBgkqhkiG9w0BAQUFAAOCAQEAMiC2g5BTkeg2Hbv+
-lQKqQQr98luYHRvq73X29VugyQ6M/P45a+WoNZYhdcZY6H0xiOhabLNRS5tuyXHo
-7jiViy978WQ+j3n57I+PfhYRIBTtAePxPTktQg/jXfgvCT5NJmh+MC2EIeaMH4cR
-YP9Jt8TrLyBOiIpQGnPmxbagAb4X0VNJ1kwA7SkpRexxxESZcHBE4fTveG5H14+l
-r4n/T3toliD0lP8WA2tafbkPzdQUgtsCNzL0L/6CW5RsrlokMKOGZBQBS4EPbtgw
-LRt4O9+n+IeXQn445+k59QZ72enbnRThjnGDHA4Xw620T5LlKVHywEozdtaXBQSK
-LB5BtA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index 44a0d735..00000000
--- a/swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-08.ladok.umu.se/gui-sp">
-  <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://ladok3-08.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-08.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAO+EZXmznxmtMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wOC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEyWhcNMjIw
-NjI3MTIwODEyWjAhMR8wHQYDVQQDExZsYWRvazMtMDgubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv8nfrfVZ7TnvQgRRXJEZowbO
-3vkDb6MenmraW2xYLfdn5j0bL+gFxMpa7WDIizo6JnEEidR5a/6xtqSiVRpOJxdq
-nraCu3sRT+olX/KtS7appB4Vn1BNwEyTxF/nAyofVZagygSb4eNHsbLm6MQCGTAl
-1Wg7tNPw+bJUbTLHZuiJJKS+UJJ+tL0Rw+W5NHd8jIpdV53zygO8bk/cWC7Ua0Mg
-/0Yhe8pL8trjzItyWS56h4xoACS4SNdJ4XoMGKrNvdQFFXIiRZhBayPENVVJCbA1
-7uwJ7ZhFTkATs40sc8qHmjsvquN0HhJ+2omUKMVcXXUyTyHSyvrVEHbfW8/6eQID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDgubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wOC5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBSWFhOQ
-81n5zVJUDnIHuNuaJMcC+jANBgkqhkiG9w0BAQUFAAOCAQEAFnLVLW8ENWOeYaYv
-EyKXmwndeagEBvN9MSFJqCmxe/m2HAcDJdOiXv6h31KndZL2DEGIr+qlXBMRIJUT
-6vJQ5pL4K2bnFPTKcnrKpLeguxxj9AT8zLUrYg2tHqoRVWiOCLq5QJDSz9VsZelD
-69VA2Xw9wO+4yLyH8JXngId+7d49wmJ0QfxI3lbiwV2hzVAFk4lTfZC90Rm7lOGM
-6gfXr5KnZOETbq2p4PWHn6zYIAn5hQNn/1tu7yj5jymyI2MWFQFi8tR1dNj76xg5
-8km3byhc201hWx7aRcr/skljVphTbHlLYyACjpPtVpG/rXjAJgtkBNYY9n+c95i8
-MTpiVw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index f16433db..00000000
--- a/swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-09.ladok.umu.se/gui-sp">
-  <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://ladok3-09.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-09.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAKnMW8LPLkEoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wOS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEzWhcNMjIw
-NjI3MTIwODEzWjAhMR8wHQYDVQQDExZsYWRvazMtMDkubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyNnQD7SBvtAMC0kvrPfUtMOZ
-6fY6MksXUGNa6wIoBtdt6ZSuURkq7l1rhLBc+FFdhDFkHjt0SVN7BdRAjJaUNTrs
-biJVIyBtCtI5HbMpL2vQi1YpNlN6LfmFsm+ut9G3xhWhifdg78g0sY1QErqgyNgs
-Cs+zryCOWOfbgUvTh2AQb9kWpk2BIWsa64lWhZnruK5JUq0W+pxIXQqu6jAvRQmJ
-dRC3SqEbWCKE7uk5ySY3Jpe0YhxUbKKsL9ia5HSWimIZx4ZA1dH8RhpzSKzMJmZq
-f97eZWL3p34ntiaJnz8HRXQDxmUx7bU17BW33T6C2ehPvNu9DB8ybyvNOjVolQID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDkubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0wOS5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBTWc4dV
-V1comwSY+H6Ty/8rf+sGNTANBgkqhkiG9w0BAQUFAAOCAQEAqtzl0rkzxibQm6tm
-rMNTCcX/PX+nMiNxhhCzQ21mKISqldi2kW3i1vVai2uflVaIgzd9gFTfZcuGRge0
-FA6xppdElB9b54zKgYx6+rik6Kqt4VauC0h538uksZIGUPR3/LnwZupU+pGPs7Hz
-06BU3xMEw8d6TU5CjjoNPGH7wKdLZQPix8rxwofU93/W9+EfHfcKsnLOx00ZA1VS
-Ow9hfQODJL668gQFmM5SXNAJQ+b/No/CpyddFmhrJvvHwFBL+NjHTwkvd/yQVkPZ
-fMRHK538nNk48dNxRXnWvPieMN1edjNbuEDB8ZhuOcW1U4XCiZF61YyIIwcz+0Pp
-QwOzJA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index c03ab186..00000000
--- a/swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-10.ladok.umu.se/gui-sp">
-  <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://ladok3-10.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-10.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJANmj0562UQtEMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0xMC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwNzQ4WhcNMjIw
-NjI3MTIwNzQ4WjAhMR8wHQYDVQQDExZsYWRvazMtMTAubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1lxdpJYHPqC33HDuMGg3MZB9
-cLSxZo3PACViWvTf8Czcpyrao2IXBhERwU1BhOke+HgqZ5/tndWx0f7ExIMVYEEb
-6WddV3DpukOZYiVIA9y0Wdvgb51sLDragY7qAkwfiqCNdSJ1/yPKOXuMHk5Krc1W
-Lm/DPmNTFOeCQNCdMb33Bt84dFFhCKYuk/XngHp8XaSw9xpWblWyRA5kBRVFzmA6
-uQrFL7jA0fxnTtTqrXu1PGZ1fyGpO1py9GNCDgSe0vv1u8m3lr7gABDX4+YckZtr
-EPnA6oSpOtL7OFjZlH90eLNSJ8afAD5vVmwsx+cPPlAHTXfDWgICdyReSAvltQID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMTAubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0xMC5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBQ/xUVb
-XS9rp7K9M1ySZEloKQT1UzANBgkqhkiG9w0BAQUFAAOCAQEAqtzsoU/uEDRAqrgg
-R3VG5mvdt5rUkKJtC6naX0lrwliqAK2FZsqSiYoxmxG2noxFMVxyqKHLoF9DbJkt
-WriQD97cMkgc81muFuk+Sl+QQhNf7pY7wEneNZP8EEPsXGQRBfWeZ2mPoOJwbOoY
-xtQUwjCZxXuzEok3JP7ILGBOxOveHANp/CCZZBlRErsCb4sC+6+GZy/UJuTuJdgJ
-PqFQikTAA8nfwIOr7T65d1FnGzpWnCsZSZ2lEldLclyWOpP9/eXe8hZNWrgDxoNi
-oa9eOIASf1NXOsACA5C0aAfW+WF9zOWB42z4E+r9szJ74C/y9FsaUz9++eOOV+vz
-zL2y+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml
deleted file mode 100644
index 4e9a457e..00000000
--- a/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p00.ladok.umu.se/gui-sp">
-  <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://ladok3-p00.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-p00.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-p00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-p00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJALrB0xU/Xw/gMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rMy1wMDAubGFkb2sudW11LnNlMB4XDTEyMTAwMTExMzIyOFoXDTIy
-MDkyOTExMzIyOFowIjEgMB4GA1UEAxMXbGFkb2szLXAwMC5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpbAeLhpRp3k4YRgZev5r0
-H0Qp5DJT2GFGwG0u2rKGx8PRQH9VEcQs+hwoWjRf+ubNgkGRfQlg76FaIg5WLxf3
-orhS1rPRGvLWOocBwq+w9pSLQBSL6NXI0MyQtXx1zTrruPC0Ps5gZ9dxinLg42al
-8Z43IOJpzlxV/og1sk/54r/mRYWr8EO2WZc/m6PkUK5/tJVf2fW5y/uXp9lEd8G3
-SzWicsN5QPnQyjoNUArtJOtdqGraP8Z+f/abB1a0vMoBZIwNj+2/6uC0tVvEE+hQ
-qcVm7KBafsaZnsNNDw847NY7062NiqSotc4k10O9d46lh1l6DUWBVwT1SaJqdFPt
-AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2xhZG9rMy1wMDAubGFkb2sudW11LnNlhiZo
-dHRwczovL2xhZG9rMy1wMDAubGFkb2sudW11LnNlL2d1aS1zcDAdBgNVHQ4EFgQU
-jIZiZRgSHi+Tg9++uEVPoqO0PnIwDQYJKoZIhvcNAQEFBQADggEBAGo8rWUyUsFE
-RnG4ja0Jr6CvmUCDEE8Hf2NR9X2pArHz4jZPN8Y+DJQxXA9z2f3tZyV16gRisz2n
-RyO30vCBYEeoblggXnrpJCHntSTXq+4wGT2nsXQf+OCELx4Fpge0EyHtruZcre+F
-4BT/hr1Zv/bgWYgK3HrD/a7Viez16powiAsO5ScHyXr0ayrwgI/y1v/HdK8jonpz
-Es66FG7elAYpYzzuiIlFApPK7+Bqc/AMklmzVWfB2+XQxnkKQ7B69NvuYldtUChv
-v0hYJMxInGifhVs86hcWvWCc9Cv65UAVGTvCW2KdtFe8n7xuux3KljOXlv8ECcLZ
-vt1mkOs1sbw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3test.its.umu.se-gui-sp.xml b/swamid-1.0/ladok3test.its.umu.se-gui-sp.xml
deleted file mode 100644
index 939b8f3d..00000000
--- a/swamid-1.0/ladok3test.its.umu.se-gui-sp.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" entityID="https://ladok3test.its.umu.se/gui-sp">
-  <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://ladok3test.its.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3test.its.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3test.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3test.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAOFFoTV9Cx36MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTAeFw0xMjA4MjkwOTAxNDJaFw0yMjA4
-MjcwOTAxNDJaMCAxHjAcBgNVBAMTFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKroD208t08N6gii/EEJ3O7veyKr
-b4lVJpukFivjDi61fiSDiHoI1XtD87ZdfDx8XtBA8D9ZyFdIns3ExElsUtWXa40z
-HZseXtMY4hI68ybWC9jb3R4dJp8Sq2tw6KESk95arA7ECTG5P0v+V0JxcSg7cWDh
-3S3THVdYu2lydnoYShzIAx5mf/2zLFz/fuGDAdq28Y8bMisvqIZGFyiBkxNFz/wy
-MIr4Ds0wVpA4lG9wB/jmUZz3FGcOmlavVw+IQUMVEYsByDu2Q839sIGU/OKF6mZK
-V++wy7Amj4lkEA0oEaHNJNEx1SXDkA5ZTKNkVMozE34/Ij/zfeFGcyjoJxsCAwEA
-AaNpMGcwRgYDVR0RBD8wPYIVbGFkb2szdGVzdC5pdHMudW11LnNlhiRodHRwczov
-L2xhZG9rM3Rlc3QuaXRzLnVtdS5zZS9ndWktc3AwHQYDVR0OBBYEFNcPnuEfzd8G
-uldwwzqC/OZY0xtzMA0GCSqGSIb3DQEBBQUAA4IBAQA3oXWtvLTGYGgS8C/Tp9wr
-N1g6Nz8FNOSPcJQhYaAszTQJJWD8m0gBaWIfEADZLKvTN/SrQgmQkPmm+S3M/Kgy
-Uj4FAcZBiyOrD7sbcXBWV5c0o++QRIVW2i9O2t5h5sOE0jXsmVsAewEgVct9HMVp
-LQx3J5M5B+gP9/mQOjHh3gw/jmSDi4cVSu/H6pFp7axGPJ7YZAmb+BUcXectkSxw
-mTDJZjzj3X6cjrVlOyjO7M6OGm0cbUJhufn6mTfXNnL/+QdRvvEV7l8Iz6hfGkzQ
-UEv/iCMoAJgGFRraTZFMDldSSu+MjBUuCi4kZaUImeVa0yXr7qBwZmYvdqgddDKO
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3test.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3test.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3test.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3test.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3test.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/lingon.ladok.umu.se.xml b/swamid-1.0/lingon.ladok.umu.se-8087-sp.xml
index f0609c2e..f0609c2e 100644
--- a/swamid-1.0/lingon.ladok.umu.se.xml
+++ b/swamid-1.0/lingon.ladok.umu.se-8087-sp.xml
diff --git a/swamid-1.0/lists.su.se.xml b/swamid-1.0/lists.su.se-shibboleth.xml
index 7ef17e8c..7ef17e8c 100644
--- a/swamid-1.0/lists.su.se.xml
+++ b/swamid-1.0/lists.su.se-shibboleth.xml
diff --git a/swamid-1.0/livesrv.ex.vr.se.xml b/swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml
index 4c7cdd0c..4c7cdd0c 100644
--- a/swamid-1.0/livesrv.ex.vr.se.xml
+++ b/swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml
diff --git a/swamid-1.0/login-dev.du.se.xml b/swamid-1.0/login-dev.du.se-idp-shibboleth.xml
index c71be766..c71be766 100644
--- a/swamid-1.0/login-dev.du.se.xml
+++ b/swamid-1.0/login-dev.du.se-idp-shibboleth.xml
diff --git a/swamid-1.0/login.du.se.xml b/swamid-1.0/login.du.se-idp-shibboleth.xml
index 309598c1..309598c1 100644
--- a/swamid-1.0/login.du.se.xml
+++ b/swamid-1.0/login.du.se-idp-shibboleth.xml
diff --git a/swamid-1.0/login.liu.se.xml b/swamid-1.0/login.liu.se-idp-shibboleth.xml
index ee4b1136..ee4b1136 100644
--- a/swamid-1.0/login.liu.se.xml
+++ b/swamid-1.0/login.liu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/login.proxy.kib.ki.se.xml b/swamid-1.0/login.proxy.kib.ki.se-shibboleth.xml
index 25a15b18..25a15b18 100644
--- a/swamid-1.0/login.proxy.kib.ki.se.xml
+++ b/swamid-1.0/login.proxy.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/lpw.ki.se.xml b/swamid-1.0/lpw.ki.se-shibboleth.xml
index 4e9762b9..4e9762b9 100644
--- a/swamid-1.0/lpw.ki.se.xml
+++ b/swamid-1.0/lpw.ki.se-shibboleth.xml
diff --git a/swamid-1.0/lpwdev.it.ki.se.xml b/swamid-1.0/lpwdev.it.ki.se-shibboleth.xml
index 4397ce9e..4397ce9e 100644
--- a/swamid-1.0/lpwdev.it.ki.se.xml
+++ b/swamid-1.0/lpwdev.it.ki.se-shibboleth.xml
diff --git a/swamid-1.0/luigi.umdc.umu.se-dw-idp.xml b/swamid-1.0/luigi.umdc.umu.se-dw-idp.xml
deleted file mode 100644
index 0c79ab39..00000000
--- a/swamid-1.0/luigi.umdc.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.nyautb.its.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.nyautb.its.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-1.0/luigi.umdc.umu.se-shibboleth-idp.xml b/swamid-1.0/luigi.umdc.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 4ac3ca3b..00000000
--- a/swamid-1.0/luigi.umdc.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.nyautb.its.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-1.0/mail.su.se.xml b/swamid-1.0/mail.su.se-shibboleth.sso.xml
index a866c60b..a866c60b 100644
--- a/swamid-1.0/mail.su.se.xml
+++ b/swamid-1.0/mail.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/mailfilter-test.nordu.net.xml b/swamid-1.0/mailfilter-test.nordu.net-shibboleth.xml
index 881c7d22..881c7d22 100644
--- a/swamid-1.0/mailfilter-test.nordu.net.xml
+++ b/swamid-1.0/mailfilter-test.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/mailfilter.nordu.net.xml b/swamid-1.0/mailfilter.nordu.net-shibboleth.xml
index b4a7590c..b4a7590c 100644
--- a/swamid-1.0/mailfilter.nordu.net.xml
+++ b/swamid-1.0/mailfilter.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/mailfilter.sunet.se.xml b/swamid-1.0/mailfilter.sunet.se-shibboleth.xml
index fabd3a54..fabd3a54 100644
--- a/swamid-1.0/mailfilter.sunet.se.xml
+++ b/swamid-1.0/mailfilter.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/mds-test.sunet.se.xml b/swamid-1.0/mds-test.sunet.se-shibboleth.xml
index 24d9b2e0..24d9b2e0 100644
--- a/swamid-1.0/mds-test.sunet.se.xml
+++ b/swamid-1.0/mds-test.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/mds.lan.kth.se.xml b/swamid-1.0/mds.lan.kth.se-shibboleth.xml
index 9fc434af..9fc434af 100644
--- a/swamid-1.0/mds.lan.kth.se.xml
+++ b/swamid-1.0/mds.lan.kth.se-shibboleth.xml
diff --git a/swamid-1.0/mds.sunet.se.xml b/swamid-1.0/mds.sunet.se-shibboleth.xml
index 36d51012..36d51012 100644
--- a/swamid-1.0/mds.sunet.se.xml
+++ b/swamid-1.0/mds.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/mds2.nordu.net.xml b/swamid-1.0/mds2.nordu.net-shibboleth.xml
index 71f987ce..71f987ce 100644
--- a/swamid-1.0/mds2.nordu.net.xml
+++ b/swamid-1.0/mds2.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/medieportaltest.kau.se.xml b/swamid-1.0/medieportaltest.kau.se-shibboleth.xml
index fee019fe..fee019fe 100644
--- a/swamid-1.0/medieportaltest.kau.se.xml
+++ b/swamid-1.0/medieportaltest.kau.se-shibboleth.xml
diff --git a/swamid-1.0/meetingtools.nordu.net.xml b/swamid-1.0/meetingtools.nordu.net-shibboleth.xml
index 3768a113..3768a113 100644
--- a/swamid-1.0/meetingtools.nordu.net.xml
+++ b/swamid-1.0/meetingtools.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/meta.eduroam.se.xml b/swamid-1.0/meta.eduroam.se-shibboleth.xml
index 400ea5a7..400ea5a7 100644
--- a/swamid-1.0/meta.eduroam.se.xml
+++ b/swamid-1.0/meta.eduroam.se-shibboleth.xml
diff --git a/swamid-1.0/minastudier.ladok.umu.se.xml b/swamid-1.0/minasidor.ladok.umu.se-shib-sp.xml
index 1d679ace..1d679ace 100644
--- a/swamid-1.0/minastudier.ladok.umu.se.xml
+++ b/swamid-1.0/minasidor.ladok.umu.se-shib-sp.xml
diff --git a/swamid-1.0/minastudier-test.su.se.xml b/swamid-1.0/minastudier-test.su.se-shibboleth.sso.xml
index c05a7ad6..c05a7ad6 100644
--- a/swamid-1.0/minastudier-test.su.se.xml
+++ b/swamid-1.0/minastudier-test.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/minastudier.su.se.xml b/swamid-1.0/minastudier.su.se-shibboleth.sso.xml
index f51430bf..f51430bf 100644
--- a/swamid-1.0/minastudier.su.se.xml
+++ b/swamid-1.0/minastudier.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/mondo-test.su.se.xml b/swamid-1.0/mondo-test.su.se-shibboleth.sso.xml
index 70788502..70788502 100644
--- a/swamid-1.0/mondo-test.su.se.xml
+++ b/swamid-1.0/mondo-test.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/mondo-web.it.su.se.xml b/swamid-1.0/mondo-web.it.su.se-shibboleth.xml
index e6b83993..e6b83993 100644
--- a/swamid-1.0/mondo-web.it.su.se.xml
+++ b/swamid-1.0/mondo-web.it.su.se-shibboleth.xml
diff --git a/swamid-1.0/mondo.su.se.xml b/swamid-1.0/mondo.su.se-shibboleth.sso.xml
index 0e1c777c..0e1c777c 100644
--- a/swamid-1.0/mondo.su.se.xml
+++ b/swamid-1.0/mondo.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/monitor.it.su.se.xml b/swamid-1.0/monitor.it.su.se-shibboleth.sso.xml
index ebaa10b0..ebaa10b0 100644
--- a/swamid-1.0/monitor.it.su.se.xml
+++ b/swamid-1.0/monitor.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/moodle.lhs.se.xml b/swamid-1.0/moodle.lhs.se-shibboleth.xml
index e920ab9d..e920ab9d 100644
--- a/swamid-1.0/moodle.lhs.se.xml
+++ b/swamid-1.0/moodle.lhs.se-shibboleth.xml
diff --git a/swamid-1.0/nacho.adm.gu.se.xml b/swamid-1.0/nacho.adm.gu.se-shibboleth.xml
index 62f3f0ce..62f3f0ce 100644
--- a/swamid-1.0/nacho.adm.gu.se.xml
+++ b/swamid-1.0/nacho.adm.gu.se-shibboleth.xml
diff --git a/swamid-1.0/nagios-vm.nordu.net.xml b/swamid-1.0/nagios-vm.nordu.net-shibboleth.xml
index 0a4b9add..0a4b9add 100644
--- a/swamid-1.0/nagios-vm.nordu.net.xml
+++ b/swamid-1.0/nagios-vm.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/nagios.dev.it.su.se.xml b/swamid-1.0/nagios.dev.it.su.se-shibboleth.sso.xml
index 57cf2f16..57cf2f16 100644
--- a/swamid-1.0/nagios.dev.it.su.se.xml
+++ b/swamid-1.0/nagios.dev.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/nagios.nordu.net.xml b/swamid-1.0/nagios.nordu.net-shibboleth.xml
index e7240428..e7240428 100644
--- a/swamid-1.0/nagios.nordu.net.xml
+++ b/swamid-1.0/nagios.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/nb11_idp-metadata.xml b/swamid-1.0/nb11.ladok.umu.se-ecs-idp.xml
index 88c2f137..88c2f137 100644
--- a/swamid-1.0/nb11_idp-metadata.xml
+++ b/swamid-1.0/nb11.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/ni.nordu.net-pysaml2.xml b/swamid-1.0/ni.nordu.net-saml2-metadata-.xml
index eef0e705..eef0e705 100644
--- a/swamid-1.0/ni.nordu.net-pysaml2.xml
+++ b/swamid-1.0/ni.nordu.net-saml2-metadata-.xml
diff --git a/swamid-1.0/ni.nordu.net.xml b/swamid-1.0/ni.nordu.net-shibboleth.xml
index e38b995b..e38b995b 100644
--- a/swamid-1.0/ni.nordu.net.xml
+++ b/swamid-1.0/ni.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/nidev-consumer.nordu.net.xml b/swamid-1.0/nidev-consumer.nordu.net-saml2-metadata-.xml
index 723f7019..723f7019 100644
--- a/swamid-1.0/nidev-consumer.nordu.net.xml
+++ b/swamid-1.0/nidev-consumer.nordu.net-saml2-metadata-.xml
diff --git a/swamid-1.0/nordunet.tv.xml b/swamid-1.0/nordunet.tv-shibboleth.xml
index 017c3e13..017c3e13 100644
--- a/swamid-1.0/nordunet.tv.xml
+++ b/swamid-1.0/nordunet.tv-shibboleth.xml
diff --git a/swamid-1.0/nordushare-dev.nordu.net.xml b/swamid-1.0/nordushare-dev.nordu.net-shibboleth.xml
index ff509cd2..ff509cd2 100644
--- a/swamid-1.0/nordushare-dev.nordu.net.xml
+++ b/swamid-1.0/nordushare-dev.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/nya-00_idp-metadata.xml b/swamid-1.0/nya-00.ladok.umu.se-ecs-idp.xml
index ab4605ad..ab4605ad 100644
--- a/swamid-1.0/nya-00_idp-metadata.xml
+++ b/swamid-1.0/nya-00.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-01_idp-metadata.xml b/swamid-1.0/nya-01.ladok.umu.se-ecs-idp.xml
index 3fd72a21..3fd72a21 100644
--- a/swamid-1.0/nya-01_idp-metadata.xml
+++ b/swamid-1.0/nya-01.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-02_idp-metadata.xml b/swamid-1.0/nya-02.ladok.umu.se-ecs-idp.xml
index fbc50826..fbc50826 100644
--- a/swamid-1.0/nya-02_idp-metadata.xml
+++ b/swamid-1.0/nya-02.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-03_idp-metadata.xml b/swamid-1.0/nya-03.ladok.umu.se-ecs-idp.xml
index d6664c62..d6664c62 100644
--- a/swamid-1.0/nya-03_idp-metadata.xml
+++ b/swamid-1.0/nya-03.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-04_idp-metadata.xml b/swamid-1.0/nya-04.ladok.umu.se-ecs-idp.xml
index 8d8a01c0..8d8a01c0 100644
--- a/swamid-1.0/nya-04_idp-metadata.xml
+++ b/swamid-1.0/nya-04.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-05_idp-metadata.xml b/swamid-1.0/nya-05.ladok.umu.se-ecs-idp.xml
index 52f87c27..52f87c27 100644
--- a/swamid-1.0/nya-05_idp-metadata.xml
+++ b/swamid-1.0/nya-05.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-06_idp-metadata.xml b/swamid-1.0/nya-06.ladok.umu.se-ecs-idp.xml
index bee57c00..bee57c00 100644
--- a/swamid-1.0/nya-06_idp-metadata.xml
+++ b/swamid-1.0/nya-06.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-07_idp-metadata.xml b/swamid-1.0/nya-07.ladok.umu.se-ecs-idp.xml
index b687d390..b687d390 100644
--- a/swamid-1.0/nya-07_idp-metadata.xml
+++ b/swamid-1.0/nya-07.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-08_idp-metadata.xml b/swamid-1.0/nya-08.ladok.umu.se-ecs-idp.xml
index 67c90b03..67c90b03 100644
--- a/swamid-1.0/nya-08_idp-metadata.xml
+++ b/swamid-1.0/nya-08.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-09_idp-metadata.xml b/swamid-1.0/nya-09.ladok.umu.se-ecs-idp.xml
index 6b421763..6b421763 100644
--- a/swamid-1.0/nya-09_idp-metadata.xml
+++ b/swamid-1.0/nya-09.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-10_idp-metadata.xml b/swamid-1.0/nya-10.ladok.umu.se-ecs-idp.xml
index 620d568f..620d568f 100644
--- a/swamid-1.0/nya-10_idp-metadata.xml
+++ b/swamid-1.0/nya-10.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-11_idp-metadata.xml b/swamid-1.0/nya-11.ladok.umu.se-ecs-idp.xml
index 695c1680..695c1680 100644
--- a/swamid-1.0/nya-11_idp-metadata.xml
+++ b/swamid-1.0/nya-11.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-12_idp-metadata.xml b/swamid-1.0/nya-12.ladok.umu.se-ecs-idp.xml
index d7b4fa91..d7b4fa91 100644
--- a/swamid-1.0/nya-12_idp-metadata.xml
+++ b/swamid-1.0/nya-12.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-13_idp-metadata.xml b/swamid-1.0/nya-13.ladok.umu.se-ecs-idp.xml
index fba567b7..fba567b7 100644
--- a/swamid-1.0/nya-13_idp-metadata.xml
+++ b/swamid-1.0/nya-13.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-14_idp-metadata.xml b/swamid-1.0/nya-14.ladok.umu.se-ecs-idp.xml
index c21ad583..c21ad583 100644
--- a/swamid-1.0/nya-14_idp-metadata.xml
+++ b/swamid-1.0/nya-14.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-15_idp-metadata.xml b/swamid-1.0/nya-15.ladok.umu.se-ecs-idp.xml
index f353ac61..f353ac61 100644
--- a/swamid-1.0/nya-15_idp-metadata.xml
+++ b/swamid-1.0/nya-15.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-16_idp-metadata.xml b/swamid-1.0/nya-16.ladok.umu.se-ecs-idp.xml
index d1e5538e..d1e5538e 100644
--- a/swamid-1.0/nya-16_idp-metadata.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-17_idp-metadata.xml b/swamid-1.0/nya-17.ladok.umu.se-ecs-idp.xml
index e316d6d2..e316d6d2 100644
--- a/swamid-1.0/nya-17_idp-metadata.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-18_idp-metadata.xml b/swamid-1.0/nya-18.ladok.umu.se-ecs-idp.xml
index de4e0ca0..de4e0ca0 100644
--- a/swamid-1.0/nya-18_idp-metadata.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-19_idp-metadata.xml b/swamid-1.0/nya-19.ladok.umu.se-ecs-idp.xml
index a7c8e21d..a7c8e21d 100644
--- a/swamid-1.0/nya-19_idp-metadata.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-20_idp-metadata.xml b/swamid-1.0/nya-20.ladok.umu.se-ecs-idp.xml
index e418e8ab..e418e8ab 100644
--- a/swamid-1.0/nya-20_idp-metadata.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-21_idp-metadata.xml b/swamid-1.0/nya-21.ladok.umu.se-ecs-idp.xml
index ee030233..ee030233 100644
--- a/swamid-1.0/nya-21_idp-metadata.xml
+++ b/swamid-1.0/nya-21.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-22_idp-metadata.xml b/swamid-1.0/nya-22.ladok.umu.se-ecs-idp.xml
index 9de23812..9de23812 100644
--- a/swamid-1.0/nya-22_idp-metadata.xml
+++ b/swamid-1.0/nya-22.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-23_idp-metadata.xml b/swamid-1.0/nya-23.ladok.umu.se-ecs-idp.xml
index 32ea3281..32ea3281 100644
--- a/swamid-1.0/nya-23_idp-metadata.xml
+++ b/swamid-1.0/nya-23.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-24_idp-metadata.xml b/swamid-1.0/nya-24.ladok.umu.se-ecs-idp.xml
index 22a5dc6e..22a5dc6e 100644
--- a/swamid-1.0/nya-24_idp-metadata.xml
+++ b/swamid-1.0/nya-24.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-25_idp-metadata.xml b/swamid-1.0/nya-25.ladok.umu.se-ecs-idp.xml
index 53c1ca2a..53c1ca2a 100644
--- a/swamid-1.0/nya-25_idp-metadata.xml
+++ b/swamid-1.0/nya-25.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-26_idp-metadata.xml b/swamid-1.0/nya-26.ladok.umu.se-ecs-idp.xml
index 97ae5712..97ae5712 100644
--- a/swamid-1.0/nya-26_idp-metadata.xml
+++ b/swamid-1.0/nya-26.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-27_idp-metadata.xml b/swamid-1.0/nya-27.ladok.umu.se-ecs-idp.xml
index f68ce447..f68ce447 100644
--- a/swamid-1.0/nya-27_idp-metadata.xml
+++ b/swamid-1.0/nya-27.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-28_idp-metadata.xml b/swamid-1.0/nya-28.ladok.umu.se-ecs-idp.xml
index a79d1a76..a79d1a76 100644
--- a/swamid-1.0/nya-28_idp-metadata.xml
+++ b/swamid-1.0/nya-28.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-29_idp-metadata.xml b/swamid-1.0/nya-29.ladok.umu.se-ecs-idp.xml
index c6772b2b..c6772b2b 100644
--- a/swamid-1.0/nya-29_idp-metadata.xml
+++ b/swamid-1.0/nya-29.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-30_idp-metadata.xml b/swamid-1.0/nya-30.ladok.umu.se-ecs-idp.xml
index dfa6db5c..dfa6db5c 100644
--- a/swamid-1.0/nya-30_idp-metadata.xml
+++ b/swamid-1.0/nya-30.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-31_idp-metadata.xml b/swamid-1.0/nya-31.ladok.umu.se-ecs-idp.xml
index 5dac7d1e..5dac7d1e 100644
--- a/swamid-1.0/nya-31_idp-metadata.xml
+++ b/swamid-1.0/nya-31.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-32_idp-metadata.xml b/swamid-1.0/nya-32.ladok.umu.se-ecs-idp.xml
index eb9a0dda..eb9a0dda 100644
--- a/swamid-1.0/nya-32_idp-metadata.xml
+++ b/swamid-1.0/nya-32.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-33.ladok.umu.se.xml b/swamid-1.0/nya-33.ladok.umu.se-ecs-idp.xml
index 2eec9c15..2eec9c15 100644
--- a/swamid-1.0/nya-33.ladok.umu.se.xml
+++ b/swamid-1.0/nya-33.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-34_idp-metadata.xml b/swamid-1.0/nya-34.ladok.umu.se-ecs-idp.xml
index d16e3d6f..d16e3d6f 100644
--- a/swamid-1.0/nya-34_idp-metadata.xml
+++ b/swamid-1.0/nya-34.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-35_idp-metadata.xml b/swamid-1.0/nya-35.ladok.umu.se-ecs-idp.xml
index 31759408..31759408 100644
--- a/swamid-1.0/nya-35_idp-metadata.xml
+++ b/swamid-1.0/nya-35.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-36_idp-metadata.xml b/swamid-1.0/nya-36.ladok.umu.se-ecs-idp.xml
index e6fe55e7..e6fe55e7 100644
--- a/swamid-1.0/nya-36_idp-metadata.xml
+++ b/swamid-1.0/nya-36.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-37_idp-metadata.xml b/swamid-1.0/nya-37.ladok.umu.se-ecs-idp.xml
index 7737c49a..7737c49a 100644
--- a/swamid-1.0/nya-37_idp-metadata.xml
+++ b/swamid-1.0/nya-37.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-38_idp-metadata.xml b/swamid-1.0/nya-38.ladok.umu.se-ecs-idp.xml
index ea5ec30a..ea5ec30a 100644
--- a/swamid-1.0/nya-38_idp-metadata.xml
+++ b/swamid-1.0/nya-38.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-39_idp-metadata.xml b/swamid-1.0/nya-39.ladok.umu.se-ecs-idp.xml
index c3d3139a..c3d3139a 100644
--- a/swamid-1.0/nya-39_idp-metadata.xml
+++ b/swamid-1.0/nya-39.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-40_idp-metadata.xml b/swamid-1.0/nya-40.ladok.umu.se-ecs-idp.xml
index 01fda788..01fda788 100644
--- a/swamid-1.0/nya-40_idp-metadata.xml
+++ b/swamid-1.0/nya-40.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-41_idp-metadata.xml b/swamid-1.0/nya-41.ladok.umu.se-ecs-idp.xml
index 0b1b1f52..0b1b1f52 100644
--- a/swamid-1.0/nya-41_idp-metadata.xml
+++ b/swamid-1.0/nya-41.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-42_idp-metadata.xml b/swamid-1.0/nya-42.ladok.umu.se-ecs-idp.xml
index e642cb46..e642cb46 100644
--- a/swamid-1.0/nya-42_idp-metadata.xml
+++ b/swamid-1.0/nya-42.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-43_idp-metadata.xml b/swamid-1.0/nya-43.ladok.umu.se-ecs-idp.xml
index 76aa8a57..76aa8a57 100644
--- a/swamid-1.0/nya-43_idp-metadata.xml
+++ b/swamid-1.0/nya-43.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-44_idp-metadata.xml b/swamid-1.0/nya-44.ladok.umu.se-ecs-idp.xml
index 3219b227..3219b227 100644
--- a/swamid-1.0/nya-44_idp-metadata.xml
+++ b/swamid-1.0/nya-44.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-45_idp-metadata.xml b/swamid-1.0/nya-45.ladok.umu.se-ecs-idp.xml
index b74efc3a..b74efc3a 100644
--- a/swamid-1.0/nya-45_idp-metadata.xml
+++ b/swamid-1.0/nya-45.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-46_idp-metadata.xml b/swamid-1.0/nya-46.ladok.umu.se-ecs-idp.xml
index a9b45f36..a9b45f36 100644
--- a/swamid-1.0/nya-46_idp-metadata.xml
+++ b/swamid-1.0/nya-46.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-47_idp-metadata.xml b/swamid-1.0/nya-47.ladok.umu.se-ecs-idp.xml
index f01eb53c..f01eb53c 100644
--- a/swamid-1.0/nya-47_idp-metadata.xml
+++ b/swamid-1.0/nya-47.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-48_idp-metadata.xml b/swamid-1.0/nya-48.ladok.umu.se-ecs-idp.xml
index 44f92390..44f92390 100644
--- a/swamid-1.0/nya-48_idp-metadata.xml
+++ b/swamid-1.0/nya-48.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-49_idp-metadata.xml b/swamid-1.0/nya-49.ladok.umu.se-ecs-idp.xml
index d86fc0f2..d86fc0f2 100644
--- a/swamid-1.0/nya-49_idp-metadata.xml
+++ b/swamid-1.0/nya-49.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-50_idp-metadata.xml b/swamid-1.0/nya-50.ladok.umu.se-ecs-idp.xml
index 7b59dbf1..7b59dbf1 100644
--- a/swamid-1.0/nya-50_idp-metadata.xml
+++ b/swamid-1.0/nya-50.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nyainloggning.slu.se.xml b/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml
index b31b849e..b31b849e 100644
--- a/swamid-1.0/nyainloggning.slu.se.xml
+++ b/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/nyautb_idp-metadata.xml b/swamid-1.0/nyautb.ladok.umu.se-ecs-idp.xml
index 5bc645a9..5bc645a9 100644
--- a/swamid-1.0/nyautb_idp-metadata.xml
+++ b/swamid-1.0/nyautb.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/order.kib.ki.se.xml b/swamid-1.0/order.kib.ki.se-shibboleth.xml
index 9ad9a2d1..9ad9a2d1 100644
--- a/swamid-1.0/order.kib.ki.se.xml
+++ b/swamid-1.0/order.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/pingpong.chalmers.se.xml b/swamid-1.0/pingpong.chalmers.se-shibboleth.xml
index 9343f0f5..9343f0f5 100644
--- a/swamid-1.0/pingpong.chalmers.se.xml
+++ b/swamid-1.0/pingpong.chalmers.se-shibboleth.xml
diff --git a/swamid-1.0/play.hb.se.xml b/swamid-1.0/play.hb.se-shibboleth.xml
index d12455d2..d12455d2 100644
--- a/swamid-1.0/play.hb.se.xml
+++ b/swamid-1.0/play.hb.se-shibboleth.xml
diff --git a/swamid-1.0/play.hig.se.xml b/swamid-1.0/play.hig.se-shibboleth.xml
index 0cd45dd3..0cd45dd3 100644
--- a/swamid-1.0/play.hig.se.xml
+++ b/swamid-1.0/play.hig.se-shibboleth.xml
diff --git a/swamid-1.0/play.liu.se.xml b/swamid-1.0/play.liu.se-shibboleth.xml
index 9c3ab30d..9c3ab30d 100644
--- a/swamid-1.0/play.liu.se.xml
+++ b/swamid-1.0/play.liu.se-shibboleth.xml
diff --git a/swamid-1.0/play.lu.se.xml b/swamid-1.0/play.lu.se-shibboleth.xml
index 861eca83..861eca83 100644
--- a/swamid-1.0/play.lu.se.xml
+++ b/swamid-1.0/play.lu.se-shibboleth.xml
diff --git a/swamid-1.0/play.mah.se.xml b/swamid-1.0/play.mah.se-shibboleth.xml
index 697675ea..697675ea 100644
--- a/swamid-1.0/play.mah.se.xml
+++ b/swamid-1.0/play.mah.se-shibboleth.xml
diff --git a/swamid-1.0/play.mdh.se.xml b/swamid-1.0/play.mdh.se-shibboleth.xml
index b17a5904..b17a5904 100644
--- a/swamid-1.0/play.mdh.se.xml
+++ b/swamid-1.0/play.mdh.se-shibboleth.xml
diff --git a/swamid-1.0/play.sunet.se.xml b/swamid-1.0/play.sunet.se-shibboleth.xml
index 2ab361e5..2ab361e5 100644
--- a/swamid-1.0/play.sunet.se.xml
+++ b/swamid-1.0/play.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/portal.mdh.se.xml b/swamid-1.0/portal.mdh.se-shibboleth.xml
index b79db3f5..b79db3f5 100644
--- a/swamid-1.0/portal.mdh.se.xml
+++ b/swamid-1.0/portal.mdh.se-shibboleth.xml
diff --git a/swamid-1.0/portalservicesutv.miun.se.xml b/swamid-1.0/portalservicesutv.miun.se-shibboleth.xml
index d08258ce..d08258ce 100644
--- a/swamid-1.0/portalservicesutv.miun.se.xml
+++ b/swamid-1.0/portalservicesutv.miun.se-shibboleth.xml
diff --git a/swamid-1.0/pp-edu-admin.it.su.se.xml b/swamid-1.0/pp-edu-admin.it.su.se-shibboleth.sso.xml
index be5686c3..be5686c3 100644
--- a/swamid-1.0/pp-edu-admin.it.su.se.xml
+++ b/swamid-1.0/pp-edu-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-komm-admin.it.su.se.xml b/swamid-1.0/pp-komm-admin.it.su.se-shibboleth.sso.xml
index 6b78cb29..6b78cb29 100644
--- a/swamid-1.0/pp-komm-admin.it.su.se.xml
+++ b/swamid-1.0/pp-komm-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-migr-admin.it.su.se.xml b/swamid-1.0/pp-migr-admin.it.su.se-shibboleth.sso.xml
index d1adc98f..d1adc98f 100644
--- a/swamid-1.0/pp-migr-admin.it.su.se.xml
+++ b/swamid-1.0/pp-migr-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-prod-admin.it.su.se.xml b/swamid-1.0/pp-prod-admin.it.su.se-shibboleth.sso.xml
index a6e73eb9..a6e73eb9 100644
--- a/swamid-1.0/pp-prod-admin.it.su.se.xml
+++ b/swamid-1.0/pp-prod-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-redmigr-admin.it.su.se.xml b/swamid-1.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml
index 46cff006..46cff006 100644
--- a/swamid-1.0/pp-redmigr-admin.it.su.se.xml
+++ b/swamid-1.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-redtest-admin.it.su.se.xml b/swamid-1.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml
index cccf6b89..cccf6b89 100644
--- a/swamid-1.0/pp-redtest-admin.it.su.se.xml
+++ b/swamid-1.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-test-admin.it.su.se.xml b/swamid-1.0/pp-test-admin.it.su.se-shibboleth.sso.xml
index 0a1ae3f8..0a1ae3f8 100644
--- a/swamid-1.0/pp-test-admin.it.su.se.xml
+++ b/swamid-1.0/pp-test-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/public.it.secure.su.se.xml b/swamid-1.0/public.it.secure.su.se-shibboleth.xml
index f5eb39e0..f5eb39e0 100644
--- a/swamid-1.0/public.it.secure.su.se.xml
+++ b/swamid-1.0/public.it.secure.su.se-shibboleth.xml
diff --git a/swamid-1.0/publications.ki.se.xml b/swamid-1.0/publications.ki.se-shibboleth.xml
index 8ac9eb7e..8ac9eb7e 100644
--- a/swamid-1.0/publications.ki.se.xml
+++ b/swamid-1.0/publications.ki.se-shibboleth.xml
diff --git a/swamid-1.0/referens-idp.skolfederation.se.xml b/swamid-1.0/referens-idp.skolfederation.se-idp-shibboleth.xml
index 133451ce..133451ce 100644
--- a/swamid-1.0/referens-idp.skolfederation.se.xml
+++ b/swamid-1.0/referens-idp.skolfederation.se-idp-shibboleth.xml
diff --git a/swamid-1.0/registrera.hb.se.xml b/swamid-1.0/registrera.hb.se-shibboleth.xml
index 41bce9c3..41bce9c3 100644
--- a/swamid-1.0/registrera.hb.se.xml
+++ b/swamid-1.0/registrera.hb.se-shibboleth.xml
diff --git a/swamid-1.0/rt-test-app1.it.su.se.xml b/swamid-1.0/rt-test-app1.it.su.se-shibboleth.sso.xml
index ed73abca..ed73abca 100644
--- a/swamid-1.0/rt-test-app1.it.su.se.xml
+++ b/swamid-1.0/rt-test-app1.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/rt.it.su.se.xml b/swamid-1.0/rt.it.su.se-shibboleth.sso.xml
index 3264276f..3264276f 100644
--- a/swamid-1.0/rt.it.su.se.xml
+++ b/swamid-1.0/rt.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/samadhi.kib.ki.se.xml b/swamid-1.0/samadhi.kib.ki.se-shibboleth.xml
index be12eac0..be12eac0 100644
--- a/swamid-1.0/samadhi.kib.ki.se.xml
+++ b/swamid-1.0/samadhi.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/saml-1.sys.kth.se.xml b/swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml
index d9c35284..d9c35284 100644
--- a/swamid-1.0/saml-1.sys.kth.se.xml
+++ b/swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml
diff --git a/swamid-1.0/samsok.libris.kb.se.xml b/swamid-1.0/samsok.libris.kb.se-shibboleth.xml
index d5e9866c..d5e9866c 100644
--- a/swamid-1.0/samsok.libris.kb.se.xml
+++ b/swamid-1.0/samsok.libris.kb.se-shibboleth.xml
diff --git a/swamid-1.0/shib-1-r.referens.sys.kth.se.xml b/swamid-1.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
index 7e5219c2..7e5219c2 100644
--- a/swamid-1.0/shib-1-r.referens.sys.kth.se.xml
+++ b/swamid-1.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shib-idp-1.oru.se.xml b/swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml
index 1533c284..1533c284 100644
--- a/swamid-1.0/shib-idp-1.oru.se.xml
+++ b/swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shib-idp-test.oru.se.xml b/swamid-1.0/shib-idp-test.oru.se-idp-shibboleth.xml
index fbbe4fd5..fbbe4fd5 100644
--- a/swamid-1.0/shib-idp-test.oru.se.xml
+++ b/swamid-1.0/shib-idp-test.oru.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shib-sp-test.oru.se.xml b/swamid-1.0/shib-sp-test.oru.se-shibboleth.xml
index 5f320eec..5f320eec 100644
--- a/swamid-1.0/shib-sp-test.oru.se.xml
+++ b/swamid-1.0/shib-sp-test.oru.se-shibboleth.xml
diff --git a/swamid-1.0/shib-sp.kau.se.xml b/swamid-1.0/shib-sp.kau.se-shibboleth.xml
index aa036934..aa036934 100644
--- a/swamid-1.0/shib-sp.kau.se.xml
+++ b/swamid-1.0/shib-sp.kau.se-shibboleth.xml
diff --git a/swamid-1.0/shib1.oru.se.xml b/swamid-1.0/shib1.oru.se-shibboleth.xml
index cc778e2c..cc778e2c 100644
--- a/swamid-1.0/shib1.oru.se.xml
+++ b/swamid-1.0/shib1.oru.se-shibboleth.xml
diff --git a/swamid-1.0/shibb1.hj.se.xml b/swamid-1.0/shibb1.hj.se-idp-shibboleth.xml
index 69ecb138..69ecb138 100644
--- a/swamid-1.0/shibb1.hj.se.xml
+++ b/swamid-1.0/shibb1.hj.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shibbo-test.ltu.se.xml b/swamid-1.0/shibbo-test.ltu.se-idp-shibboleth.xml
index 0957b877..0957b877 100644
--- a/swamid-1.0/shibbo-test.ltu.se.xml
+++ b/swamid-1.0/shibbo-test.ltu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shibbo.ltu.se.xml b/swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml
index 6ed98b93..6ed98b93 100644
--- a/swamid-1.0/shibbo.ltu.se.xml
+++ b/swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shibboleth.net.lu.se.xml b/swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml
index f2889a80..f2889a80 100644
--- a/swamid-1.0/shibboleth.net.lu.se.xml
+++ b/swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shibboleth.slu.se.xml b/swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml
index b9aea074..b9aea074 100644
--- a/swamid-1.0/shibboleth.slu.se.xml
+++ b/swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shibboleth.sys.kth.se.xml b/swamid-1.0/shibboleth.sys.kth.se-identity.xml
index e200e851..e200e851 100644
--- a/swamid-1.0/shibboleth.sys.kth.se.xml
+++ b/swamid-1.0/shibboleth.sys.kth.se-identity.xml
diff --git a/swamid-1.0/shibboleth.vhs.se.xml b/swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml
index d204d5e4..d204d5e4 100644
--- a/swamid-1.0/shibboleth.vhs.se.xml
+++ b/swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml
diff --git a/swamid-1.0/signon.hh.se.xml b/swamid-1.0/signon.hh.se-idp-shibboleth.xml
index c537e83e..c537e83e 100644
--- a/swamid-1.0/signon.hh.se.xml
+++ b/swamid-1.0/signon.hh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/slcstest.uninett.no.xml b/swamid-1.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
index af47477f..af47477f 100644
--- a/swamid-1.0/slcstest.uninett.no.xml
+++ b/swamid-1.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
diff --git a/swamid-1.0/smd-dev.nordu.net.xml b/swamid-1.0/smd-dev.nordu.net-shibboleth.xml
index bcdff661..bcdff661 100644
--- a/swamid-1.0/smd-dev.nordu.net.xml
+++ b/swamid-1.0/smd-dev.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/smd.du.se.xml b/swamid-1.0/smd.du.se-shibboleth.xml
index d7680946..d7680946 100644
--- a/swamid-1.0/smd.du.se.xml
+++ b/swamid-1.0/smd.du.se-shibboleth.xml
diff --git a/swamid-1.0/smultron.catalogix.se.xml b/swamid-1.0/smultron.catalogix.se-8090-sp.xml
index 8aa7b26b..8aa7b26b 100644
--- a/swamid-1.0/smultron.catalogix.se.xml
+++ b/swamid-1.0/smultron.catalogix.se-8090-sp.xml
diff --git a/swamid-1.0/sp-nya.bth.se.xml b/swamid-1.0/sp-nya.bth.se-shibboleth.xml
index c255eb20..c255eb20 100644
--- a/swamid-1.0/sp-nya.bth.se.xml
+++ b/swamid-1.0/sp-nya.bth.se-shibboleth.xml
diff --git a/swamid-1.0/sp-test.it.su.se.xml b/swamid-1.0/sp-test.it.su.se-shibboleth.sso.xml
index 1889db83..1889db83 100644
--- a/swamid-1.0/sp-test.it.su.se.xml
+++ b/swamid-1.0/sp-test.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/sp-test.swamid.se.xml b/swamid-1.0/sp-test.swamid.se-shibboleth.xml
index 120eb1ca..120eb1ca 100644
--- a/swamid-1.0/sp-test.swamid.se.xml
+++ b/swamid-1.0/sp-test.swamid.se-shibboleth.xml
diff --git a/swamid-1.0/sp.it.gu.se.xml b/swamid-1.0/sp.it.gu.se-shibboleth.xml
index ef0e5bc3..ef0e5bc3 100644
--- a/swamid-1.0/sp.it.gu.se.xml
+++ b/swamid-1.0/sp.it.gu.se-shibboleth.xml
diff --git a/swamid-1.0/sp.kau.se.xml b/swamid-1.0/sp.kau.se-shibboleth.xml
index 71d0e69a..71d0e69a 100644
--- a/swamid-1.0/sp.kau.se.xml
+++ b/swamid-1.0/sp.kau.se-shibboleth.xml
diff --git a/swamid-1.0/sp.lhs.se.xml b/swamid-1.0/sp.lhs.se-shibboleth.xml
index e5fd511c..e5fd511c 100644
--- a/swamid-1.0/sp.lhs.se.xml
+++ b/swamid-1.0/sp.lhs.se-shibboleth.xml
diff --git a/swamid-1.0/sp.swamid.se.xml b/swamid-1.0/sp.swamid.se-shibboleth.xml
index f21bf577..f21bf577 100644
--- a/swamid-1.0/sp.swamid.se.xml
+++ b/swamid-1.0/sp.swamid.se-shibboleth.xml
diff --git a/swamid-1.0/tools.sunet.se.xml b/swamid-1.0/sp.tools.sunet.se-shibboleth.xml
index 7481a0e9..7481a0e9 100644
--- a/swamid-1.0/tools.sunet.se.xml
+++ b/swamid-1.0/sp.tools.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/sp.wavelan.su.se.xml b/swamid-1.0/sp.wavelan.su.se-shibboleth.sso.xml
index f067f0d1..f067f0d1 100644
--- a/swamid-1.0/sp.wavelan.su.se.xml
+++ b/swamid-1.0/sp.wavelan.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/staging.dreamspark.com.xml b/swamid-1.0/staging.dreamspark.com-shibboleth-sp.xml
index cec32c1a..cec32c1a 100644
--- a/swamid-1.0/staging.dreamspark.com.xml
+++ b/swamid-1.0/staging.dreamspark.com-shibboleth-sp.xml
diff --git a/swamid-1.0/su.avedas.com.xml b/swamid-1.0/su.avedas.com-shibboleth.xml
index 6b5f752a..6b5f752a 100644
--- a/swamid-1.0/su.avedas.com.xml
+++ b/swamid-1.0/su.avedas.com-shibboleth.xml
diff --git a/swamid-1.0/sutest.dsv.su.se.xml b/swamid-1.0/sutest.dsv.su.se-shibboleth.xml
index 7f9ef5cc..7f9ef5cc 100644
--- a/swamid-1.0/sutest.dsv.su.se.xml
+++ b/swamid-1.0/sutest.dsv.su.se-shibboleth.xml
diff --git a/swamid-1.0/swamid.shh.se.xml b/swamid-1.0/swamid.shh.se-idp-shibboleth.xml
index f58261c1..f58261c1 100644
--- a/swamid-1.0/swamid.shh.se.xml
+++ b/swamid-1.0/swamid.shh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/swamid.user.uu.se.xml b/swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml
index 819cc499..819cc499 100644
--- a/swamid-1.0/swamid.user.uu.se.xml
+++ b/swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/tcs-escience-portal.terena.org.xml b/swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index a6bb3f49..a6bb3f49 100644
--- a/swamid-1.0/tcs-escience-portal.terena.org.xml
+++ b/swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-1.0/tcs-escience.sunet.se.xml b/swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 33daf4da..33daf4da 100644
--- a/swamid-1.0/tcs-escience.sunet.se.xml
+++ b/swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-1.0/tcs-personal-portal.terena.org.xml b/swamid-1.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 9fed683f..9fed683f 100644
--- a/swamid-1.0/tcs-personal-portal.terena.org.xml
+++ b/swamid-1.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-1.0/tcs-personal.sunet.se.xml b/swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index ce2e65e6..ce2e65e6 100644
--- a/swamid-1.0/tcs-personal.sunet.se.xml
+++ b/swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-1.0/tcs-test.sunet.se.xml b/swamid-1.0/tcs-test.sunet.se-shibboleth.xml
index 00b31eee..00b31eee 100644
--- a/swamid-1.0/tcs-test.sunet.se.xml
+++ b/swamid-1.0/tcs-test.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/test-chalmers.pingpong.net.xml b/swamid-1.0/test-chalmers.pingpong.net-shibboleth.xml
index 62ff68b1..62ff68b1 100644
--- a/swamid-1.0/test-chalmers.pingpong.net.xml
+++ b/swamid-1.0/test-chalmers.pingpong.net-shibboleth.xml
diff --git a/swamid-1.0/test-ki.pingpong.net.xml b/swamid-1.0/test-ki.pingpong.net-shibboleth.xml
index 90145007..90145007 100644
--- a/swamid-1.0/test-ki.pingpong.net.xml
+++ b/swamid-1.0/test-ki.pingpong.net-shibboleth.xml
diff --git a/swamid-1.0/testakt.it.ki.se.xml b/swamid-1.0/testakt.it.ki.se-shibboleth.xml
index 86718c94..86718c94 100644
--- a/swamid-1.0/testakt.it.ki.se.xml
+++ b/swamid-1.0/testakt.it.ki.se-shibboleth.xml
diff --git a/swamid-1.0/testgag.it.ki.se.xml b/swamid-1.0/testgag.it.ki.se-shibboleth.xml
index fdba6a7f..fdba6a7f 100644
--- a/swamid-1.0/testgag.it.ki.se.xml
+++ b/swamid-1.0/testgag.it.ki.se-shibboleth.xml
diff --git a/swamid-1.0/testshib.user.uu.se.xml b/swamid-1.0/testshib.user.uu.se-idp-shibboleth.xml
index cbbc8e9a..cbbc8e9a 100644
--- a/swamid-1.0/testshib.user.uu.se.xml
+++ b/swamid-1.0/testshib.user.uu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/umdac-humpdac.ad.umu.se.xml b/swamid-1.0/umdac-humpdac.ad.umu.se-shibboleth.xml
index ba75f112..ba75f112 100644
--- a/swamid-1.0/umdac-humpdac.ad.umu.se.xml
+++ b/swamid-1.0/umdac-humpdac.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-olho0001.ad.umu.se.xml b/swamid-1.0/umdac-olho0001.ad.umu.se-shibboleth.xml
index 40fbb8f7..40fbb8f7 100644
--- a/swamid-1.0/umdac-olho0001.ad.umu.se.xml
+++ b/swamid-1.0/umdac-olho0001.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-stdout.umdc.umu.se.xml b/swamid-1.0/umdac-stdout.umdc.umu.se-shibboleth.xml
index 498f5073..498f5073 100644
--- a/swamid-1.0/umdac-stdout.umdc.umu.se.xml
+++ b/swamid-1.0/umdac-stdout.umdc.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-strike.ad.umu.se.xml b/swamid-1.0/umdac-strike.ad.umu.se-shibboleth.xml
index 68cf435b..68cf435b 100644
--- a/swamid-1.0/umdac-strike.ad.umu.se.xml
+++ b/swamid-1.0/umdac-strike.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-utv1.ad.umu.se.xml b/swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml
index fdbc3e08..fdbc3e08 100644
--- a/swamid-1.0/umdac-utv1.ad.umu.se.xml
+++ b/swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-utv2.ad.umu.se.xml b/swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml
index fc48ea0a..fc48ea0a 100644
--- a/swamid-1.0/umdac-utv2.ad.umu.se.xml
+++ b/swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/unitcf.se.xml b/swamid-1.0/unitcf.se-shibboleth.xml
index ade8042c..ade8042c 100644
--- a/swamid-1.0/unitcf.se.xml
+++ b/swamid-1.0/unitcf.se-shibboleth.xml
diff --git a/swamid-1.0/uu.test.diva-portal.org.xml b/swamid-1.0/uu.test.diva-portal.org-shibboleth.xml
index 82d0f335..82d0f335 100644
--- a/swamid-1.0/uu.test.diva-portal.org.xml
+++ b/swamid-1.0/uu.test.diva-portal.org-shibboleth.xml
diff --git a/swamid-1.0/vfu-gemdev.it.su.se.xml b/swamid-1.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
index d231518f..d231518f 100644
--- a/swamid-1.0/vfu-gemdev.it.su.se.xml
+++ b/swamid-1.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/vfu-test.su.se.xml b/swamid-1.0/vfu-test.su.se-shibboleth.sso.xml
index ee07ba22..ee07ba22 100644
--- a/swamid-1.0/vfu-test.su.se.xml
+++ b/swamid-1.0/vfu-test.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/vfu.su.se.xml b/swamid-1.0/vfu.su.se-shibboleth.sso.xml
index 301bbfc0..301bbfc0 100644
--- a/swamid-1.0/vfu.su.se.xml
+++ b/swamid-1.0/vfu.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/vlab-chemsub.explizit.se.xml b/swamid-1.0/vlab-chemsub.explizit.se-shibboleth.xml
index 013f4b5b..013f4b5b 100644
--- a/swamid-1.0/vlab-chemsub.explizit.se.xml
+++ b/swamid-1.0/vlab-chemsub.explizit.se-shibboleth.xml
diff --git a/swamid-1.0/vmfront.lan.kth.se.xml b/swamid-1.0/vmfront.lan.kth.se-shibboleth.xml
index 52a45a3e..52a45a3e 100644
--- a/swamid-1.0/vmfront.lan.kth.se.xml
+++ b/swamid-1.0/vmfront.lan.kth.se-shibboleth.xml
diff --git a/swamid-1.0/vmidgw3.miun.se.xml b/swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml
index 7ed92556..7ed92556 100644
--- a/swamid-1.0/vmidgw3.miun.se.xml
+++ b/swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml
diff --git a/swamid-1.0/wb11_idp-metadata.xml b/swamid-1.0/wb11.ladok.umu.se-ecs-idp.xml
index aa8eedf7..aa8eedf7 100644
--- a/swamid-1.0/wb11_idp-metadata.xml
+++ b/swamid-1.0/wb11.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/webapp-utv.ita.mdh.se.xml b/swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml
index 1a662e40..1a662e40 100644
--- a/swamid-1.0/webapp-utv.ita.mdh.se.xml
+++ b/swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml
diff --git a/swamid-1.0/webwork.math.su.se.xml b/swamid-1.0/webwork.math.su.se-shibboleth.xml
index 97aed054..97aed054 100644
--- a/swamid-1.0/webwork.math.su.se.xml
+++ b/swamid-1.0/webwork.math.su.se-shibboleth.xml
diff --git a/swamid-1.0/webwork2.math.su.se.xml b/swamid-1.0/webwork2.math.su.se-shibboleth.xml
index cbdb102d..cbdb102d 100644
--- a/swamid-1.0/webwork2.math.su.se.xml
+++ b/swamid-1.0/webwork2.math.su.se-shibboleth.xml
diff --git a/swamid-1.0/ws3.bmc.uu.se.xml b/swamid-1.0/ws3.bmc.uu.se-shibboleth.xml
index 15d2dce4..15d2dce4 100644
--- a/swamid-1.0/ws3.bmc.uu.se.xml
+++ b/swamid-1.0/ws3.bmc.uu.se-shibboleth.xml
diff --git a/swamid-1.0/luigi.umdc.umu.se-ecs-sp.xml b/swamid-1.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml
index 7d936fd8..7d936fd8 100644
--- a/swamid-1.0/luigi.umdc.umu.se-ecs-sp.xml
+++ b/swamid-1.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/www.bmcmediatek.uu.se.xml b/swamid-1.0/www.bmcmediatek.uu.se.xml
deleted file mode 100644
index d21ca81b..00000000
--- a/swamid-1.0/www.bmcmediatek.uu.se.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ws3.bmc.uu.se/shibboleth">
-  <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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ws1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ws1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIJAMcesvNWNm7sMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
-BAMTA3dzMTAeFw0xMDExMTYxMzEwNTJaFw0yMDExMTMxMzEwNTJaMA4xDDAKBgNV
-BAMTA3dzMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcJpa5zDKxA
-XbKsf/nLBHJnDVQC8yVIKtLEbDZowtv7F3FwQEpKWs3mIqHpHzMT4ErQxnQKCgKp
-lyq/Ow9LNnWYGQsJi1E2lBAD7Wg7wkz4CuGiRjIkdk3JWMqm/YD2rX5WMw2ThWZt
-HPZXtCFtQBVMwRFTCYAELI/Fjie7Da5BVx6DAmnBEImyfqAURh+frHTBX/SN8pDa
-EjXO0i/HWcOLcHNHKCqR3yPX0+XuRrL5/qEIfRgYqws57mx+7TlmHeGIJq3zviNh
-bp3waRhxcyy/yoYKqtU3LOWBCf33350Ez+E5RcBJQC82sKH0WNU+oP6QFIW+fcRv
-siAZ1PHmcCkCAwEAAaMxMC8wDgYDVR0RBAcwBYIDd3MxMB0GA1UdDgQWBBSMT2HM
-OkhcwrbObOFNrFtlCRF73DANBgkqhkiG9w0BAQUFAAOCAQEANi1KmPdYFKXjBHRU
-yJ2gKo54lRlrfJ5dQiyfN+GLnIXFG59yRCouGpD0igHxU4Sv3iLuTFWdWHa3m3J/
-q6AxpUl3tdIEy6HD5r/gI61oFKpyeYCPSt2q7wfYjGWCufk4M/RIpcnBGHDD5IIR
-ao5t+42NRWEtA0XLiwJPr+RXGGMLTdXXfcvyps7BVIV16Aj39apcOfMdhLQVTdPX
-O4qGdfgbjNKUd//RBFitxtPvmdDwkei9NX3Ed4TU3TxX4GeX84GCIH2JeOrdqNMF
-xsuqDz+Qlqfj741Xk0GEWhH5vc3xNubAAuBQF3rDDDya+RVunZkZ1OrwUWTyHETl
-x9hzjw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ws1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ws1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIJAMcesvNWNm7sMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
-BAMTA3dzMTAeFw0xMDExMTYxMzEwNTJaFw0yMDExMTMxMzEwNTJaMA4xDDAKBgNV
-BAMTA3dzMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcJpa5zDKxA
-XbKsf/nLBHJnDVQC8yVIKtLEbDZowtv7F3FwQEpKWs3mIqHpHzMT4ErQxnQKCgKp
-lyq/Ow9LNnWYGQsJi1E2lBAD7Wg7wkz4CuGiRjIkdk3JWMqm/YD2rX5WMw2ThWZt
-HPZXtCFtQBVMwRFTCYAELI/Fjie7Da5BVx6DAmnBEImyfqAURh+frHTBX/SN8pDa
-EjXO0i/HWcOLcHNHKCqR3yPX0+XuRrL5/qEIfRgYqws57mx+7TlmHeGIJq3zviNh
-bp3waRhxcyy/yoYKqtU3LOWBCf33350Ez+E5RcBJQC82sKH0WNU+oP6QFIW+fcRv
-siAZ1PHmcCkCAwEAAaMxMC8wDgYDVR0RBAcwBYIDd3MxMB0GA1UdDgQWBBSMT2HM
-OkhcwrbObOFNrFtlCRF73DANBgkqhkiG9w0BAQUFAAOCAQEANi1KmPdYFKXjBHRU
-yJ2gKo54lRlrfJ5dQiyfN+GLnIXFG59yRCouGpD0igHxU4Sv3iLuTFWdWHa3m3J/
-q6AxpUl3tdIEy6HD5r/gI61oFKpyeYCPSt2q7wfYjGWCufk4M/RIpcnBGHDD5IIR
-ao5t+42NRWEtA0XLiwJPr+RXGGMLTdXXfcvyps7BVIV16Aj39apcOfMdhLQVTdPX
-O4qGdfgbjNKUd//RBFitxtPvmdDwkei9NX3Ed4TU3TxX4GeX84GCIH2JeOrdqNMF
-xsuqDz+Qlqfj741Xk0GEWhH5vc3xNubAAuBQF3rDDDya+RVunZkZ1OrwUWTyHETl
-x9hzjw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/www.cambro.umu.se.xml b/swamid-1.0/www.cambro.umu.se-shibboleth.xml
index 7f8532ac..7f8532ac 100644
--- a/swamid-1.0/www.cambro.umu.se.xml
+++ b/swamid-1.0/www.cambro.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www.diva-portal.org.xml b/swamid-1.0/www.diva-portal.org-shibboleth.xml
index e23d614c..e23d614c 100644
--- a/swamid-1.0/www.diva-portal.org.xml
+++ b/swamid-1.0/www.diva-portal.org-shibboleth.xml
diff --git a/swamid-1.0/www.play.umu.se.xml b/swamid-1.0/www.play.umu.se-shibboleth.xml
index ce677376..ce677376 100644
--- a/swamid-1.0/www.play.umu.se.xml
+++ b/swamid-1.0/www.play.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www.servicedesk.its.umu.se.xml b/swamid-1.0/www.servicedesk.its.umu.se-shibboleth.xml
index 2c694e38..2c694e38 100644
--- a/swamid-1.0/www.servicedesk.its.umu.se.xml
+++ b/swamid-1.0/www.servicedesk.its.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www.studera.nu.xml b/swamid-1.0/www.studera.nu-shibboleth-sp.xml
index 4ced63eb..4ced63eb 100644
--- a/swamid-1.0/www.studera.nu.xml
+++ b/swamid-1.0/www.studera.nu-shibboleth-sp.xml
diff --git a/swamid-1.0/luigi.umdc.umu.se-aws-sp.xml b/swamid-1.0/www.studera.nyautb.its.umu.se-aws-sp.xml
index 7740a3ca..7740a3ca 100644
--- a/swamid-1.0/luigi.umdc.umu.se-aws-sp.xml
+++ b/swamid-1.0/www.studera.nyautb.its.umu.se-aws-sp.xml
diff --git a/swamid-1.0/www.studera.testb.antagning.se.xml b/swamid-1.0/www.studera.testb.antagning.se-shibboleth-sp.xml
index e4cc6492..e4cc6492 100644
--- a/swamid-1.0/www.studera.testb.antagning.se.xml
+++ b/swamid-1.0/www.studera.testb.antagning.se-shibboleth-sp.xml
diff --git a/swamid-1.0/www.testa.universityadmissions.se.xml b/swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml
index c0418536..c0418536 100644
--- a/swamid-1.0/www.testa.universityadmissions.se.xml
+++ b/swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-1.0/www.wisum.its.umu.se.xml b/swamid-1.0/www.wisum.its.umu.se-shibboleth.xml
index 46e08e4f..46e08e4f 100644
--- a/swamid-1.0/www.wisum.its.umu.se.xml
+++ b/swamid-1.0/www.wisum.its.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www.wisum.umdac.umu.se.xml b/swamid-1.0/www.wisum.umdac.umu.se-shibboleth.xml
index 04e88dce..04e88dce 100644
--- a/swamid-1.0/www.wisum.umdac.umu.se.xml
+++ b/swamid-1.0/www.wisum.umdac.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www2.teol.uu.se.xml b/swamid-1.0/www2.teol.uu.se.xml
deleted file mode 100644
index 2ac77318..00000000
--- a/swamid-1.0/www2.teol.uu.se.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.example.org/shibboleth">
-  <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://www2.teol.uu.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://www2.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>gravis.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gravis.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOCYEsltDIEOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGdyYXZpcy5pdHMudXUuc2UwHhcNMTEwNTMwMTE0MjQ0WhcNMjEwNTI3MTE0
-MjQ0WjAbMRkwFwYDVQQDExBncmF2aXMuaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAqcyKimtM4p/GlAzooApIxPv+/BHyzyJh8gGcLFnH
-XNq/t1eZz1MAFeSg5nWYwCp2VaVSEGGy/C711qeSgCONkl83E4KFrsfjhT4OAgST
-N0MlNscx1bFy/xhY8auGzCO06vtyjo0KAV3b0dJHLdkVPqnZ2adh5NrBW8W+UjuF
-YlkVloBNbtYFkmDJ9TdDRR0lHn9kc8XBsc+tNWRiY8dnbrqrjEi9dhvu329htBKy
-jaXaX7XYO/N3m4bfTv2iLL6LmdIUOldSFg0+hk6haFsexfcpjNXmYW6TOdqEwRKO
-P3WaH3Nw0yfJVWFKiniy6g775F+QXs5PzxlNcLK+jkCOkQIDAQABoz4wPDAbBgNV
-HREEFDASghBncmF2aXMuaXRzLnV1LnNlMB0GA1UdDgQWBBRzUaO3NftSgdTOeqmN
-vB3AFMLi8TANBgkqhkiG9w0BAQUFAAOCAQEAh8KlaKp/LGgJL2w8/ES3nYhEXT6P
-Gy6V4RfqYCq0MKrel66XvB/3Q5F9+yoA39DjXFAVaZUB3xI0WeoHorQ7Gx+59gij
-xr6eFVgxL7j7q/dW48sz7tZwZ2znx0ML3LQY4z4Xqq0fGW7o+EsMby27IyM7C3Uk
-ch5H5bJ6FWyiKsG1aH9ZHQHGXKbDbCOL7eO3CEZFj10UWeETomBGBsE0YAwMgOKh
-4ZTYqvTaF7H9YYOOET3DeNeyk9LyhwQmHBkj9qfoA076qW58vWT5JxgOowHhf8Q5
-gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.teol.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.teol.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.teol.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www2.teol.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.teol.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.teol.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/www3.genuinetext.com.xml b/swamid-1.0/www3.genuinetext.com-shibboleth.xml
index ffab244e..ffab244e 100644
--- a/swamid-1.0/www3.genuinetext.com.xml
+++ b/swamid-1.0/www3.genuinetext.com-shibboleth.xml
diff --git a/swamid-1.0/www4.genuinetext.com.xml b/swamid-1.0/www4.genuinetext.com-shibboleth.xml
index 587092c4..587092c4 100644
--- a/swamid-1.0/www4.genuinetext.com.xml
+++ b/swamid-1.0/www4.genuinetext.com-shibboleth.xml
diff --git a/swamid-1.0/xfire.mimas.ac.uk.xml b/swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml
index e5e3a10c..e5e3a10c 100644
--- a/swamid-1.0/xfire.mimas.ac.uk.xml
+++ b/swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml