Merge branch 'master' of git.swamid.se:swamid-metadata

author: Björn Mattsson <Bjorn.Mattsson@bth.se> 2020-01-09 11:36:12 +0100
committer: Björn Mattsson <Bjorn.Mattsson@bth.se> 2020-01-09 11:36:12 +0100
commit: 5f98a6e67f624b7fed467124f4aa05f37710e7a6 (patch)
tree: 509e5cd55e680253db5d45257ea89ceb5d37ed4e
parent: e3f6a02d5d26221221946d5d1a5592c922259359 (diff)
parent: 59eb9faf8b56d1c8c0896708c54b7e8511ac44b8 (diff)
12 files changed, 0 insertions, 986 deletions
diff --git a/sp-with-simplesign b/sp-with-simplesign
index 46a23926..0ed7c5ed 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -164,7 +164,6 @@ www.akademiskahogtider.se-shibboleth.xml
 www.antagning.nyautb.its.umu.se-ecs-sp.xml
 www.antagning.se-aws-sp.xml
 www.diva-portal.org-shibboleth.xml
-www.mit.ladok.se-gui-sp.xml
 www.nyautb.its.umu.se-aws-sp.xml
 www.servicedesk.its.umu.se-shibboleth.xml
 www.servicedesk.umdac.umu.se-shibboleth.xml
diff --git a/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml b/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
deleted file mode 100644
index dc4a6d5c..00000000
--- a/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.mit-integration.ladok.se/student-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/Login"/>
-      <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://student.mit-integration.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.mit-integration.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student web student.mit-integration.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.mit-integration.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.mit-integration.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://student.mit-integration.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.mit-integration.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.mit-integration.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDXjCCAkagAwIBAgIJAPfDdOaBXPJlMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNVBAMTIHN0dWRlbnQubWl0LWludGVncmF0aW9uLmxhZG9rLnNlMB4XDTE2MTAxMTE3NTAzOFoXDTI2MTAwOTE3NTAzOFowKzEpMCcGA1UEAxMgc3R1ZGVudC5taXQtaW50ZWdyYXRpb24ubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYuvmukfJb/jSe6SzFeoXEFRIMQd1HG1P6kHefPKTjFbEtj6xXPACFoAnvBmnNVtexOrOHMDMJvj6MhsNg5M6NTqRbsy5G1BdOT7i57/BwQ3MmPM0Um1sQqzN2hV+JwfLLwIxpwJmHqkXknSxhpyaYlIIJ/Unum4sD8+MX3i2yRAE1HeazypCvy4Z3weukWLdl+PmLbiS0NCF6ykuZPEFFISiB08aVYLbTk11eVT5pN5mOkpv5O+PvUrxonxK9qARgMwqVMn9W+ICOb6cYW+U1jy2InS45CxruWvA6v313TZDEptl8KhOEe/Au6Cc8lHsuznfwFl4nDD3o8rg1Zi9zAgMBAAGjgYQwgYEwYAYDVR0RBFkwV4Igc3R1ZGVudC5taXQtaW50ZWdyYXRpb24ubGFkb2suc2WGM2h0dHBzOi8vc3R1ZGVudC5taXQtaW50ZWdyYXRpb24ubGFkb2suc2Uvc3R1ZGVudC1zcDAdBgNVHQ4EFgQUalAJNcSpImmbNzkxXNzaLzaVhIwwDQYJKoZIhvcNAQEFBQADggEBAHq6UWwy5nK9qotqN0alNm/FDriwj8fzJyEyOzN5WX/adTB/SdDvJ9JiQc92cGTKl2hiJj68pD3hduoV//ETBreMiIbCAHcVT6x9mcbSCCASJsV9VgMJjsltaZlNSAwIlJrjwM1k94EoFhl+vdVr9zMOSYT46J0LOFEEf33yj5as4fz3vMydZTIeL1uYqBAi5EKzusY/EZJFtcJ5QRbM61d5VQ1kIsVxaltskEgPp3ao0p2+Ei8/Lqz4XGBeNZGynxYp6gcbs0+kGO80GrZkjkECDUoPuLLowdMRn/PQwPQ8UH02HIziYUqhQNHqGyDHulOnfa6ZzlsL7S8ieixWWes=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit.ladok.se-student-sp.xml b/swamid-2.0/student.mit.ladok.se-student-sp.xml
deleted file mode 100644
index f854469b..00000000
--- a/swamid-2.0/student.mit.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.mit.ladok.se/student-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.mit.ladok.se/Shibboleth.sso/Login"/>
-      <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://student.mit.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.mit.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student web student.mit.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.mit.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.mit.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://student.mit.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.mit.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.mit.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNTCCAh2gAwIBAgIJAJ3icKR+gNdqMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNVBAMTFHN0dWRlbnQubWl0LmxhZG9rLnNlMB4XDTE1MDIxMjA3MzEzOFoXDTI1MDIwOTA3MzEzOFowHzEdMBsGA1UEAxMUc3R1ZGVudC5taXQubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3GvpMV8JsG+orqyQ1bx9vsley4AxOB7nDmfRwX63t22mpyBDer4ZMMwDxb8lNf0a9rzXyfacDh6UkbBghPB6w71onmt60rCozzqCUOYwyPwocEQZ9mxelc9dEyN1c8WhyIo6BnhQWPbPr7Y+EAihe4oOK16p1w+wyPlKxNRj1g0zOJHvvmg2vbXALyt1xJ60y7vSWKiZEMDpclnTwHCd2icU7AB5REGBGxAV3rGVXQWzHZnDoP0NPr+OlzVbTowTAC7KoNlY0iBZwwtxyI1BolXgU4oN9Xlpnu/FroqFAlsCuyZCc3/VLNwiNl7wH8ZOYRBoy+6rJMPVBLf1TEA+ZAgMBAAGjdDByMFEGA1UdEQRKMEiCFHN0dWRlbnQubWl0LmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQubWl0LmxhZG9rLnNlL3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFGy8rVzZpS2hPPUQeQeK1LWAOhgZMA0GCSqGSIb3DQEBBQUAA4IBAQB2IVqSGbpJqO1bh7aHHdnnmw2Wbc3jnyU8dhbJ4PuEii1m6rbu8b+pdpwYjqit1UZ2RVjzaL384V8hCooWybOQ5phNj7pohwUqliPOX4rockK9nAhk0MT69KYArh+VfsvBmN9sb5ufCy4YS1P+vUWvWJqwmCwuKvBuCu3K8zI6QELhHFpafXTvkz+K+z3A22G1FigBqsMTua2Dzh2zE+wfcRwqZ+GwH0mN0iqxDJUKqgs9aEsl8Q9iHH1cmBYOMQnCaCIbnd6lXp4VZ3QgIMowFfU+rOyCR3jMz8kW9hLPuIGQXq65q14lETenxSds3d9Z6TGB6XbcaQxSEmvTJulB</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.mit.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.mit.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.utb2.ladok.se-student-sp.xml b/swamid-2.0/student.utb2.ladok.se-student-sp.xml
deleted file mode 100644
index f036ef2a..00000000
--- a/swamid-2.0/student.utb2.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.utb2.ladok.se/student-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.utb2.ladok.se/Shibboleth.sso/Login"/>
-      <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://student.utb2.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.utb2.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student web student.utb2.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.utb2.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.utb2.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://student.utb2.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.utb2.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.utb2.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAKAR9zTEEIJvMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMTFXN0dWRlbnQudXRiMi5sYWRvay5zZTAeFw0xNzA5MTEwODQ1MDdaFw0yNzA5MDkwODQ1MDdaMCAxHjAcBgNVBAMTFXN0dWRlbnQudXRiMi5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrVHWfo2d1CKpW1zEeWKC3MQnnHzlSfOW0NcsnAvGY44wU2sCuP2OxtJcVO8fXLt88DSTakvRPca4ipwW+8phNUa3KMDz5fcIWI557t+VvbuaHfc6BbaP4tLBGoOIGEQ9bdE6rhHKpP5UXOgwW1bRRPAyWSwn9vw7GI0PHpsYNibQa4mHvHIitCffHQTyz+jgD1Z7sxNIjkCVrojkfG2HYHMg+LFSnGh+K6C61PBmr7N0mJwQATJhNasXvAaj730UU26xFPJaRwtTiRtMnZ0Lf1rg99R0Nd82XnoopAVgTgL51dW1+cy4yHyfzeXei7gHWKRVJ+5EbUzWpfuoyyp2UCAwEAAaNtMGswSgYDVR0RBEMwQYIVc3R1ZGVudC51dGIyLmxhZG9rLnNlhihodHRwczovL3N0dWRlbnQudXRiMi5sYWRvay5zZS9zdHVkZW50LXNwMB0GA1UdDgQWBBS9YsQVdfuPYd2qyk05NsezqmfvHzANBgkqhkiG9w0BAQsFAAOCAQEACCnlmV7HyuaQ2k0vq0bgxd2vHiYF3MS660aJnAyQIY07Kh5FqQR2NdJkOOYQYrw1Adaa/2fFw2fUi86UcSswKWimleloMHx4Nwjit48cR4c6f3SSFJHNVI71IasSMv/ImRb4tN1cV1aNm+wYIfA1hikjYs/qnbz6KM17oxiAzNWwa8hy+WR/9/Yek3QXucRx4e0U/cM02xOlzko8OvdyW8Iko5PTNbGArY43y5V9pMwAH76HDNHVMCzLmMbIoYr0tFAbzicEFcjf/z0Kryklsd9alzCa6pWEtHDj2XozzaV0vZO1Ka5UGZn2OuKFPzglavkUk6/AkmFFYYkW1uxd7g==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb2.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb2.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb2.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb2.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb2.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb2.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb2.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb2.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb2.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
deleted file mode 100644
index e8baa0e4..00000000
--- a/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.verifiering1.ladok.se/student-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/Login"/>
-      <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://student.verifiering1.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.verifiering1.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student web student.verifiering1.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.verifiering1.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.verifiering1.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://student.verifiering1.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.verifiering1.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.verifiering1.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAPUhLJXX8MoBMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXN0dWRlbnQudmVyaWZpZXJpbmcxLmxhZG9rLnNlMB4XDTE2MDkwNTE0MDY1OVoXDTI2MDkwMzE0MDY1OVowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmluZzEubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7Px8hhcULhJrmgq2MwxLRFoRJTR4Yr4ooJ3hJvOgVgMwk/jwAAQKUjJPBsLZ4a9ToSsSGTnyozXFgkQ1lB+rZtxaIi++Wkw8law0ObJLlMfSLuIlZFzJkyFo3HWAnf1U9GpxdbdiWmQYwoAPUhouEc27MNWXyGNbdBUTHL+fG6rV6o8H0KLtn4ZIW3ASte/kfYVbGUyOgDW2pYdmPQvbknq+LcEw3UYt1qhGWADaPhLzH2LpLpTmtXfuZW4m9iPVCK4iQhFU9tXzjhMtXOLfxmmPNbTpXJ1XKjxNWfFddFqRMsZcMA3T4EG3Ear4HkJwIUyqfM1Bouht7KWwK4WnhAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZpZXJpbmcxLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmcxLmxhZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFLhXNKGeG1noLfc7DeO7/sYWlHVpMA0GCSqGSIb3DQEBBQUAA4IBAQBLefoziXmXeboXc+tjngPHhjoj1FMWntYwHYCdKbjQiR7/HL4NPqQMyGgtKUdwLXOmKS+N1Af63bOkGYFIypT+yho7o589uQH4AtL5EAX+tt0hmbZMD94Gy2KRScFN850Ku8WPoPAobx2Hnp+U0Wh+XLdG2D3QPvlZlvgIKARnhHKvBYURwuiCPAj+n6Tn+5hyMmK/2qXXaujMND28zdPghR3wsGJB3vpWszU2UNi1hwmtckifcwt6xHLEhkey12JcOGx8wFAvRs+7nV9otWcL09pmu0q10+IuQs730G9BDDPRMrswTNNWiYPHyFuwXZs0b/M+cUTnFKHgbDSLoW4I</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
deleted file mode 100644
index 4ccc4ddd..00000000
--- a/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.verifiering3.ladok.se/student-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/Login"/>
-      <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://student.verifiering3.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.verifiering3.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student web student.verifiering3.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.verifiering3.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.verifiering3.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://student.verifiering3.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.verifiering3.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.verifiering3.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANsnL5BGPQW4MA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNVBAMTHXN0dWRlbnQudmVyaWZpZXJpbmczLmxhZG9rLnNlMB4XDTE3MDUwNTA5MjAxOFoXDTI3MDUwMzA5MjAxOFowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmluZzMubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3QvP/gv/vw2kldqa3rvfHn3wrhsaw2XU6x6E1UahoyCDxbfa9rCcVwDMdZA0tXEvAZwlLoZ9BhtfpeUTtpDkYbJ+KLERt0AoZWMY6VbS/O14zuUOdsK8lVgnSbdZC4HKUvaZ9M7QVGpvvus42V6NHIozAlSjgoq4l4fGQ8tMGYce/vUX39OoQQbQM+CYI0nEeZQl9BLZfQ4gZri2sZJqe6XtDgosafXskBwasEF+EIxaQG0uyk8P1fwOvG6yomt5x72ZjEON2e/cVVauZE4sq7C6CAATyBYfr3SiMKwPNfWf4QqGZy+vVeCZ632DlIDlgdTAm/mKNneMO6AJrfmIjAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZpZXJpbmczLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmczLmxhZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFIunHXlNt0Hh7u+B/w1BPJMzendIMA0GCSqGSIb3DQEBCwUAA4IBAQBnwH0RHk66u5RTBPB90tZy56igXplUZQiZ45Xs1pdFHkaKlhldssDXSZa64TfJIaaXLt/Kf0d4CE1jxSi6y76L+PaeXvCHB/Uu5XgeIDYjHDWDVMNOU3smyECzVBUq703kdQ/YsXHG4AsUs8Jms/ch81KCjFFWicdy6/j4KRRDKzw2Hm+brJ0fYd5qrkbtm883PDVSMzz2K2HeZKBAmnEfeHgdiQhhOMD/6eAAdilLZZdiV4S3BMqr/E74Fg3nLYdadL4QKxE9qFw+XQJTM5gB2PohTxOCL1DdOMNEfc7cHBpwT44JCllErveMtQyLVozNsl3kC0KrSnyn7z+gshrg</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
deleted file mode 100644
index 58bf7719..00000000
--- a/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.mit-integration.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/Login"/>
-      <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://www.mit-integration.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok www.mit-integration.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.mit-integration.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.mit-integration.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.mit-integration.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.mit-integration.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.mit-integration.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.mit-integration.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAKYywn+rZRyTMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHd3dy5taXQtaW50ZWdyYXRpb24ubGFkb2suc2UwHhcNMTYxMDExMTc1MDI5WhcNMjYxMDA5MTc1MDI5WjAnMSUwIwYDVQQDExx3d3cubWl0LWludGVncmF0aW9uLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzVQjwYwGN579yQIvHQxGMlOOxzxGA29czwbT+Up9KVoPDyic4CCciNrL96H5JHPw+tw6zI0cebqfEV1K2bjj7+1W0ihOF83R6rTBhwwDdjb+fVBOY0jF5sqoFKEqN7TFu3Sd4ZygdyQ08+4Ak16xVPRXBZJeeSanBcUJ1yeHqD3YqUTW8O+sbaqsuXJfhGfpgFtgDGZPWLfW+op2CUG6Jx1Kx3L/+u8/+ttc/UYKYz6RTceXTCdALgDBkWqPZZ3gXGzt098WeBDqBClzCGmIJdt5YscHnWIbyOhbpJ8CgHEl6geS+cB3a+yhIWui74F9U3WYludLipPlP7EwvhMU+QIDAQABo3cwdTBUBgNVHREETTBLghx3d3cubWl0LWludGVncmF0aW9uLmxhZG9rLnNlhitodHRwczovL3d3dy5taXQtaW50ZWdyYXRpb24ubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBSKBxUct3WQikcVNHQYcL8t4rQv6jANBgkqhkiG9w0BAQUFAAOCAQEAVNTRRloLA42UnVL1bXIQce+IJkl+SvcV0enWO20CKcMR4ucsCIgkt6CbOEOEohrpsdqAO/UH8oN7r+p79l11nDgIfo9gCciEmX0iMnnA3pzS0U5mivqTiIBt0zGfuPZq2a3HaF6z/YNpHg1x7g+jrcyPyG03bvVsfFqONxL9wyHe5OyOjGYrJasbVF9mIknRJDORSKIIDAGruyIAb5r+ZI5Q2zCGMGKryinZpCeefIVIwf0452BF6+p9lCXJKCYhLJSnecP8o9QaSXCN1GXC9is/+MKXvg9doQ7XDl1Jb7foz3M74NN5Fhg/q1cnxZX7EnIbiwu2oIOGSPGcnAPbHA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
deleted file mode 100644
index 1bb25afc..00000000
--- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.mit.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mit.ladok.se/Shibboleth.sso/Login"/>
-      <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://www.mit.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok www.mit.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.mit.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.mit.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.mit.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.mit.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.mit.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.mit.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANNcGylEJgt3MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEHd3dy5taXQubGFkb2suc2UwHhcNMTMwNDExMDcwMDQ3WhcNMjMwNDA5MDcwMDQ3WjAbMRkwFwYDVQQDExB3d3cubWl0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAswDSRA8IdF5WRRtQ9BPH2bscDtgLSzXAhk3JdshVBQN2zlrewF0FAulDEm7Lv4Ci1n9/mT0ITxvybvB0KD6WrS1ac0sWk8gXenT2Qs9ldgOJjRpF2lH2E5nK063xFauLngf1EGFiPxN7Gaiq58dk8NWchcfW3mHuN4gQZi1kUH6hBXuuaIyDWyigyUzEUsTVDFhcLeIfylDSoM4wcL0QuBqFYBb4MyF6XLBCcQLeA+ugJMNmn/I4AzIdXF3WuopCYp3UWwhwKSwN57vdHMvi3E/9tXVVKZS8q4bdV3vFNgfvBrwWW3Aoq2KRB9jXH2fV3uUsXA4Hfre3ZetxO6cW6wIDAQABo18wXTA8BgNVHREENTAzghB3d3cubWl0LmxhZG9rLnNlhh9odHRwczovL3d3dy5taXQubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBQCB2VdO4d6ZY49UjaP0Wfm92LyJjANBgkqhkiG9w0BAQUFAAOCAQEAGO6QVRj8GjZNg0Z7wTVSQQVlTQhqp4OZIqNKgAFQNDd6sXc4Xe8AtIwcE6U7afG1R1uC80XE2HumOL84GqExtz23aLDKenFxe6w/QVRKXgDqYDjEVABSgE00pa3zSaDlBu6GpmcXsSjVyB5x641Si9oxZf6rhvqW1Lu/Lp+0FmX1DWmKNZfFVjy4HWD10ZYih94AG1VYNvy9nb17V+8s64tLdjhMZYoDHoONPtxNIEal5uvQvkwILAtVdnYhq7OrK0V41hm5A5BLnyDf/nJAJVEAt+FAn4TDZzMvqtO4x1r1gvPhhiXdvSpPHS4gwfMsYQ0SMmpyUlBMG0J8lN57vA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mit.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mit.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mit.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mit.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mit.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb2.ladok.se-gui-sp.xml b/swamid-2.0/www.utb2.ladok.se-gui-sp.xml
deleted file mode 100644
index 5a383ca4..00000000
--- a/swamid-2.0/www.utb2.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.utb2.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.utb2.ladok.se/Shibboleth.sso/Login"/>
-      <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://www.utb2.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok www.utb2.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.utb2.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.utb2.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.utb2.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.utb2.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.utb2.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.utb2.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAPbas4xUoylGMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEXd3dy51dGIyLmxhZG9rLnNlMB4XDTE3MDkxMTA4MzQyOVoXDTI3MDkwOTA4MzQyOVowHDEaMBgGA1UEAxMRd3d3LnV0YjIubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFXKWe12Tgp7gaml8ig7fJ6fpclWYzBkbicnfzjWdRJjsjAz+Gsah1fAfHngB7fOyanxh/LqOw/nTZ2dOojIH9+aSkObDY0dnmZtMIL7FZBr119VXqKCAvdm+mv0OgMY0tDaqtcTzBCLUSpEndkq7qqfkZJrH9lL39bl2y56GBOsPp5cD2J7f2s3SdZKcqslODLfplKjU0mWy2gSGZEp3Ug8U8ARZLpA8NFGTqAk4LhhvRVJdWjVOuQ6d2KnvSiG64Hnm4hLoXCXMKRJPtuHbrw5oC1EHrUTpca/t03bK/BL8W9P6hGy2isV0dckmi5s2LBF1HkYKjEJwLq0WuvMXBAgMBAAGjYTBfMD4GA1UdEQQ3MDWCEXd3dy51dGIyLmxhZG9rLnNlhiBodHRwczovL3d3dy51dGIyLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUj0BdzK5wRDsho7wGPzs1fgYOZp4wDQYJKoZIhvcNAQELBQADggEBADD6kIPqxgY7pwcr8ODZjxmb98pFXxk/oDt/hz9N+gUsbI1/kMHpJj18wijMszh4Wrnt/0D17mJxIcvmHl2KMpVgqor+sSKKU9OlC9ArtlquEaBk0Oppqn0VK5HJRDQehV+YfszbUClKXwFGJ2EBFtBq5xPCr2CoggvS7jAcmOzgk2/XTygdoNW1vc7hxZ6Rj2rjBM8gR7vLGW83HxQ0epGC/n28OAUPURU7g8TiXqMgOyhKM4iJqF2wU/d8oQ9QVnH0vETud43Uk66EobTGrFnKhdi/xp3mx8wDr0aJf5u2RXtmeH7cjxJnonRzkZR+mp6Ydij9ELcpHgQWNgRK3T0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb2.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb2.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb2.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb2.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb2.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb2.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb2.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb2.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb2.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
deleted file mode 100644
index 98e7dd00..00000000
--- a/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.verifiering1.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/Login"/>
-      <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://www.verifiering1.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok www.verifiering1.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.verifiering1.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.verifiering1.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.verifiering1.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.verifiering1.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.verifiering1.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.verifiering1.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOChsfr6DFrjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXd3dy52ZXJpZmllcmluZzEubGFkb2suc2UwHhcNMTYwOTA1MTQwNjUwWhcNMjYwOTAzMTQwNjUwWjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmcxLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlVEkFZvjnVEETJjC1b/NOdgHjtibedIxC6pYvY7xYUYtSgusdCHG2Z+WOrDEqLeuM3Sfm9G4ewYhfzk3dHL15myQzO/xpy6f9XmsLu7oZP5sGVqkucAsXfmbaXiWQY05TI22O0FVJ/dlq9GoaakkJgdFcipJmMBvgj2vcKa2vGo/jBcTCtlaSnvgIVl3bqNFP0sxcp+5/rLAZnVz+kxyZeZrrEre1PZb16vdnU4i6x90CGcIHUB6nK/oNUI8BVYApuxZncOFSEYhMFBLeuKKmPyEV21QTcMWH3FtjsXLK5K4nAJu+JdIOsqmppS3rAFw5VtXjM2rFf+MMixC8YzrQIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmcxLmxhZG9rLnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzEubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBRb6eM7QsqDRQmqIeL1j3sNS+x1vzANBgkqhkiG9w0BAQUFAAOCAQEAriRWOhRQv8X73Kv6+FIN0BLkVH3Fnkq6IwOLrfCPahCRhLNe3qfx6jTCQFfWj162FzbXOm6jTfvr6kzcXpkBc9N2b0qXV77czFscVvs5Qwg9r9ArFcmEFkVrnNIHak7b44heq5qmCdImFzK2CEkJ6syLFkHwjTggWM8XYgMeulHnUI1iHVrBxzMYR25/uMQiFMmpcHFoh/tNSSh6gl+s5oMBEkMF6SVcK+EXhVOGuXDEdqxvje96p6qIUXkJ2e5uc3akmJfasQifXMizZU+RvYsZlAc6UJMZ4L9N9BNi27nblnkoEbdd5StI89xQ6jaxZ6XnqgcSRWdfSe5JQXI4Yg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
deleted file mode 100644
index 6d4f4aec..00000000
--- a/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.verifiering3.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/Login"/>
-      <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://www.verifiering3.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok www.verifiering3.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.verifiering3.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.verifiering3.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.verifiering3.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.verifiering3.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.verifiering3.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.verifiering3.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJANgmwmOahKcoMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNVBAMTGXd3dy52ZXJpZmllcmluZzMubGFkb2suc2UwHhcNMTcwNTA1MDkyMDA5WhcNMjcwNTAzMDkyMDA5WjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmczLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoMkKJBKiVmiJ2em96OpucfAo/jgNJ/EDsbfw0R8xD93U1vs4EYE03vRSr3Qnoaxs4fgIJkQSvRXY7MOLsaSFJ99HZkMYsjSfFIqrhdK/HpfvnvzIUKaRbT6/dwdZEiL360X0JEpXn9N9ArVzpYFSzh/y++bs5vJG6M8gTE16dptsDeyvaKWHNPfDbMUk7HuTmm/dkP6uo4sNUbkPXKi8+sHhSmSSlX4CNsK2UxC+YudWaX2JUcKeON3RViIT7bskelv9Z3e1NY0QLD3ZESJnrZt6GnR/s4jmI6vouUL17qcECH4xPHWBH30GQso045R8FCJ2302L7eBLJOvpBy+6QIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmczLmxhZG9rLnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzMubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBR+HpER+M2Mbg+nI1BT68eUuNcIbjANBgkqhkiG9w0BAQsFAAOCAQEAB63YL3Sq71Yw9D3Z9omKDWVhs7qzEhXk2qdGTQg+YDD6jKt/tuPHwzXnuxf6H79ZsR6mkZ/1eaeuZ8zfOiL7YJOLzV7peEUVrgolO6ys2jnfdTqhHs8a0qyCC0IiAvWD0xnhtwit0w5TZz0jrYb9mMe3jS50smpw7y6dEdTdGjW8qQYWKQEIH5Y4eqU0djF0jBdvGdDYtcuJOW2rb0rcnXwQN+ELGSgEkpQDD59BBQ9ymkiyqJfRkHZ7i0a8rfrDmG2qTD0tk+mAK0G+GIsFGLvoAI04kOu1X9oaMAbmcn/vwgiAZpAp7ybxVeiF+ma1XM/cnNAHoSS5B7k3xzLyaw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f0e971a1..048acaf6 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -22,7 +22,6 @@
   <xi:include href="swamid-2.0/www.akademiskahogtider.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/www.mit.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/rems.csc.fi.xml"/>
   <xi:include href="swamid-2.0/ugit.se-sp.xml"/>
   <xi:include href="swamid-2.0/sgw.africa-grid.org-shibboleth.xml"/>
@@ -346,7 +345,6 @@
   <xi:include href="swamid-2.0/www.start.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/www.student.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/dev.play.sunet.se.xml"/>
-  <xi:include href="swamid-2.0/student.mit.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/gul.gu.se-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml"/>
@@ -370,8 +368,6 @@
   <xi:include href="swamid-2.0/sam.control.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/testplay.hhs.se.xml"/>
   <xi:include href="swamid-2.0/www4.kau.se-isp.xml"/>
-  <xi:include href="swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/student.verifiering1.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/play.hhs.se.xml"/>
   <xi:include href="swamid-2.0/openexam.bmc.uu.se-simplesaml.xml"/>
   <xi:include href="swamid-2.0/rb.lbic.lu.se.xml"/>
@@ -381,8 +377,6 @@
   <xi:include href="swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/moodle.med.lu.se-shibboleth.sso-login.xml"/>
   <xi:include href="swamid-2.0/play.hb.se.xml"/>
-  <xi:include href="swamid-2.0/student.mit-integration.ladok.se-student-sp.xml"/>
-  <xi:include href="swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/sp.haikom.com-saml.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-kth-student-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-kth-employee-sp.xml"/>
@@ -421,8 +415,6 @@
   <xi:include href="swamid-2.0/crowd.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.rkh.se.xml"/>
-  <xi:include href="swamid-2.0/student.utb2.ladok.se-student-sp.xml"/>
-  <xi:include href="swamid-2.0/www.utb2.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/eduroamkonto.kau.se.xml"/>
   <xi:include href="swamid-2.0/www.utbildning.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.utbildning.ladok.se-student-sp.xml"/>
@@ -433,8 +425,6 @@
   <xi:include href="swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml"/>
   <xi:include href="swamid-2.0/graylog.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/graylog.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/student.verifiering3.ladok.se-student-sp.xml"/>
-  <xi:include href="swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/test-ki.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ki.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml"/>
author	Björn Mattsson <Bjorn.Mattsson@bth.se>	2020-01-09 11:36:12 +0100
committer	Björn Mattsson <Bjorn.Mattsson@bth.se>	2020-01-09 11:36:12 +0100
commit	5f98a6e67f624b7fed467124f4aa05f37710e7a6 (patch)
tree	509e5cd55e680253db5d45257ea89ceb5d37ed4e
parent	e3f6a02d5d26221221946d5d1a5592c922259359 (diff)
parent	59eb9faf8b56d1c8c0896708c54b7e8511ac44b8 (diff)