SWAMID-489: Obsolete entities removed

9 files changed, 0 insertions, 740 deletions

diff --git a/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml b/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
deleted file mode 100644
index 8df93555..00000000
--- a/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<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://emrex-test.its.umu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-12-16T13:02:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes 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://emrex-test.its.umu.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://emrex-test.its.umu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">EMREX testmiljö</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">EMREX test site</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">EMREX-projektet stödjer EU:s mål för 2020 att 20% av högskolestuderande ska kunna vara mobila under studietiden.</mdui:Description>
-        <mdui:Description xml:lang="en">The EMREX project addresses the EU 2020 target that 20% of higher education students should be mobile during their studies.</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>emrex-test.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=emrex-test.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEBjCCAm6gAwIBAgIJAIDSDgbd4S8GMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFWVtcmV4LXRlc3QuaXRzLnVtdS5zZTAeFw0xNjEyMDYwODQxMjRaFw0yNjEy
-MDQwODQxMjRaMCAxHjAcBgNVBAMTFWVtcmV4LXRlc3QuaXRzLnVtdS5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMISmqRRw7Z7Jl8zgifKchPe75YW
-F1rotDpk3zWzntGgjiyuCQitYVJMgNUxKw0+zATnRKpInMuvJC6fPbFHQBlUcIYJ
-plzyPiIA5p+C1YpGuFLhO+rWyVar1lqPJttzd9wVfDfK2nhYM9EshBGd5Kt2/sEU
-xs0pcadGs7JDRe5XOZ8kIES+cQo1BWc/KheCdfZsj2jw6rx55PXvoZuTQdVRi53M
-ikxLqwWoG3U/G24MR9otSibQVi9k0/tLXmrz//L1S6lc4DPzy0WAxVQQf/JejfAb
-dAL4p7P/uwBhioQsYa/ZgT5eDMkLUQAZlAnCILFR0rFlvr3SOaqXPQvs4yrMJF52
-XiAeuCw8L0eYCocTZUXEyYe3g4+sy41DNjTiVZp5i7+blh/EEm8Gp/1A24Saurf2
-F4LAmndStnN3nIQZguXBWQAaCOB/svI3xUnOwMTOTWj7rb5HSxee6NHfOBrT1/7N
-4fh2sLjuzEiPLdJ7JWCdXxIez4zHWajkO2CrOQIDAQABo0MwQTAgBgNVHREEGTAX
-ghVlbXJleC10ZXN0Lml0cy51bXUuc2UwHQYDVR0OBBYEFMKf6PieEXQfy9QPuHfO
-AO8LIaIZMA0GCSqGSIb3DQEBCwUAA4IBgQBKFUjn9opTObvtHF4Kd8heq1OjAe6w
-u8HIkMbPCN/ROgDU13lG9zHirmbHVyxElHwgatTTX7TdvRPnqCfbN/GglVWfne0X
-LKo+EJLk06aoOL6NJ63wTnP46mYDBJkmVgLziskvXQoNu3C84CfX8QsOpHmrk3/V
-O4MqfJ5qyW/kAeiVfzfH+NSou2bCmk5ceL3OYAwkH3n7Z5paUkbEiZZN5BI9TF/Y
-HrhzaeTIXQH2CebE/9SFILY0s2M2DIfy1GWW7SDB8ZgPpb05yyVVVJ3s/5q+hdI9
-aWn+LGDbaCHZzuPd+JiCj34q/tEc2pWQ9iDOkbVAsgfz9bi0LcM8oyvNTkejZjPg
-AUxjAGwUlgfnDIx5RE4MxfDXNqPvGfQ1kQBhF54pmKZs1q8BF4ViVLo5KEBlwyg/
-wgPS44zDX5XafAC2Xo1uMaV/tAoFWGq4NnLQ5F1td1pl3fLXLFZu7sI6uYKi9sfk
-Rh2KVHAiKOIu9nyDsz3aAY17J2ju15aJRQc=
-</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://emrex-test.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex-test.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex-test.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex-test.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex-test.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Risto</md:GivenName>
-    <md:SurName>Järvi</md:SurName>
-    <md:EmailAddress>mailto:risto.jarvi@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/emrex.its.umu.se-gui-sp.xml b/swamid-2.0/emrex.its.umu.se-gui-sp.xml
deleted file mode 100644
index 2b1dcdcf..00000000
--- a/swamid-2.0/emrex.its.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<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://emrex.its.umu.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-11-05T16:09:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes 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://emrex.its.umu.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://emrex.its.umu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">EMREX produktionsmiljö</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">EMREX production site</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">EMREX-projektet stödjer EU:s mål för 2020 att 20% av högskolestuderande ska kunna vara mobila under studietiden.</mdui:Description>
-        <mdui:Description xml:lang="en">The EMREX project addresses the EU 2020 target that 20% of higher education students should be mobile during their studies.</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>emrex.its.umu.se</ds:KeyName>
-        <ds:KeyName>https://emrex.its.umu.se/gui-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=emrex.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAMIUlWJ7xFZzMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGVtcmV4Lml0cy51bXUuc2UwHhcNMTUxMTA1MTQ1MzU5WhcNMjUxMTAyMTQ1
-MzU5WjAbMRkwFwYDVQQDExBlbXJleC5pdHMudW11LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAu6IPSODdnS66qRsCbLYbc3i8U6tFUmCQ4Z5Ijg/n
-/yYiz0tg/1D7LCxh0ta3p8wF9MxDYh9nhviIU78uMV98NrX75EwF4D+9nW3XXero
-tRHiTlO7hY6CroLIefOsH9ISt0kIKT/mUI1L8ndBvBfCQvyzYEOy9PeOuru2QTg+
-dmDF9OCQPaBcoeoi+3zYLIO6OOAUutip4rnQuznOv8ddveP1HEjrei0XDBrCbIfJ
-0VzCJQdkW0vcIfXT5xwTOJcFYy6b4RPX3JSwENRrClMrunenPte+M5W1YJKCCi4I
-R900EiIufvuv+ZL2Jkklirley+uFnh9knSLIRM98Yy1j5wIDAQABo18wXTA8BgNV
-HREENTAzghBlbXJleC5pdHMudW11LnNlhh9odHRwczovL2VtcmV4Lml0cy51bXUu
-c2UvZ3VpLXNwMB0GA1UdDgQWBBRjTacbXCeuIkCrckKzgf8py2XPYzANBgkqhkiG
-9w0BAQUFAAOCAQEAdYdVEF1mEVnotpfzcrFXkmTsX+UwEXaePE2ZGbxHqSGPQ1mS
-1cWAIupgcxE2/pefCrWKIF+VDWQmVFWcALoQuWQMsya0SC2C5gnxzYQq1L6gkx8R
-HbVhdUuEJ38NPuWCQ3OFrEvdnlAx4NztXp2Gn2ItIeiEl3fLdGB8c/nRh0b09bY4
-1v7OnyOxAouCRGotnyHyd9aTwTVpBhG6LK2LYiA2v90c0fH24+BX4x5hrm54ysG0
-PHSmQco4ELsIfXuqrlyE3kVGajZ1BFwpp0gMGETRZE8nBZzPk0bgwq+hyfNIV2ZL
-uE4uozMTr+nt5X5/0Un+8KCKmppjT10d59uveg==
-</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://emrex.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml b/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
deleted file mode 100644
index 5e9b46bb..00000000
--- a/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     This is example metadata only. Do *NOT* supply it as is without review,
-     and do *NOT* provide it in real time to your partners.
-
-     This metadata is not dynamic - it will not change as your configuration changes.
--->
-<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://ladok3-00.ladok.umu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:11:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://ladok3-00.ladok.umu.se/idp/shibboleth">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">A Name for the IdP at ladok3-00.ladok.umu.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enter a description of your IdP at ladok3-00.ladok.umu.se</mdui:Description>
-        <mdui:Logo height="80" width="80">https://ladok3-00.ladok.umu.se/Path/To/Logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAKacUXSmz2+B3M6H5WqQH90cx5vhMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTYwMzE0
-MTMzNDQ3WhcNMzYwMzE0MTMzNDQ3WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFk
-b2sudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm0hyT+CZ
-NOD35y+5G3zimUw5zlb6TjVN6sorY0THK6ozKq1jz3Ahra6+6KlO8Pel+ATYBSxT
-uvA3tyiS3tPvVn1jkNzRlsl66KSrvKoG2/IrQX6pQKjkxYxtGPo9SzEByoD5NfY4
-rG97n5v0q8pdBGEcWFDDOTIpN482Kw+X9aH4QVOlwnbTsUXwOFNaAwRVZ++0bqnr
-EGlxgTqc9lI2X3Yt/BdCaiPhXeY4XutUwhRVf/nk4s8woa51cBoOClbCBXSy41KB
-DbaYP5UMcUgvg/Wg0Sp4UVdNaeS7ICDP29/dJqU4UfXYmT2084hvUdpEYt4dDcaX
-nHkHLJSfvgmRwQIDAQABo3MwcTAdBgNVHQ4EFgQUF7U504UY+P9jy+Ux2BeeTAUC
-AeAwUAYDVR0RBEkwR4IWbGFkb2szLTAwLmxhZG9rLnVtdS5zZYYtaHR0cHM6Ly9s
-YWRvazMtMDAubGFkb2sudW11LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQABVbIk9m49Pxxdr/+KQgKiZQ8k2UnLV/BS0M4jtwoJm4m56NDOdn2G
-PeapWMBx6FMtT762Mk6pzgSwgXfpQFuTGqmzpBwcA2RgoCuA9CO7ZHCU0vVNK79X
-Cc6qAnJ/Hisazm5YHNptzc6P67wC/ZaxzdkNpw+GnKQTT254aS2rj4emnA0Bwiqv
-Pvg72wNw6Ys7sYXjugeAcV0S+Q4yU57ufklNghaKd5TEx0IRZPgc3QAH2nnw6w7m
-+K+tK5yxYFUCo9GrKa9gLL9V+Umve3fhMbrFdHD+xJPAfUjmwClv6wldpUKNUDCT
-/VxfVtWUykmKXy4WbVFdu0rlnxflTabY
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAMWgQPqrZIbbvPtL1oZmwQBzm1lcMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTYwMzE0
-MTMzNDQ2WhcNMzYwMzE0MTMzNDQ2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFk
-b2sudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm2EkQBlK
-/qdWGU4/VEPqwawMw9Orawcfrc5IbAgua+k1hulDpqYB2FiBkY52mEh1EqVi8H9+
-nWrE9aE3x1znxz3d3ru+PZs1AL2kjnIruPbTz3leoQxNj7jo95TatQKN5798gEqR
-V5+Fhk85JxMtVFlcAAytJ7NuOIKlc3aG3WJzqiXmLpeXNj17YUQUUu8S7bDOVN8U
-Bn1XCypYQpV0eOTBgFHRFs2FiTq8exBirV0gaarKiEcOYn0T3Y+3d69nXvROBrS1
-4YuHOQJJ99i7Bu+k3UYw9Izqddb2bW3/niM/f8IXbnugQrU2eZEa2SeFNs4tvaHM
-ixjD+T9WRiuzTwIDAQABo3MwcTAdBgNVHQ4EFgQUPmSvsFW/S6GPphZ+UDTZHZWJ
-e1wwUAYDVR0RBEkwR4IWbGFkb2szLTAwLmxhZG9rLnVtdS5zZYYtaHR0cHM6Ly9s
-YWRvazMtMDAubGFkb2sudW11LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA3GlfOOoqZ9H1jtve7SbYrX9hs/ZZAF3OxRiy/md1RdCN8hv+nYSr2
-EisLltHsfBVBbHMQH5Uuw4Xw/nWG5D40W22u2XBgm3YoCAeEiuUZjatzgeAhv+of
-/6o3sQJVRFOKCnfz8iKTDIBE4rg9g3/gpiM3WryLs8+QuWLSadYbqdlvLMHztjDy
-G/G8HpzvxG85WKzV8usbWZjOzbG0KzEyyUO7W8iXDBorUCAdCSBDcAVESL87bPdU
-fRKN50kCy34sw6yGezgElF68DtKLKZLBZStgRlmvLtToWHst5rYwOFWgsBUpvWhW
-7zIV9KeE2XXMLUVwZT6l9vzGQDcMFQPu
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQzCCAiugAwIBAgIURrWa3y0QeqDkkKf022/NeinOYpQwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWbGFkb2szLTAwLmxhZG9rLnVtdS5zZTAeFw0xNjAzMTQx
-MzM0NDZaFw0zNjAzMTQxMzM0NDZaMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRv
-ay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRLh1bjTRY
-8PMvELqZphhoPXoBGspvdiwmSQXL6t7ziXAeevI1SvP1IbtHc3g7PCuka4WKIG9e
-rINK1CGPWfDO0P04Hqh5/H/qdXbNDL0lshoHLX2ujuSY4tpWiuWgOACxdsUlgVzG
-3eceAPvZAZLvZnaZdXMvIL1yspIdM5251BiMSoLwSDl9qJNgc8ANdrEcxAQOuzDv
-RSL+Kq2ZNkDhg//Kd4985LcFTQg0ypRu0ekOKSyfeBlhe3mOEIxEiiVpG0gEKFhh
-Skk/nx7+gwj5Xupv9uGPGIjGXiCTmveTEm4Z2sBm/pzmB4oQs6iDRATQwP6848vD
-4vIz5pl9sErDAgMBAAGjczBxMB0GA1UdDgQWBBQS8KELI7KVvXyUNMwWeSuEe3nj
-kzBQBgNVHREESTBHghZsYWRvazMtMDAubGFkb2sudW11LnNlhi1odHRwczovL2xh
-ZG9rMy0wMC5sYWRvay51bXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAGprMpgDnXA6tOJAverKpP/SXba+xfF073piO9txvIDwsjTHunEmo6ek
-iJk304TpgiJa6shlzgr+cwadJPXkDWYembGhXPxFL0STeltHcaedm3FhPRDMQsbw
-dt/C4iJtTazPzUCoD/0VFU8fn3jmqgAFjW2gs00Kz9Rqs9jVdeXxGGMrjUFm5mrE
-Q4chitYM61m+jOe+QJ9PicgtimB41WXatY6okE+vgdmzNtFocz1/zzbe9SzOAfgC
-QfQy1lyrNjxrtHbS9ZGNpgVlaNvNHWF4ENGIAuxBLO2IZ6TgLGdNtB0Cn3c+Xdti
-0regEATed4ho2sgF80Y5KCKEhOV6vSU=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-00.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-00.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAKacUXSmz2+B3M6H5WqQH90cx5vhMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTYwMzE0
-MTMzNDQ3WhcNMzYwMzE0MTMzNDQ3WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFk
-b2sudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm0hyT+CZ
-NOD35y+5G3zimUw5zlb6TjVN6sorY0THK6ozKq1jz3Ahra6+6KlO8Pel+ATYBSxT
-uvA3tyiS3tPvVn1jkNzRlsl66KSrvKoG2/IrQX6pQKjkxYxtGPo9SzEByoD5NfY4
-rG97n5v0q8pdBGEcWFDDOTIpN482Kw+X9aH4QVOlwnbTsUXwOFNaAwRVZ++0bqnr
-EGlxgTqc9lI2X3Yt/BdCaiPhXeY4XutUwhRVf/nk4s8woa51cBoOClbCBXSy41KB
-DbaYP5UMcUgvg/Wg0Sp4UVdNaeS7ICDP29/dJqU4UfXYmT2084hvUdpEYt4dDcaX
-nHkHLJSfvgmRwQIDAQABo3MwcTAdBgNVHQ4EFgQUF7U504UY+P9jy+Ux2BeeTAUC
-AeAwUAYDVR0RBEkwR4IWbGFkb2szLTAwLmxhZG9rLnVtdS5zZYYtaHR0cHM6Ly9s
-YWRvazMtMDAubGFkb2sudW11LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQABVbIk9m49Pxxdr/+KQgKiZQ8k2UnLV/BS0M4jtwoJm4m56NDOdn2G
-PeapWMBx6FMtT762Mk6pzgSwgXfpQFuTGqmzpBwcA2RgoCuA9CO7ZHCU0vVNK79X
-Cc6qAnJ/Hisazm5YHNptzc6P67wC/ZaxzdkNpw+GnKQTT254aS2rj4emnA0Bwiqv
-Pvg72wNw6Ys7sYXjugeAcV0S+Q4yU57ufklNghaKd5TEx0IRZPgc3QAH2nnw6w7m
-+K+tK5yxYFUCo9GrKa9gLL9V+Umve3fhMbrFdHD+xJPAfUjmwClv6wldpUKNUDCT
-/VxfVtWUykmKXy4WbVFdu0rlnxflTabY
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAMWgQPqrZIbbvPtL1oZmwQBzm1lcMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTYwMzE0
-MTMzNDQ2WhcNMzYwMzE0MTMzNDQ2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFk
-b2sudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm2EkQBlK
-/qdWGU4/VEPqwawMw9Orawcfrc5IbAgua+k1hulDpqYB2FiBkY52mEh1EqVi8H9+
-nWrE9aE3x1znxz3d3ru+PZs1AL2kjnIruPbTz3leoQxNj7jo95TatQKN5798gEqR
-V5+Fhk85JxMtVFlcAAytJ7NuOIKlc3aG3WJzqiXmLpeXNj17YUQUUu8S7bDOVN8U
-Bn1XCypYQpV0eOTBgFHRFs2FiTq8exBirV0gaarKiEcOYn0T3Y+3d69nXvROBrS1
-4YuHOQJJ99i7Bu+k3UYw9Izqddb2bW3/niM/f8IXbnugQrU2eZEa2SeFNs4tvaHM
-ixjD+T9WRiuzTwIDAQABo3MwcTAdBgNVHQ4EFgQUPmSvsFW/S6GPphZ+UDTZHZWJ
-e1wwUAYDVR0RBEkwR4IWbGFkb2szLTAwLmxhZG9rLnVtdS5zZYYtaHR0cHM6Ly9s
-YWRvazMtMDAubGFkb2sudW11LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA3GlfOOoqZ9H1jtve7SbYrX9hs/ZZAF3OxRiy/md1RdCN8hv+nYSr2
-EisLltHsfBVBbHMQH5Uuw4Xw/nWG5D40W22u2XBgm3YoCAeEiuUZjatzgeAhv+of
-/6o3sQJVRFOKCnfz8iKTDIBE4rg9g3/gpiM3WryLs8+QuWLSadYbqdlvLMHztjDy
-G/G8HpzvxG85WKzV8usbWZjOzbG0KzEyyUO7W8iXDBorUCAdCSBDcAVESL87bPdU
-fRKN50kCy34sw6yGezgElF68DtKLKZLBZStgRlmvLtToWHst5rYwOFWgsBUpvWhW
-7zIV9KeE2XXMLUVwZT6l9vzGQDcMFQPu
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQzCCAiugAwIBAgIURrWa3y0QeqDkkKf022/NeinOYpQwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWbGFkb2szLTAwLmxhZG9rLnVtdS5zZTAeFw0xNjAzMTQx
-MzM0NDZaFw0zNjAzMTQxMzM0NDZaMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRv
-ay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRLh1bjTRY
-8PMvELqZphhoPXoBGspvdiwmSQXL6t7ziXAeevI1SvP1IbtHc3g7PCuka4WKIG9e
-rINK1CGPWfDO0P04Hqh5/H/qdXbNDL0lshoHLX2ujuSY4tpWiuWgOACxdsUlgVzG
-3eceAPvZAZLvZnaZdXMvIL1yspIdM5251BiMSoLwSDl9qJNgc8ANdrEcxAQOuzDv
-RSL+Kq2ZNkDhg//Kd4985LcFTQg0ypRu0ekOKSyfeBlhe3mOEIxEiiVpG0gEKFhh
-Skk/nx7+gwj5Xupv9uGPGIjGXiCTmveTEm4Z2sBm/pzmB4oQs6iDRATQwP6848vD
-4vIz5pl9sErDAgMBAAGjczBxMB0GA1UdDgQWBBQS8KELI7KVvXyUNMwWeSuEe3nj
-kzBQBgNVHREESTBHghZsYWRvazMtMDAubGFkb2sudW11LnNlhi1odHRwczovL2xh
-ZG9rMy0wMC5sYWRvay51bXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAGprMpgDnXA6tOJAverKpP/SXba+xfF073piO9txvIDwsjTHunEmo6ek
-iJk304TpgiJa6shlzgr+cwadJPXkDWYembGhXPxFL0STeltHcaedm3FhPRDMQsbw
-dt/C4iJtTazPzUCoD/0VFU8fn3jmqgAFjW2gs00Kz9Rqs9jVdeXxGGMrjUFm5mrE
-Q4chitYM61m+jOe+QJ9PicgtimB41WXatY6okE+vgdmzNtFocz1/zzbe9SzOAfgC
-QfQy1lyrNjxrtHbS9ZGNpgVlaNvNHWF4ENGIAuxBLO2IZ6TgLGdNtB0Cn3c+Xdti
-0regEATed4ho2sgF80Y5KCKEhOV6vSU=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-00.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>ITS, Umea universitet</Company>
-    <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>ITS, Umea universitet</Company>
-    <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>ITS, Umea universitet</Company>
-    <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml
deleted file mode 100644
index 526041b8..00000000
--- a/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml
+++ /dev/null
@@ -1,89 +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://ladok3-jenkins.ladok.umu.se/securityRealm/finishLogin">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-17T14:11:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Inloggning Jenkins Ladok3</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 Jenkins login</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inloggning mot Ladok3:s Jenkins</mdui:Description>
-        <mdui:Description xml:lang="en">Login to Ladok3 Jenkins</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIEJudoaDANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdVbmtub3duMRAw
-DgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYDVQQKEwdVbmtub3duMRAwDgYD
-VQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3duMB4XDTE3MDExMzA5MjIzMVoXDTI3MDExMTA5
-MjIzMVowbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5r
-bm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIP8E+1UWC6THFR8PvNo6enlD9/cDwge
-DBcMZfSNExv6FsNAvForGr/P0WONMNHNgc6xl1FXxFubz4Ce0b6NyRsH5fIr59/ASc5t/jIS1z8z
-S2NOQC1ltRaSKYJTnBsiXKDLJPqFR4XtqN7TsUjLF6KRVfmx7FUhU9ccVONJxDstymN8sF1oGq2s
-LitZiVYb98ZPgILNFk0B064rhL2P65NQ0rZNzyvogp3uNexg+pxS2FyG26X136qbnmvAzJGbo5s/
-Rk2vW3CTEpPISvQW4kNlBDPz5S/epRa5bdJsGLHJkBJCKo0bTjzwg6/T19rSzrxdzt6tBD3vUzYX
-mhdgLSsCAwEAAaMhMB8wHQYDVR0OBBYEFPj1pmO/WxXRBHNpAsolfuhenJV6MA0GCSqGSIb3DQEB
-CwUAA4IBAQBRultcmx0OePrE+Q5m9bza3H9X9Nwn3vpfCQtg9VFhCfP1l4Kdy72cXXSKK+oRA1Zb
-+221oO474dUxNQ8RlG9HaeNxGiUkyoYeHLfyIoU3zR+Sk1t1v9uEGvUG4ALmNdqJD5T0yNh+B029
-HkiecYTX5/KhlMSyQQyqd1TbssLdg/GM7hYmIWosanb1ueFkyv6gYyh6ZgZgza6tf63gjVvvYTog
-bYrcg39YS/2EWWrboSpMu2+agRG+NebnTpJzKirx/I1dZldnmvxN+j4ZhMoMZq+qZ4XK3kNY1q76
-+8sPLliD3nUprmKNJKgFYAni7n4fEGA27w+s19nQittHAwzu</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIEJudoaDANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdVbmtub3duMRAw
-DgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYDVQQKEwdVbmtub3duMRAwDgYD
-VQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3duMB4XDTE3MDExMzA5MjIzMVoXDTI3MDExMTA5
-MjIzMVowbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5r
-bm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIP8E+1UWC6THFR8PvNo6enlD9/cDwge
-DBcMZfSNExv6FsNAvForGr/P0WONMNHNgc6xl1FXxFubz4Ce0b6NyRsH5fIr59/ASc5t/jIS1z8z
-S2NOQC1ltRaSKYJTnBsiXKDLJPqFR4XtqN7TsUjLF6KRVfmx7FUhU9ccVONJxDstymN8sF1oGq2s
-LitZiVYb98ZPgILNFk0B064rhL2P65NQ0rZNzyvogp3uNexg+pxS2FyG26X136qbnmvAzJGbo5s/
-Rk2vW3CTEpPISvQW4kNlBDPz5S/epRa5bdJsGLHJkBJCKo0bTjzwg6/T19rSzrxdzt6tBD3vUzYX
-mhdgLSsCAwEAAaMhMB8wHQYDVR0OBBYEFPj1pmO/WxXRBHNpAsolfuhenJV6MA0GCSqGSIb3DQEB
-CwUAA4IBAQBRultcmx0OePrE+Q5m9bza3H9X9Nwn3vpfCQtg9VFhCfP1l4Kdy72cXXSKK+oRA1Zb
-+221oO474dUxNQ8RlG9HaeNxGiUkyoYeHLfyIoU3zR+Sk1t1v9uEGvUG4ALmNdqJD5T0yNh+B029
-HkiecYTX5/KhlMSyQQyqd1TbssLdg/GM7hYmIWosanb1ueFkyv6gYyh6ZgZgza6tf63gjVvvYTog
-bYrcg39YS/2EWWrboSpMu2+agRG+NebnTpJzKirx/I1dZldnmvxN+j4ZhMoMZq+qZ4XK3kNY1q76
-+8sPLliD3nUprmKNJKgFYAni7n4fEGA27w+s19nQittHAwzu</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-jenkins.ladok.umu.se/securityRealm/finishLogin" index="0"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.its.umu.se-user-idp.xml b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
deleted file mode 100644
index 90b05816..00000000
--- a/swamid-2.0/ladok3.its.umu.se-user-idp.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3.its.umu.se/user-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-02-28T09:03:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" errorURL="https://ladok3.its.umu.se/errorURL/ERRORURL_CODE.html?ts=ERRORURL_TS&amp;rp=ERRORURL_RP&amp;tid=ERRORURL_TID&amp;ctx=ERRORURL_CTX" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBgTCCASugAwIBAgIJAILqNDVSOCaoMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMMEWxhZG9rMy5pdHMudW11LnNlMB4XDTEzMDYxMDEwMTA1MVoXDTIzMDYwODEwMTA1MVowHDEaMBgGA1UEAwwRbGFkb2szLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA3RHbH3LNInhSmCRm7G3ZnLqsEssUOcen614tIf/ckNXydLzZQcz1q+8F6QX5xbSe0FX6/u+pdpGA+/QA/te7lQIDAQABo1AwTjAdBgNVHQ4EFgQUkk1KT40H7CW5JK981BlxtE6dJ2UwHwYDVR0jBBgwFoAUkk1KT40H7CW5JK981BlxtE6dJ2UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAARtOOinipnAe9MuquFjbau9DfAQdFhDeRBdds7VUCXcj9Gc9RE4+kSRR3RhBnj86QYeu3Hch1wWkUU/bnNEAjI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3.its.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.its.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3.its.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.its.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3.its.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3.its.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBgTCCASugAwIBAgIJAILqNDVSOCaoMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMMEWxhZG9rMy5pdHMudW11LnNlMB4XDTEzMDYxMDEwMTA1MVoXDTIzMDYwODEwMTA1MVowHDEaMBgGA1UEAwwRbGFkb2szLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA3RHbH3LNInhSmCRm7G3ZnLqsEssUOcen614tIf/ckNXydLzZQcz1q+8F6QX5xbSe0FX6/u+pdpGA+/QA/te7lQIDAQABo1AwTjAdBgNVHQ4EFgQUkk1KT40H7CW5JK981BlxtE6dJ2UwHwYDVR0jBBgwFoAUkk1KT40H7CW5JK981BlxtE6dJ2UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAARtOOinipnAe9MuquFjbau9DfAQdFhDeRBdds7VUCXcj9Gc9RE4+kSRR3RhBnj86QYeu3Hch1wWkUU/bnNEAjI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3.its.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.its.umu.se:8445/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>ITS, Umea universitet</Company>
-    <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>ITS, Umea universitet</Company>
-    <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>ITS, Umea universitet</Company>
-    <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-user-idp.xml b/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
deleted file mode 100644
index 7b49cd85..00000000
--- a/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3test.its.umu.se/user-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-02-28T09:03:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://ladok3test.its.umu.se/user-idp">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBiTCCATOgAwIBAgIJALdp5a/xlxT7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMMFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTAeFw0xMjA4MjkwOTAxNDNaFw0yMjA4MjcwOTAxNDNaMCAxHjAcBgNVBAMMFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDFPtcei8TeZXig5GCDrsCdIQQmyA6wBU/PGp3PYrQ+D88y6BS5pWL5T/yNVjQNVQL7s/gDuAPx7EEPc7hEQbjlAgMBAAGjUDBOMB0GA1UdDgQWBBRBXDH06EuK38we1rGgnsdCV+26UDAfBgNVHSMEGDAWgBRBXDH06EuK38we1rGgnsdCV+26UDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAiVI4ufIl15vCIbIRdV4lK8s0VjrgPCbcknAPPFZGRtWB83ptfgyuyZuQ6NbGPRCkJA9nxPbX5FlMKbokBG9zgg==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3test.its.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3test.its.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3test.its.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3test.its.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3test.its.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3test.its.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBiTCCATOgAwIBAgIJALdp5a/xlxT7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMMFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTAeFw0xMjA4MjkwOTAxNDNaFw0yMjA4MjcwOTAxNDNaMCAxHjAcBgNVBAMMFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDFPtcei8TeZXig5GCDrsCdIQQmyA6wBU/PGp3PYrQ+D88y6BS5pWL5T/yNVjQNVQL7s/gDuAPx7EEPc7hEQbjlAgMBAAGjUDBOMB0GA1UdDgQWBBRBXDH06EuK38we1rGgnsdCV+26UDAfBgNVHSMEGDAWgBRBXDH06EuK38we1rGgnsdCV+26UDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAiVI4ufIl15vCIbIRdV4lK8s0VjrgPCbcknAPPFZGRtWB83ptfgyuyZuQ6NbGPRCkJA9nxPbX5FlMKbokBG9zgg==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3test.its.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3test.its.umu.se:8445/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>ITS, Umea universitet</Company>
-    <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>ITS, Umea universitet</Company>
-    <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>ITS, Umea universitet</Company>
-    <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml
deleted file mode 100644
index 86e4ddd5..00000000
--- a/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml
+++ /dev/null
@@ -1,100 +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://led-jenkins.its.umu.se/securityRealm/finishLogin">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-08-25T20:24:21Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:DigestMethod 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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init">
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://led-jenkins.its.umu.se/securityRealm/finishLogin"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Inloggning LED-Jenkins Ladok3</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 LED-Jenkins login</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inloggning mot Ladok3:s LED-Jenkins</mdui:Description>
-        <mdui:Description xml:lang="en">Login to Ladok3 LED-Jenkins</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDfTCCAmWgAwIBAgIECHqRCjANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJzZTENMAsGA1UE
-CBMEVW1lYTENMAsGA1UEBxMEVW1lYTEMMAoGA1UEChMDVW1VMRAwDgYDVQQLEwdJVFMtTEVEMSIw
-IAYDVQQDExlqZW5raW5zMDEucm9tZTAxLmxlZC1zYW1sMB4XDTE3MDgxNTA0NTA0M1oXDTI3MDgx
-MzA0NTA0M1owbzELMAkGA1UEBhMCc2UxDTALBgNVBAgTBFVtZWExDTALBgNVBAcTBFVtZWExDDAK
-BgNVBAoTA1VtVTEQMA4GA1UECxMHSVRTLUxFRDEiMCAGA1UEAxMZamVua2luczAxLnJvbWUwMS5s
-ZWQtc2FtbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI03zQrLyLKJm7WoOwxpQn/I
-hzwlm1IMCxtQtVl+nL4kXgtwQSKotN+mNS2uUUH0Xp+l9z9MtB/gcwdY3rqH+avNkXNNRwx/QyuE
-uvETh+1v/Ddy0x/DZOY2lYmnHJSXIqhWZxZvkNYcHxYg+84XFKwGWHXmodELIzblEdCoe0ypwBSS
-Jbn83tjDEGFRwGpO5uKn/FYVfmMtia36TzDBjjpiZ4hvEYwTijT6vVitQA8DXX3xSJ5ZSJEDiVfi
-6mvbkoT/l3nWxkybL1sJ2D6IoYrWDspXS6ia48fs4jli+KESp/gpwZ6o2SgYIXUzMOet4WoHs26S
-cGDnhMrWpV71/0MCAwEAAaMhMB8wHQYDVR0OBBYEFMDFdtytTULtwoIoxjvoyUbQBRtZMA0GCSqG
-SIb3DQEBCwUAA4IBAQADtyTaqXetnLRxOZY/eU9ck0XIDNbtdwiKTjrKF8cNwmbqgAqQPDQXL5jd
-d2ax5fmv+/GJPzJNm4kSCSmteCOtTl3BYEsV3sXiOJFc4CWr8mWFywBlUmLuT14DjB1XkW/BT6Z+
-AA/KKN8EmSlCMa1UYS2jsvTGXZL7qXjGTRlLcm1RIL/F1IapyTOeGEUzFl1hQKvH3asYGqUoQXU8
-qf9L/rh8qEtmht6jQg6gl5IwrSyqEVtpogVJzZ0SRGWmaWB2h/r6jLJs6qA8sI+9f2GxNjZHcHgM
-UHBO2OxgB6kTfTRUobl+uVQ3HZbL8RSvI25ox/Gab43L9VxQvacM55Lc</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDfTCCAmWgAwIBAgIECHqRCjANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJzZTENMAsGA1UE
-CBMEVW1lYTENMAsGA1UEBxMEVW1lYTEMMAoGA1UEChMDVW1VMRAwDgYDVQQLEwdJVFMtTEVEMSIw
-IAYDVQQDExlqZW5raW5zMDEucm9tZTAxLmxlZC1zYW1sMB4XDTE3MDgxNTA0NTA0M1oXDTI3MDgx
-MzA0NTA0M1owbzELMAkGA1UEBhMCc2UxDTALBgNVBAgTBFVtZWExDTALBgNVBAcTBFVtZWExDDAK
-BgNVBAoTA1VtVTEQMA4GA1UECxMHSVRTLUxFRDEiMCAGA1UEAxMZamVua2luczAxLnJvbWUwMS5s
-ZWQtc2FtbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI03zQrLyLKJm7WoOwxpQn/I
-hzwlm1IMCxtQtVl+nL4kXgtwQSKotN+mNS2uUUH0Xp+l9z9MtB/gcwdY3rqH+avNkXNNRwx/QyuE
-uvETh+1v/Ddy0x/DZOY2lYmnHJSXIqhWZxZvkNYcHxYg+84XFKwGWHXmodELIzblEdCoe0ypwBSS
-Jbn83tjDEGFRwGpO5uKn/FYVfmMtia36TzDBjjpiZ4hvEYwTijT6vVitQA8DXX3xSJ5ZSJEDiVfi
-6mvbkoT/l3nWxkybL1sJ2D6IoYrWDspXS6ia48fs4jli+KESp/gpwZ6o2SgYIXUzMOet4WoHs26S
-cGDnhMrWpV71/0MCAwEAAaMhMB8wHQYDVR0OBBYEFMDFdtytTULtwoIoxjvoyUbQBRtZMA0GCSqG
-SIb3DQEBCwUAA4IBAQADtyTaqXetnLRxOZY/eU9ck0XIDNbtdwiKTjrKF8cNwmbqgAqQPDQXL5jd
-d2ax5fmv+/GJPzJNm4kSCSmteCOtTl3BYEsV3sXiOJFc4CWr8mWFywBlUmLuT14DjB1XkW/BT6Z+
-AA/KKN8EmSlCMa1UYS2jsvTGXZL7qXjGTRlLcm1RIL/F1IapyTOeGEUzFl1hQKvH3asYGqUoQXU8
-qf9L/rh8qEtmht6jQg6gl5IwrSyqEVtpogVJzZ0SRGWmaWB2h/r6jLJs6qA8sI+9f2GxNjZHcHgM
-UHBO2OxgB6kTfTRUobl+uVQ3HZbL8RSvI25ox/Gab43L9VxQvacM55Lc</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://led-jenkins.its.umu.se/securityRealm/finishLogin" index="0"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b3c8e11a..a792b19b 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -251,7 +251,6 @@
   <xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ubas.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/emrex.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/play.mah.se.xml"/>
   <xi:include href="swamid-2.0/ac-w01.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hobel.c3se.chalmers.se.xml"/>
@@ -317,7 +316,6 @@
   <xi:include href="swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.ki.se.xml"/>
-  <xi:include href="swamid-2.0/emrex-test.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/video.nordu.net.xml"/>
   <xi:include href="swamid-2.0/test.account.hj.se-adfs-services-trust.xml"/>
@@ -340,7 +338,6 @@
   <xi:include href="swamid-2.0/registry-test.swamid.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/test.play.rkh.se.xml"/>
   <xi:include href="swamid-2.0/ladok3.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml"/>
   <xi:include href="swamid-2.0/play.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/crowd.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd-test.sunet.se-shibboleth.xml"/>
@@ -364,7 +361,6 @@
   <xi:include href="swamid-2.0/se.timeedit.net-ki.xml"/>
   <xi:include href="swamid-2.0/irttools.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml"/>
   <xi:include href="swamid-2.0/portaluu.onricoh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml"/>
   <xi:include href="swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 894a33b4..85f8670d 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -13,17 +13,14 @@
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/minastudier.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-2.0/ladok3test.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/bhb-00.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-2.0/ladok3.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibboleth.umu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.tst.ki.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.uhr.se-idp-shibboleth.xml"/>