Rearranged files into separate dirs for swamid-edugain and swamid-testing

author: Björn Mattsson <bjorn@sunet.se> 2022-11-17 16:57:30 +0100
committer: Björn Mattsson <bjorn@sunet.se> 2022-11-17 16:57:30 +0100
commit: c9b4889e429634c798766f7da20b16265c8fd750 (patch)
tree: 99efb7ab8f2e062bb5bda4497ed005fa76ab20db /swamid-2.0
parent: fea25a2892a986b21b9790db40213c0d743f9455 (diff)
160 files changed, 0 insertions, 21674 deletions
diff --git a/swamid-2.0/account.eciu.eu.xml b/swamid-2.0/account.eciu.eu.xml
deleted file mode 100644
index 9d484c99..00000000
--- a/swamid-2.0/account.eciu.eu.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://account.eciu.eu">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-08-22T07:40:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">ECIU University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ECIU University</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dxpfrontendprod.blob.core.windows.net/public/PrivacyPolicy.htm</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://dxpfrontendprod.blob.core.windows.net/public/PrivacyPolicy.htm</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="145" width="200">https://dxpfrontendprod.blob.core.windows.net/public/eciu-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIQc7fpBidTCIhIyLpwOXJsejANBgkqhkiG9w0BAQsFADAa
-MRgwFgYDVQQDDA9hY2NvdW50LmVjaXUuZXUwHhcNMjIxMTE0MDkxMjA0WhcNNDIx
-MTE0MDkyMjAxWjAaMRgwFgYDVQQDDA9hY2NvdW50LmVjaXUuZXUwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQC5kcPhhabKviBR3uciTlhQRQ9drLA0gKtB
-yYV1b/dNVIH7gcJS+s0G/Fj5+vKCCfjrSOb5jM2iX2+laATDa3qDVpDO02f/T40L
-s4GBsGIX7m5FD2xncoHSjbW9pa0Igt/VaaqK+UwTpMzzyd4TrtbTwjja3OpdziXz
-N6V8UXNh1LaoPKMC6mN0lAk515aETk1Elrs5QP9sROtu7ARGt2z3D8NX/1/53CcZ
-tKLXmWT7o3y7zF7eJbaAB5W5CAZrp7c7KdkHDZmKHZphQwDDUP7o1ufo3gQRF9Da
-5eeDe8hRZNavfBQwZ8Hx+WwTwEfQge5dHDI2hp447CQZGRtpZRBsjrmIEWrqZQ4O
-gUGxmXHkKf6yO4pC0vsDbz00uBJTgE2MUB76NMhcmxx/Tsj9iCzva0U+O3KbaHTH
-t2G/SPfc8v7j22dD57sq3G5sfMhT15Z7s2rmB3Idsttla2+pIiI5JUjm2gWQGypA
-eOZejLDHIEYeEoMcd/9A2+62MaMjtFTF6F0RMTfNZGJvA+/WTdBL34dkF7UA06il
-bZXW+IBLj4vqJYLNjHa+irR0MAZbM10pAQmC7yPX2mdPsoC/vj4pJR1Lo8fsme/q
-7EgUK3Z6N6rijnTDjqyd+RxXRm2vq9TJONvU7OJ9Jo5t4l+RBdvJDtw8llE+hHJl
-Wv3u8q61xQIDAQABo1AwTjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTorHcZyd8isMLRdNQABsLRQx2M2DAN
-BgkqhkiG9w0BAQsFAAOCAgEAALhC+yRS00kCJ6ZAkyQ4mGwtZ+hPCclHfyF4skgt
-RB4SU0pv0PA271HRMRl8knBxMu0zL2757gQ6e1FA1815pC90/FdD59H4PSo1CwkO
-Oj8+zgj36yipTLIuH78ao8MFVXMkLbKT8ZF1GZJkalFO1tXN1pLsI8oFx2+4SIhq
-KOqIG2L1Tvdxjt4l9FBONghzNCP5FwFzdKr6gFPf2HcmaYCHmSs2RjwUJK2PGeaV
-4kuNmwSIK21DLpoasbU2/ck4I+9+hxb98z7a+ZigMDZQh10xbwpou/VoazZmDBLQ
-BWEVe9yL0SdSWsw7G+lEUED++bMZTaqAtedoqabT73OXQgvjOSd6uT58XyF7/7iX
-EI6zhFbBNqZDvM6cC0/5uTDA011Q6YGBPOumR9EBdwyM2f1GhRQBT6ig+Foth+1k
-YduNtFQ0agymAGpmay7pBpkOoDOBD3iJQgKchXU/fuq+5R136rpS33SGMhXfwKA9
-G+8CElvbGQtJ1YNRk7rQkkY/t8u28j0zQoHAGXyO4YJpTOheBD7zPUuD7AuhjZVw
-JW+G1DjnfzzKu6Ed/OlWnsYExbAcLhGM5WkFF+1R+6SUdJ6RQww3YTfoHZwv0/vn
-5rlwTpaharTWqpN0ApjoLY1vcHr+ABtssy9+AqleepQUfDJ3vMp3oF5IfkqjJgzl
-SQg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIQGw3VmlAoY6pO8rb+A3rTUjANBgkqhkiG9w0BAQsFADAa
-MRgwFgYDVQQDDA9hY2NvdW50LmVjaXUuZXUwHhcNMjIxMTE0MDkxMTAxWhcNNDIx
-MTE0MDkyMTAwWjAaMRgwFgYDVQQDDA9hY2NvdW50LmVjaXUuZXUwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCu2jLRiKPrQaZIFRWruYE9cJehNmXbCvRC
-8x0aGmJ31taH/u7xB7p0hthiOH0UutFi5/7cJB2jaF90f3f4XR7J1e1oFazo8qoM
-/ZNgQFHURnDURa3/U/Lks/5ePYyhXIWQifIpSA23oEmO05Iad3Cqrjth1C2NZWKM
-OZApt8M7f/l3ZcI6sQ6+0q1wd5pGKXW56yyPs7jvtDEcRgnvmtHmxfylCH7aXAqQ
-azmH5u3ySEmqQKQHIpNCD+RinIldSjcE3fMFliIu4OZr7937CmLILsj0vBEe6EKw
-1gdH8vQF14C6GRsIG9LKxgqSctOldab1SuStnEheBBodd60ZHam4XYjYBj1ZHO/Y
-ZOShfrWjpYeQUkFbINeyss+j2kP47lpXGxKXm8b+I/rhTls9aUeGVd4sbDA6P/K4
-lzZYENh8dl8G0rs2PjXbQxkiVXow7LYz8/pBJYNBamJVOE9QbypXyJfxjV/K2OY+
-vPI/YWjgKebJR84VBelsbL0OEl/9ySV27/NQXlUXTMVDf0uND3oZTzANkikcCNuU
-kDwMV1foS6/OvbY2YHdQcgMXwzksGWq0hMb/U8O/8WtPlRM+xfJuBmkOp9GMtMVv
-UDSaaS86Zx/dzF9rVPV/bXLqkj0P0qdUuYdPfByNlZgqKbQ6TWJ9b7Bn3+n8PwvX
-IuEyKIFO4QIDAQABo1AwTjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTuV5hgW50gk27RjTKMtLvKPpKSUDAN
-BgkqhkiG9w0BAQsFAAOCAgEAEIrpzZiJD4SMFoGJX37PVmhRYd8utzWpsxjgffZD
-ce7ivyJ2blY2UXv9ER/a4xg/ZcJ1fZDaG+vEC14yEHmIp691+hJwGcKrzC5XYv9u
-fpBG+a+hqjmVt//yillni5YpcSD/+fWYBJXjLzQD0zr8KtMyyvevY1z3DDaluym1
-7h+sCcWkzBzbMF95rVtmV5YL+0H529sENf5I/LHIMIXHUVh4zxEWLBfC4SadD6Ce
-gNTh+igz3LxgAB9pa8PtfBMmMNOhdsryoM9VMJWtIkLYlFY9cdBP8hHM+ihmbPKj
-CuGRV8u3qPnfZZizvUrguE1keV+lBTffW1C9UKTxNbYli8OBRup2pyhhCMwWO86F
-L+CtTYFPN8GStlVIHUnRNQ3u5bzkvcGtZQVQX3vNCQB/wfmaPunEU1BIckSnMRiA
-uGyWJwxkqnAgDbdJgOyKPFyUYB6VWd5GfhHQ+mcV6KcteCOpcRRXPq39juJmh+hB
-zF3s3Rppv5K18VFb+PYhOAN9QQqzD0nR37pF809CeREDnBS5eKbqlHhNdU1H5tn2
-YxR3z41vB1oX1tZjkf/UQYE2YrwG3yyzsaAFAbEWPSLcU8XEjri5iIfD0KGaUOBH
-74yYhRYbXW2oGChaF3Vg7JV9kowjqD3PnZMa9ocaoenKabBhUstuTjBthMv4+W04
-fBE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.eciu.eu/api/auth/callback" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">ECIU University</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ECIU University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ECIU University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.eciu.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ECIU University</md:Company>
-    <md:SurName>ECIU SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@eciu.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ECIU University</md:Company>
-    <md:SurName>ECIU SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@eciu.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ECIU University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@eciu.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>ECIU University</md:Company>
-    <md:GivenName>IRT</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:abuse@eciu.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/account.test.eciu.eu.xml b/swamid-2.0/account.test.eciu.eu.xml
deleted file mode 100644
index a75e0432..00000000
--- a/swamid-2.0/account.test.eciu.eu.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://account.test.eciu.eu">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-08-22T07:40:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">ECIU University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ECIU University</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dxpfrontendprodsa.blob.core.windows.net/public/PrivacyPolicy.htm</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://dxpfrontendprodsa.blob.core.windows.net/public/PrivacyPolicy.htm</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="145" width="200">https://dxpfrontendprodsa.blob.core.windows.net/public/eciu-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFGDCCAwCgAwIBAgIQfoqGyof4RJVCLV66DLAgUzANBgkqhkiG9w0BAQsFADAf
-MR0wGwYDVQQDDBRhY2NvdW50LnRlc3QuZWNpdS5ldTAeFw0yMjA5MjMxNDEyMTha
-Fw00MjA5MjMxNDIyMTdaMB8xHTAbBgNVBAMMFGFjY291bnQudGVzdC5lY2l1LmV1
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAt/kIk419rdWormgZvKQh
-sELBXYeqqs0pXnKjyybem4J4y5XqnzVrAGBzklbt7UgN71Dt2VHI1bd9J0aKadMH
-/PkgyXLhV9Ut6BQQosT/IFlBGTMbojQvTAQfmAJKIbgWKR/2bu9Tt+vqczV8ZCb/
-AQPUEYWINKLGW/ElYZ30xWkDOjstFWTSha7WuVTHP1mvVsxetOIsYf+Za8jhKPrj
-yREQhqy5h56Lw/wwrPvzwFi863mXnvXh6LPTQZmUVcCjGsyJPSpUQEgyeTcEkTPC
-gqds9w3Z6JARC9Vn8VXXdwG3u1rEuID1+ztUamt0ELkTK8LvxZNGEpr3J8Qy+UsB
-6JFhvhuKM/agO/3s5iXTbbOf3bFiU3RL1nGP3qazeMP06/Lmnle+G7fSDicQe0Yn
-Z5dj3cBSMNH8l84yFPjRX71DZs+XnNAQz1CZe52BUFOFRpWdF2nR75/ksNAEf70N
-fY0qvNO544XSi4/W+Tv8ZatHSS7Fcsjff9xwTcElA60MKS3bcmsMFfekk8f8KqEu
-Sy2YcFwXZYkAswz4eLC8tAhQlLzpFDpWRPjiGnapmGtlyXBkcMXe4PlboQ6OQy+d
-vOXlaVPxbkLU5OxZ5xxPOXko7k2AGf7ix+9NMyfp2MYBTvDE22pxFciLjFFKIPgX
-dQjpV3pfONV6snPRFSN94dkCAwEAAaNQME4wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUeXssgnfSifQtGNm6
-7/mF6FHY2EgwDQYJKoZIhvcNAQELBQADggIBAIjFqOePg2q6eyC82to+nGiUlMaH
-fDP2PfoUJ4uKsd4VhdenFY8j+0JC41J4XFacTo+ymlYQqzQe2ULnt7a/Q1uiWHbU
-Gp6TYP0h4Gc8CimFtHVK+NhktkRaSoSxl5t26dUTDh2MIwm4JSnqef4Dl+EEMSGW
-AkTdjo71b+aZIgIogIEm7DmzcoPwQ0/SOojlQ+pmdZrIGO9dz4px9Vh1nRRSqLu2
-ieNqxXunJ/fdqiLfh8DEFeKqVWWf+qyGOW+wn1lIbffQdoiA+NC/kiHMFreiveQ3
-huNzSLtE5Ed6XoTf9fuF6KbBeur5udoOGb5hQDEvbwrYTsDEqCPqDlF/H5afL/Q0
-K/a8oETAaYUcz5jRx4N/I0I3++nUx3OTRbraqaPtmhh4UYzBkPqQo1X5ctF5IePt
-dTs02h5G8KSfNlXfeDQ/ltXe70YRE4MN4KO7NzX2EWDmyWj9qCrOmmH3NrIVJ5uu
-DvLhpt3p60y/VAq4qhKsO7UiGu1OUuUzfhGX0N7PHyb1tnP/AD2MYB2llHPPVRFf
-x3LWDHIBMQ/sa7HU0t1q1zkcmG0MOKeh4SM/vaX/m6YdOAd/qskTArKSXgf1IAS5
-1f7FYb9ZHvVe7lKNnoGQCnEmkbBN+V1APwo5SLfgAZMBnXidREnb/60YOrahedVJ
-Ltk15Own0u5xWAkh</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFGDCCAwCgAwIBAgIQWZiXw54psoVKo90MlQmTKDANBgkqhkiG9w0BAQsFADAf
-MR0wGwYDVQQDDBRhY2NvdW50LnRlc3QuZWNpdS5ldTAeFw0yMjA5MjMxNDEyMjBa
-Fw00MjA5MjMxNDIyMjBaMB8xHTAbBgNVBAMMFGFjY291bnQudGVzdC5lY2l1LmV1
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA10tovsr/XAo6S3PmnZIk
-5/Kb2o/r1HTS/LjfjVhtvFzCVnSQN3i5vO3SkwoUNBuav7OyHn7ZsI+2JI/clwko
-USyQTekTkUM7XiNFY8A3gN3ZLIOQGoeBIOPnsobXJT/9ddTvB1dFmngV2sWJA3qP
-8SH6P4ONO9fwSH3HcvBp9MiIhZY1O3xuA8S3lrlgj1fybrwgLoiwbNX3+8LP17wh
-jN6iaZyPT6KhyUzgQiIX1VnJvOdpwDz09iyWYWLqwLLiQR12g+G/xnZSzE7oyd5v
-zUXXL6PJrsDpc7wjIUJCT1qaKoD21WLH4qjn5O4dOj6MHD7l1mZO7rIE3LXm0pG+
-gdHVTkBb8f27gV+Vo+4ylGQSdzNLuNDKog/NWxu+CRhT5SBvLxOWtCv/BZK9EjVd
-DFVo88mu8b35a09Sov/ZWwj7z1W/1+JtM7AOB9R7o4PE9oPw+onewYQoKP+yW+/B
-/jqY5SHaEhBxBO/Xzkb/I+nQY9R50klTZWhZaApOJUPTHvSooKlh4yUnGF9Toqad
-a4uVY3vApVh2OWTQ36tWvIAUPziZOIVKTECws/uBvhd4ActHQtsHoNmhzySAERwf
-vGBjHbXk4uI0kozsOKvy7aV2ybYNp7UqXsAfwT0YUAV3i09UVfbBvWKe340n5VUY
-aid4DZkRcUcttRckNPEOA+0CAwEAAaNQME4wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUmqTV4zWct9YYds6T
-lYdFEk1xeCcwDQYJKoZIhvcNAQELBQADggIBACi6ZS7I9mrqrZ32oxsmu56gEoNs
-/DLnCVX4R1aWr3gJrqhggrQR5J7DgORxueOGsbGJWMSkw2GDM05tJSZW8LzPqXm6
-jZczndE0+vsq51iHB2VgiLQleGWryk3xuVdOuRuidyZZWXkq/r1uaSq9sMEviewd
-BwlKfaTRpUhmd45/tC8zwdRzzwl+cxrlLS0bWmAtLL0yG900P0KnFRBbCxZVkurm
-whqFDiSHvpbhCaanc9dnoVGiZwcEatCBK7mp2dSyswlwAXRFy/x/K/1qdnX7i04l
-3fvpCeF1+prO6w5MJigvw0nO6UE7mNmPLvn+XqJuHi1cslAa1a05JFCzCbhhEav0
-RHBjgsGFb/sPH4pq++JiY1YHnXIUPWRYYdtrrCs1U+lHIetsC7dkqr+ME61eko+i
-O3KzoPVVec1ee3/ICONGWpy/LkJaFURqKpGAPqa95tT87mxLOv2hWrPZVTE38LI2
-5gs2IbLcXeR7S85syd+B9UiqPIk47wlf0gWw/7/+O1T3hbl/Bh8T4541QiSqp6V5
-JbG6r+55Fv6CuL5tj5QMWWvHZJBvVPc+041oEMRbBxO7rYAmhMoYZ0Hg2dH8JGlS
-S/vY/Rm2TpwQcIu805dtrvdSNMY0lnQxtQOGTIBTJwKGqaP0JXDHLO2OZX6Nebu0
-sJsEninefxMzTf02</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.test.eciu.eu/api/auth/callback" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.dev.eciu.eu/api/auth/callback" index="1" isDefault="false"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">ECIU University</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ECIU University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ECIU University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://eciu.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ECIU University</md:Company>
-    <md:SurName>ECIU SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@eciu.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ECIU University</md:Company>
-    <md:SurName>ECIU SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@eciu.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ECIU University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@eciu.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>ECIU University</md:Company>
-    <md:GivenName>IRT</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:abuse@eciu.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
deleted file mode 100644
index f8399e31..00000000
--- a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.hv.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-09-27T13:28:21Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.hv.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University West</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ny Identity Provider för Högskolan Väst</mdui:Description>
-        <mdui:Description xml:lang="en">New Identity Provider for University West</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hv.se/en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="103" width="200">https://logo.hv.se/logo-sv.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="103" width="200">https://logo.hv.se/logo-en.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hv högskolan+väst university+west</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hv högskolan+väst university+west</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mdata.hv.se/privacy/English_Identity_Provider_Privacy_Policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mdata.hv.se/privacy/Identity_Provider_Privacy_Policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>hv.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.188.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.192.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.234.0/23</mdui:IPHint>
-        <mdui:IPHint>193.10.236.0/23</mdui:IPHint>
-        <mdui:IPHint>212.25.132.0/23</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQQD1mKJV28YVPnv1GYDnHijANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLmh2LnNlMB4XDTIxMTAwMTIzMjMwNloXDTI2MTAwMjIzMjMwNlowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5odi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqp223FioMTfHSwbGQkNsH49AG6PXZXICvUcF0Fzw1Yxb0f3MvIenWqPTx9Gg3+YNNo1m4oGMW5tpgK4XGQya6WADG88zsvq1POXA8C5UHmuoYNUAjDF+BnoZ1h7r8n6b77vfp7ZeNWwNd05HCXiI18XiyOhmqiJWNob3bSd/F4votkvGZserhsITmbbtjqaxdCF221rFT/GBLlif0NhBr+QnaT3v9F+CHAz5hNcVBb2SpmtlU51yM8BGen/WDK5nMrrywNF6hlCaNUq9ZXiLKenjjAuySIDr+bip8EKB28mEF4X9maSz3FFVbQIfs/ZVhTA/QhZDVeIfHWWLBp880CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH3ykJ/a+LVFpxZBmPAEodahHZfHkZQPKk9Q6TBvKhciCHqFSZAK5ab4m4562nNtMYOBLpT+4fVFSeO1Yxni8jeg1F6d0PKdSUKaVBomtE6m/i9A+Zv7+dB7c67n0x9YUQZR8I/QYbY6+GzYags02Dp/P2NlbJnf3QpdDc+8H9Yp106ojZS2IEcl2JFDVUidxDZ/12Et4rTHtXm7vAElXpjQFpDYarHNlIL8SYgkxBarDp31GQ1AJFqt6vlbTOMfsDvuSD+LTkvY/qtm8ECSbIE6XPECExwza26fGB8OtkMvAexCFnhxtO1rUiCyMOupKeTD7Iz/6kfpjGM22blBUeg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQGCD5tJxpdrNE0L8Su+YtXjANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmh2LnNlMB4XDTIxMTAwMTIzMjMwN1oXDTI2MTAwMjIzMjMwN1owJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5odi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJAHPf7Yn5Sj8oSWAttULLiyVKhCQFqzjB6QW2KM2qUdCvJ955DIF8Vskkf92GAysphTHw8S10zVOPphQxXlR16dIAv+WN/CBtInlemWB0xw0x0QmKdJxn1VVo4uDhSPQxnZy/G2c0AY2Ple+neUL5Stn52LAWoV8YV5TdNhlg9gdBmf+61LoZFihY8DFcfbza7xI/vZ54cSYYGVeb+K6FTzRqMD/oDinBycmUZ04tFeE3f/aCQvStfeWUfHsELqPmvXPWf8ieFSukGrCt9KCA7H0fP/uqsiWHGmvKnzB4U34jooGQ/jHtV4V7P3NVrKylcN9wNXTu7BKaaECj3N2UCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAQJ/Ta1T4j2iWorXl9J9ftXw46XocthZtK8SzfWJX0Eh3wz7Vv/UI+J8uSL7up8qPUuqQnNlz3DDiXwxC40MvmqH3m4ZyaB5k9u1LY8L5F4Td/CXt+MVAc5Oj28xlgFSTZ152vvY+KoiVlXfxIxcipykHN8He2cRLY0PkLjtx6EKyNeF3LAOSCLM3k4QMa+4w+fphkCQ3ifn6aEeWYtc9a+gihyoyiW2nI9+j/Nmi8qamqpBy0HCMto0FOGUqnOGrCJAr2iGU8w5ipV7IHnYrcYb8Essx2ajpDluQC1kCQS9QWC+e8g4yCxBD/lORCC0TIwc54lS+tQKcv/suCTLkw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.hv.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.hv.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.hv.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.hv.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">HV</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">HV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.hv.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hv.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University West</md:Company>
-    <md:SurName>Magnus Andersson</md:SurName>
-    <md:EmailAddress>mailto:Magnus.Andersson@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223193</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University West</md:Company>
-    <md:SurName>Christian Jiresjö</md:SurName>
-    <md:EmailAddress>mailto:Christian.Jiresjo@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223189</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University West</md:Company>
-    <md:SurName>Servicedesk Högkoslan Väst</md:SurName>
-    <md:EmailAddress>mailto:servicecenter@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>University West</md:Company>
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:SurName>IRT</md:SurName>
-    <md:EmailAddress>mailto:irt@hv.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml b/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
deleted file mode 100644
index a113c779..00000000
--- a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.ju.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-01-23T10:24:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">This service is used for login to services at Jönköping University.</mdui:Description>
-        <mdui:Description xml:lang="sv">Denna applikation används för inloggning till tjänster hos Jönköping University.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Jönköping University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://ju.se/en/it-helpdesk.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://ju.se/it-helpdesk.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="88" width="197">https://account.win.hj.se/JU_A_sv_Swamid.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="88" width="197">https://account.win.hj.se/JU_A_sv_Swamid.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://ju.se/en/it-helpdesk/faq---manuals/my-user-account/other/joint-web-login-service.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://ju.se/it-helpdesk/faq---manualer/mitt-anvandarkonto/ovrigt/gemensam-inloggningstjanst.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQTyYeY+viq6VAnXNlpdWo9zANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLmp1LnNlMB4XDTE3MDExOTEzMDc1NFoXDTI3MDExNzEzMDc1NFowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5qdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdGLVnbXSmzyWarNprPDDZ5WbD9Hq31kscc6OTLh6CsxQIs5xWODrMloC0o4T5hVGDRz8MONhd2kg8zJttlM82sn8gtZQ7oToQmINJFcLcqT3UJlwZMSWWdxTyJE82S38y/4td6AC8WFmzWM8fEfJoLLB9LMotEw/jZGQvLjb2IeF83TONyXwTnOqNR7mvtqKOagDY4Yw9pkFIjjqcS6ZmWn4LOQMCvVFnUSCAYMRYpCzjvyUN4cjq63WFhtRpuYEExQb6s8Hf4zZBD5B7Qm9CTaiUyWd9zl/IuFLmHIAvkyPpBOsOWQm/7WCNDuEf6OP+TGHrpWs7qz8zY2jadLLsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAb74Nbfv4Uu09TEFdEvILRQK3favoN6qWf8Nm3GcigsL4aWm8h/rr6lwG9uW6rwTivrFFCNz6xm10+Wrk4Tdki9h5LqtOflb3pb/vDhO2Gtxc6VSSFgflAnnKpEaGgseS4hQH8Wv7rdta25tjjjekxzeJc+OpPWHov/4aMJYDJyAuFEWXgxzRP9oN9AeW7bYj5h8ujJ8iBs36w2eMrV9DjKY1OSkotkxMjb2sJvxe09HOjZxQxrsiupnoG6nzHs8uaGBrCcsJLv8wZrPP6y7gIxKs7UI2qBMs9tTQMy1gaTAX3g17lg9zZVE0LMOSJPllH9A36w6zVOE8HpPtRLIzGg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQGbaE3+X1YYdHklQ4dW3+LTANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmp1LnNlMB4XDTE3MDExOTEzMDc1NloXDTI3MDExNzEzMDc1NlowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5qdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnc6vqVRrc+t6WRVO+xjGbrfJEBF97ebTz/3miuHuzaWVsfzVsO+u+rd7sGXOOnZJ7mwFObfcvi63D07DPOjF++3/KygobjhT1yKeWK8HPj2iM75ceHKSciSY7caLwlW+O64gex410XQTmqBvcX1BpWNZkE2oFbdob3B27j+bDlrFo631FM8luO8faVAmvV0EudpzBkmuoSDkK94VN6AWzuUqWybCY3sEiydbh+JncFxyIH6grKs+Pc3DAplMo3HphB4RyY2WIeHyreCoKgb71PWu/BLM92t7h5S5DnhvUbZBv13gP6Uq6RJgj8jlNS3ZlNNZS8NLOV2TzR3cd5LJ8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEARi0HtjfOnJeaAdAGcVY0KPulzHkGszVyvEs5QMDv5u0NI9D0U/FnEeMaqdEwGKma6YetcbQrCEoNm0cR3Z9FPs6qzahahj0uxjggX5NkP89w9PLeZnEm+prcwsCb9NVNq0dN7TtiInjOh3nA+pDzQD9E6rD4Q1zV68p8+zFa+7vW3/pUc72wN+GQD2x8LF89VbuAegGoLx1VIbcStV6s78G0HpZEWhraepBh1W2OFRZ1avKPO68wvHyhHZD2Uz6O7WIrD5nMhyuH+OUEeMX55qtD+TIIslc51+uGEeCwd9Yrbuu126oxt4duKBVpBan+P+BASVFtEMON41soGgmN/A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.ju.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.ju.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.ju.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.ju.se/adfs/ls/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Jönköping University - Login service</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Jönköping University - Gemensam inloggningstjänst</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://idp.ju.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">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hj.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Description xml:lang="sv">Inloggningstjänst för anställda och studenter vid Jönköping University.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Jönköping University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://ju.se/en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://ju.se</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ju.se/en/it-helpdesk/faq---manuals/my-user-account/other/joint-web-login-service.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://ju.se/it-helpdesk/faq---manualer/mitt-anvandarkonto/ovrigt/gemensam-inloggningstjanst.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="88" width="197">https://account.win.hj.se/JU_A_sv_Swamid.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="88" width="197">https://account.win.hj.se/JU_A_sv_Swamid.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">ju hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">ju hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
-        <mdui:DomainHint>hj.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQTyYeY+viq6VAnXNlpdWo9zANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLmp1LnNlMB4XDTE3MDExOTEzMDc1NFoXDTI3MDExNzEzMDc1NFowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5qdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdGLVnbXSmzyWarNprPDDZ5WbD9Hq31kscc6OTLh6CsxQIs5xWODrMloC0o4T5hVGDRz8MONhd2kg8zJttlM82sn8gtZQ7oToQmINJFcLcqT3UJlwZMSWWdxTyJE82S38y/4td6AC8WFmzWM8fEfJoLLB9LMotEw/jZGQvLjb2IeF83TONyXwTnOqNR7mvtqKOagDY4Yw9pkFIjjqcS6ZmWn4LOQMCvVFnUSCAYMRYpCzjvyUN4cjq63WFhtRpuYEExQb6s8Hf4zZBD5B7Qm9CTaiUyWd9zl/IuFLmHIAvkyPpBOsOWQm/7WCNDuEf6OP+TGHrpWs7qz8zY2jadLLsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAb74Nbfv4Uu09TEFdEvILRQK3favoN6qWf8Nm3GcigsL4aWm8h/rr6lwG9uW6rwTivrFFCNz6xm10+Wrk4Tdki9h5LqtOflb3pb/vDhO2Gtxc6VSSFgflAnnKpEaGgseS4hQH8Wv7rdta25tjjjekxzeJc+OpPWHov/4aMJYDJyAuFEWXgxzRP9oN9AeW7bYj5h8ujJ8iBs36w2eMrV9DjKY1OSkotkxMjb2sJvxe09HOjZxQxrsiupnoG6nzHs8uaGBrCcsJLv8wZrPP6y7gIxKs7UI2qBMs9tTQMy1gaTAX3g17lg9zZVE0LMOSJPllH9A36w6zVOE8HpPtRLIzGg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQGbaE3+X1YYdHklQ4dW3+LTANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmp1LnNlMB4XDTE3MDExOTEzMDc1NloXDTI3MDExNzEzMDc1NlowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5qdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnc6vqVRrc+t6WRVO+xjGbrfJEBF97ebTz/3miuHuzaWVsfzVsO+u+rd7sGXOOnZJ7mwFObfcvi63D07DPOjF++3/KygobjhT1yKeWK8HPj2iM75ceHKSciSY7caLwlW+O64gex410XQTmqBvcX1BpWNZkE2oFbdob3B27j+bDlrFo631FM8luO8faVAmvV0EudpzBkmuoSDkK94VN6AWzuUqWybCY3sEiydbh+JncFxyIH6grKs+Pc3DAplMo3HphB4RyY2WIeHyreCoKgb71PWu/BLM92t7h5S5DnhvUbZBv13gP6Uq6RJgj8jlNS3ZlNNZS8NLOV2TzR3cd5LJ8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEARi0HtjfOnJeaAdAGcVY0KPulzHkGszVyvEs5QMDv5u0NI9D0U/FnEeMaqdEwGKma6YetcbQrCEoNm0cR3Z9FPs6qzahahj0uxjggX5NkP89w9PLeZnEm+prcwsCb9NVNq0dN7TtiInjOh3nA+pDzQD9E6rD4Q1zV68p8+zFa+7vW3/pUc72wN+GQD2x8LF89VbuAegGoLx1VIbcStV6s78G0HpZEWhraepBh1W2OFRZ1avKPO68wvHyhHZD2Uz6O7WIrD5nMhyuH+OUEeMX55qtD+TIIslc51+uGEeCwd9Yrbuu126oxt4duKBVpBan+P+BASVFtEMON41soGgmN/A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.ju.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.ju.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.ju.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.ju.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HJ</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HJ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Jönköping University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ju.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.ju.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Jönköping University</md:Company>
-    <md:SurName>IT-Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:swamid@ju.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 36 101112</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Jönköping University</md:Company>
-    <md:SurName>Joakim Danielsson</md:SurName>
-    <md:EmailAddress>mailto:swamid@ju.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 36 101116</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Jönköping University</md:Company>
-    <md:SurName>Stefan Kindh</md:SurName>
-    <md:EmailAddress>mailto:swamid@ju.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 36 101170</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Jönköping University</md:Company>
-    <md:GivenName>Joakim</md:GivenName>
-    <md:SurName>Danielsson</md:SurName>
-    <md:EmailAddress>mailto:joakim.danielsson@ju.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 36 101116</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.kb.se-adfs-services-trust.xml b/swamid-2.0/adfs.kb.se-adfs-services-trust.xml
deleted file mode 100644
index a65fdea9..00000000
--- a/swamid-2.0/adfs.kb.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.kb.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-04T13:25:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.kb.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">National Library of Sweden</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungliga biblioteket.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the National Library of Sweden.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kb.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kb.se</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="516" width="488">https://stilguide.kb.se/vendor/assets/kb_logo_text_black.svg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="516" width="488">https://stilguide.kb.se/vendor/assets/kb_logo_text_black.svg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kb.se/om-oss/hantering-av-personuppgifter.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.kb.se/om-oss/hantering-av-personuppgifter.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kb.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQGx3FcymVB7hIUNFb7wH82jANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLmtiLnNlMB4XDTIyMDIwMzEzNDk1N1oXDTI3MDIwNDEzNDk1N1owJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5rYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKql5PENjq2FyNy45XlKpggzEntcOegLtlLs/qAh3yptiAHNjGVs9OAt02HAkVJh0TjwPzvJOPVoxyRZG9m8x641BppEzziNlWAAylsg83/c/IUhvJV73Nj52/axkGDaqEckGRmmMBgAw5CnzUuUcNlwBJkMpbdT8/830uXOFgSATYeAoL3d6+ZyPv9cePP25pwzVptklkGz9DEOHQTEPu8GSfq867Jzxr5HnMts0yFSc1eZn/vLAcNog12fztXbYMjvvetbvaAAuPHI8HknQypL5xWdX/sWOwXbHSG1MXebkN2Rxt9UrwfPJ0y+s5DUPnRWF6MsJZG8FTiLX95eXoECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAToGYBYCw4m/C0UoYZh2J2n0dFSzSX1Ep8BqYGLvbOV8AZCM83OJIRPv0tG8HQPuKYJLGURX9uioNwFnUYSseOw5VjwZ3pal4870G3MrduBmrhcVDxt2/wvs3/TaGmKVzhMoa83ReEObN9Ahx+2JhgyCpNiFP2+bmDoqv/S+PJbqt+IF7lvI6uEjuO0KtCdf68CuOlZHUkJDULRvQYikRSTX0sN6cnHUG5FKB2U53347yyDbLHrSAcse1SY301f74P/YXbNgOgv6qzwTcp6N4A4cwFMo0wYI1iNLF6F/41cy3go9FdOlN68/t89ZpCTO8G+SzHRBNDLt+D5NvatNBtw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQPB83Bd3CI4xLBms/e9ci2jANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmtiLnNlMB4XDTIyMDIwMzEzNTAxOVoXDTI3MDIwNDEzNTAxOVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5rYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSMC9TXbY0yypoCmYkbdXnZs3eECc2zwLjWxO/dWAKUTMHhZJ3O90pOgTakwZCSYxB9c/fQNqQI+rtVhgV7FzXmExj1g0/UtLjxaw6OQ32ihHn96LBxUbJLj30gU+SU8YtsKkPDRGtrkqt1QH43gq7E4yxVHRd5QyTR27f/xXiY8roP1oJQaIXD8dJuFonDWeOZpn+7hVFLwkd6GmSQ+sumhFqWeOW2+18UOTT5S9k9B7zWLD8/d3Y9fDsA9yoWCjEeloHrf4gNZIn2bxUHhXFG+hE74P3jV7nXhu7jnM4eAjY2/FdjxL3JM6IG9Uzdh6UO8SgnoS4nVM3bTphdchcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAO5/PEzkEQci3FwZMWBLaohL2jtkNZxsKPpRAEpX/wdVZ9Wz0oTebOO2C3iSZmbGp1H3JSqaeW0Hq66FBP9l6lNTqAyeScka/EZowQvDtoRrLY7kcJyD3nx56/L846IGD29MIljXY1jr9A4YcbrhuTftzcKt047wMTWYtMjuiQWw4jTEBYMKLz5KIXXmRyO4SETUsvw9ju+kqWOybQTrLEmpYDTaPRUajnk8YZDrcAto7qOZnC7IOC5d5LqSsN4l7ib8mTUkVL6CkbiGL0pEoli3GPcH5APjmPZxgANaL/4+k8zPufYyIz+EeEhP1RYjcYkM8ACZh88c5ZrnlFGUGFQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.kb.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.kb.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.kb.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.kb.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Kungliga Biblioteket</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">KB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">National Library of Sweden</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.kb.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.kb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>National Library of Sweden</md:Company>
-    <md:SurName>Mattias Olsson</md:SurName>
-    <md:EmailAddress>mailto:mattias.olsson@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>National Library of Sweden</md:Company>
-    <md:SurName>Mattias Olsson</md:SurName>
-    <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:ITsupport@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46107093550</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
deleted file mode 100644
index 6dd165c0..00000000
--- a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.rkh.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-05-04T13:15:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.rkh.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">rkh.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Röda Korsets Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Red Cross University College</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">ADFS Röda Korsets Högskola</mdui:Description>
-        <mdui:Description xml:lang="en">ADFS Röda Korsets Högskola</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.rkh.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.rkh.se/information-in-english/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE2DCCAsCgAwIBAgIQObvrOqf7grVHaJE/WkYuwjANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBhZGZzLnJraC5zZTAeFw0yMjAyMTEwOTIwMDVaFw0yNTAyMTAwOTIwMDVaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGFkZnMucmtoLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAseEDyOM/GviehdvdbmAl4aZw8rJdmHvJzYr1G6p+G+R0DBVb669qPAXouz9RConD305kP3iCdFNJm+SR9sKaM7AjGSgO+l46Bfd3hehfj5ghinXCNdMgZnFajRk6S9KniMAcaHyqyGzKeqlxUyrubrA/aMXh3K0y0TV3c0Tj8m1ZpokDr7N4G8Fj9aHEg89sePmfaMiy9JwG3YEE4BGRfUPLdm0OVcfphusCo+DvcH6bA1zIDnxvn9eLzq1B7RfUPe7hMHfy6+o5NTsdApu4RzlXSLugCicWtPvKiw/kmKT9ovwwNTLNJPNL5Mpvh6jAkci7UAq1TFWA3OKlmqvYJlvfb2mbFo7BbpArStpQeiNqdM7f4WN+iLqGQBc+2oVXNyl2DkKhNono0RWQOJI0UVQbALwmy8D7NkDF7XHwJXULAhBHWTaW/MXOoIETGj+ekFtjq8+lYNzwoW+QPeTgx7r+UXEFBBjeqvqG0q2G34EReUD1JII+nxiPmTzVnm3MT6ZIFevZmx3BbN3l/TJWexwC0gc9mVlhKyvr3tZThv2kcpMyk97iU6lxga6CZKBuuVEppkG242PF0+41kuLTu+/eqiaIm2oKJ6R1ilcadKnezu7ds21wHCxb/eOGP6X5KXK3WWVZI+it1xOws+k2E4vhW+YDjY0mbqbFHqbH3rkCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAQzBkIZVLyoqwKHzpiCN+PismA/sZNup0y4d4qP2WqZp2jec8VfljGVXkZart+0tNTMl3kd9D6xw0KTBO8DEuFnaklOL325lt9KVcsOGNYp0zmMRI0YnMlsfaxQhTDmXR14zjPHJXdXQ9gry+lQZO0brCQe7ROXVxtN0dixf/o3fEB4NHsrVr3w2gTIl5gq1LpSzu0huIOcRJ5hzE5+bzjYv6jjjkKmyj+98ZD3ShU3opHAUfUP++JEIn0Jl5TTS1869mw9VvZl6tmaGqbsiznK7UeJPsi0435WKMhMfTcnMQYX6n6AprT85P7se9OZeXmwBMZwMQ+r1DoMcuo9/qf63B8M/oIDh70L1qLuPMgO1xb7G9SsttXMTSj0xB94E2VSLHRmLq3H51nZc0LVV0cLew0IWNqmgzCwDSMHMBUIAojX60rMJocOK1wpeXOFIj16n5xS7eZ3yMNMafHA4yRhOgMGjTIMnKnvslG8WALnF+P2jY9/T9AztGKhKMRkVH+hdyMANoSkPRZ5KfHFejkvrIQM5585WcYq8/qzIXLGShftz/xs8cGSy038AE2rTa5VIztalU9Wy+N57meUn54xZ0x8utgeq5Entol2S2C9E2JZzsvRF1QAUt5juj3cKJeq3zpiBdXbGdL0eKxaclXKuzbMi4AFjKEJ9Mu9WeD0Y=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE0jCCArqgAwIBAgIQHLgssm3RkbdJaFiguhagjjANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0yMjAyMTEwOTIwMThaFw0yNTAyMTAwOTIwMThaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArgVhtwqgkGz9Pm90shIDc6qaN2gJkfAAOiIZuFnekW94/fBERYApAyCQ/YLjFr0BwsaMAxf8uEal9STwwggXIXpFuQPNN+nc1TTB/t/KIbMLn4nYDRZTaZXm8gDk7nF0OwOVfq0AnozY0r5yeuzmA3fKLkPfHdTpZdxhXq+453L0pwpNvJQYYQ34FPr0figLO85TAIGpqa5my7N7Jz/X7Noamb0p51qCzbMs1zo4KcYplVP2xb5fX8CHh4rWBVLF1VoiLddBwRM47GLDSnt2Z5ZuH61ve0UzZNb31MHUeeqVy5F99D0BG8HxVe64zpVUZUQBNmqi8G15rHh1+9ge80izhSstY12/Rgfs9ollSPXRkrDwZtkTUh2NUovTnbj99zj2CyF3XmHYa3NevPuYYzvXAFxhx1cey5BPv8DPt0+aNA6vrQYkgRL/NKCybap1wGPKlwc1XAdP/lKHZzhBA5X+TyaCKn5mLiHjjNHUvJ3JwE2yd5NSEGxPgSLcKoLnsHvAj5JDiYR9RNI01yb6Tk4V6vAN0bOkTzOf6v85jflr4gTZI20NVbJgpdBZHXTtbjO+D9IVoQ7nZgwWDsN6j1iva34LcPThY5fJ9ZR3kz4m6TDlUpIIgJx50H1trfhhkTW+tc1OBtX4FcPyeb/j6lR9KaexbalPo0JPPfz0VgUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAB5OSsMUSRnS1QxvIW6CdUDxuKekFS7dhht0DB3/DVKMRqkP2gQyggWLO5W7wVfiVec6fjwRsx2547Kt4hYLKGNWHYO6fRv0iOrx0dPqPphn6TMgb5OwUs+4wBkR0BeiZsi+p7xAGXvaBdPhIq1Im3+lWuLcXtq+dRjxYsKpM1jmMPBJt+FaJHmjYCL/XYvR8Xpfjthbcv7r1FAtozxoJtn6c3WzvSMUi1MXbuSdmYyzrbx24lceAZy1YkV/v+8GiUpLhwqKFgyCQs//PadFjoyKbYkc4A37UhL9YCehz4u/NVHRsvmCAUR/ltk7Z4SR7IULQEiLuqt5Wxsrpp+pq9m9blNuLrKCsHirod3taiyWX9Aqovr2uARijqpTjLt+GOrCi4h4pNyCGIFW24qxt5N1kpzfMXcqlM0P5izxvsWEF7ACCufoNEPzzDgSHutgQHKNvdZBG5M1sZ9EUZKuu7HErFX6sf1UHaSQvaqSJNueOsEx/AOyLqLp5BavYdSQAl8O5yQaNWZgle+dEXD88YOgeTY4h0xmK9/+ctkNg2oO74T9wOgDXmGpg5CccecrTX5l1qc00oL4x1rXS0YQRneQZiXpUn4C6wP06VFiHoJhh28cFxJjl2d7upCkRyUlujGWyT6AeN8gcn+rxyZojtFx3dyF72u4yfFcPB3XMcuQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.rkh.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Röda Korsets Högskola</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish Red Cross University College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.rkh.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.rkh.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Röda Korsets Högskola</md:Company>
-    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Röda Korsets Högskola</md:Company>
-    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Röda Korsets Högskola</md:Company>
-    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>RKH Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@rkh.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.sp.se-adfs-services-trust.xml b/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
deleted file mode 100644
index d5533005..00000000
--- a/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.sp.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-08-15T07:50:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.sp.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ri.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">RISE Research Institutes of Sweden</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">RISE Research Institutes of Sweden</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och konsulter på RISE.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and consultants at RISE.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.ri.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.ri.se/en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="81" width="104">https://www.ri.se/sites/default/files/rise-logo-black.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="81" width="104">https://www.ri.se/sites/default/files/rise-logo-black.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">rise ri</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">rise ri</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ri.se/en/about-rise/policy-documents/personal-data-processing</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ri.se/sv/om-rise/policydokument/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>ri.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQQgPVzpJVa6NDIUYTr9T06DANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLnNwLnNlMB4XDTE5MDYyNDA2NDk0MVoXDTI0MDYyMjA2NDk0MVowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPkxkGBEpvrPc+V/HKaOg8lb4QtFqIMW2bjvp2YrbOiaEYgwsnJNm6d7JKsGO+AfEomf7GhE+pKTqPvrmVzL+Qq9X2Cqj6pHILgEy+NDHeq9F9RRqp+YIgG4sHjbrBoi2zg2XRdLBbgvVd47OHYCflsAo2pP7VrLY8nvhsEikLcK+Xs8TW/Owf2i9JzNBuEHQbPlPtyFHZ+DVXLFuLRop1E1J/bnUgSlxtU1XDjKUHnIqy9xvzIMCQEtmT+DHZYy24aGiRclQeSxS5tgje8/gmbnb21xu/rZ0i6Nho9nmIHFK+fJ0tikdNPfrVBaTUpyV6ITFSmA+SpeerVlFYzhEBkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAy8FjBavJDPsDpza6C8/6PI1M+DSvLA23j3Ix/V5heO/jwYRjTrDZcymWQ5GhQIdz7pa1mliDX0ZFbHPiDCMuMf6R7oZY4oRPTeMMixD9wX1OULGHtOCjBnJkh8ezbvefa0qSqH7cNnlgNbhpF4Jr7tMBXWV63QLGqswstt04RMywzp1lR3QNHZn6oqzRArmGOLaz5RpNq1/WkI7kVukcAjJ9KnHkvDPrbl/Bbqz6q4LhRG4BFXfFqTeP8TaqeNiBkKo0x5qtnaCwQOnH3NauBZTwfY/dtXJNGLnS0Y3VcUmkUorPaRRzmhG1YfL9JVQh0Fx7IxntT2DPjG4Z0v6phQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQIIjCY0H4B4lOIMMuEej49jANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLnNwLnNlMB4XDTE4MTAwMTEwNTIwOVoXDTIzMDkzMDEwNTIwOVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAgtBgigsDWI39n+hab5cb2l5+DPnchuCi6JiFauM4OPDYEWTK2a1M1DHELS5DsHPyRxZizVp5oRoJYUEwVefmN7Rd8uaFa7Ygu6yRjTtLCdOHjAka8u4J+iqcRwPP6P6UYL/9neV7jacZ4ar4XpXVspZylxVhwMAdwM2vRhAXrNuwj1m7m1pzWtDscxiEimvS8H97XQcv2XCPeW35x1yQODl4WhfX60lWv0j2W3CIE+bpZZV7DnZoOeIaPmakypW1OD78nLXAT6JL+PHR342mHFZ8M9/H+9pd15yILXiJDFoAezNRvSZjFJfsUNpnFSy+cVROMZ1rsgubTvljvrbkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAQo++ox3eMut0uzZ6HGp2h5ey2Qhq6JzdG8fBhf4bcKS55NsdlrKvBz73DY7evuuh/4ouZQtazOG+3O8rOrfxol3vhGu8eRx3vxNfETHTNr0bBEFClmZqDMxhr987BJoSmhTOKEuWtsqH0qBZSzpzYkqngACL9DUwSLTPODQgVZKu7b8tqXWxhNb89hk5B1nsm+YuHoRiMNRKV8bW5BVAKySurnhZRfOs8+Xhaj1OGvjItUxcjB1pVJHuLas80YjIGpFd0osAcxkAUhJW8dUnRnFsSg0xg0WmJjtGeiSUSCqYdxWnxXeiqymiMjDok8jRu/AA4XUERkJpY9V/LUXkQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.sp.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">RISE Research Institutes of Sweden</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">RISE Research Institutes of Sweden</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">RISE Research Institutes of Sweden</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">RISE Research Institutes of Sweden</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.ri.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.ri.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:support.it@ri.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:support.it@ri.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support.it@ri.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml b/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml
deleted file mode 100644
index 990b36e4..00000000
--- a/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.tad.hv.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-09-08T09:39:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.tad.hv.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">New Identity Provider for University West</mdui:Description>
-        <mdui:Description xml:lang="sv">Ny Identity Provider för Högskolan Väst</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Test Identity Provider for University West</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Test Identity Provider för Högskolan Väst</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.hv.se/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">hv högskolan+väst university+west</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">hv högskolan+väst university+west</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="103" width="200">https://logo.hv.se/logo-en.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="103" width="200">https://logo.hv.se/logo-sv.jpg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mdata.hv.se/privacy/Identity_Provider_Privacy_Policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mdata.hv.se/privacy/English_Identity_Provider_Privacy_Policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>hv.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
-        <mdui:IPHint>193.10.188.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.192.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.234.0/23</mdui:IPHint>
-        <mdui:IPHint>193.10.236.0/23</mdui:IPHint>
-        <mdui:IPHint>212.25.132.0/23</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcagAwIBAgIQI5ieG4pm36lCFBeWIWLFoTANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBhZGZzLnRhZC5odi5zZTAeFw0yMDExMTIyMDQ4NDVaFw0yNTExMTMyMDQ4NDVaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGFkZnMudGFkLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkj2CHAHrvWfPhkh/ppCbjBdgu1jzXLRIHJij4Vo1IbWUx9PGCOIokLbJGo7U8YKONDis8DJzW+KqpHPgmNrXhWDMOCR8f76nmrJTwybk3ifBbZ1XecewM7hYEMR405lAd85YTz00pW5I8GtLIRhZvD7PB5hHyMKS/AWewv2u1S+oeUwpyVxR6fKRJSKuWS2/30HRMIgqeHfoL+PgDCJ8g1eEaoYDwz3rgx2lUI07Tj352FocMJzDPxtoG4bWEzZDS2tOktPCVGGIhQLcZvEHeeCjQN6VKN/QpYHegCCWWpXHxv97tGefyzYZbXR0YmlRyk/zCjmNT6vKxKUD9bK7kQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBi8kOMHPBRBgN9Mfnd88LyIx9TDQu4YV8+xnQk38S1mlpSfHTrbhVLycwfG/bXCnNS6rZHyOINH0LTUy8acvOjxjQeJw1pzvcHvq+lZG91+rA5bdHHnBmkH7cHr/Gw+TMkS8e0AamyN5SxyxYiLZGZjXnDKyM9UeeCmZYRLNjBE9PiR9XkfkMH19MeZxsHQqUHqy4QiFRFBlX5xhJL6x7EI8jSLXyAYPBJdAx97IaRL/rNI3lb4GxyaInxpmrvM5eKSJLYWVp21yWNDQHxUHyys9GKbz0kWOaQpqE8mk+EyZp3t1AugxnQ3a4sDfQyGEGp2jmDwRqrzVZwrzMKX3t1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC2DCCAcCgAwIBAgIQE45whhqdRLNNlZ6eDkOvdTANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBhZGZzLnRhZC5odi5zZTAeFw0yMDExMTIyMDQ4NDZaFw0yNTExMTMyMDQ4NDZaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGFkZnMudGFkLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm6FKP2dRQ7oKy/3RtjmG++57bfKjjC64XwGPzQnoZf5FPsWN2tL/BYJxNRUbDoc252aMr+LTjEf5JwMT7KM5E8dMGCCiiQ8WLHGXHXcFM9xB+MpQxE1FCVcfAPMwZNULZ6knN0gkSjAPF2eE6eg/xqlT370/9koEzTD4BQszMbtuHkZYH54MqSl59jWxUwRX3QUJYQIou75RB8EQOAYSi4wPALKTGI9twOf67hC7tuEOlo2u8EWPv/Qy3ZgBuMNc3RLiSX8C0NxBiyTSqUeeQg09aX2VMzvhMZpO2BGdBdkrW4wd2xA5Xx7reHVfXFPbXCGFACvAosrLhidjGOpsNQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBtgvEuTxhP2aSszYglHg76v1LXuPhfBAAlNvaKv5nQOap5obZY6eY0PVmwcWZhZRwJuj1izxJFKIb84LWNwVyEla4WqmCuKZ5pZMpbkawtmW3HnlU13fbI+fL53CrnjLp5MNQQjb//PKhhxFF2VfDa5XEW6bMR6YfDefNAxfwuqjuybwqJ18En8K7st03+fAWA32RbRKopp/DtJYtVY01QjmactDhjuzA6INwVhZJecVGsLEQP+9Uvr15PdSnlHU3N3EvskMl7+1PNXbBl5JsnbZAq3WQytGfpyhxyoUSeHLaZ6hyS7EuoTYdkz0k3u1AtVMRMA46+n+Gybf3vR9Sf</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.tad.hv.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.tad.hv.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.tad.hv.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.tad.hv.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.tad.hv.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HV</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hv.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hv.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>University West</md:Company>
-    <md:SurName>Servicedesk Högkoslan Väst</md:SurName>
-    <md:EmailAddress>mailto:servicecenter@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University West</md:Company>
-    <md:GivenName>Magnus</md:GivenName>
-    <md:SurName>Andersson</md:SurName>
-    <md:EmailAddress>mailto:Magnus.Andersson@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223193</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University West</md:Company>
-    <md:GivenName>Christian</md:GivenName>
-    <md:SurName>Jiresjö</md:SurName>
-    <md:EmailAddress>mailto:Christian.Jiresjo@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223189</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>University West</md:Company>
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:SurName>IRT</md:SurName>
-    <md:EmailAddress>mailto:irt@hv.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
deleted file mode 100644
index 74dcedfc..00000000
--- a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.test.umu.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-06-28T13:32:59Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Umeå universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Umeå University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.umu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.umu.se/english</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy/?system=http://adfs.umu.se/adfs/services/trust&amp;lang=sv</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/privacy/?system=http://adfs.umu.se/adfs/services/trust&amp;lang=en</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.umu.se/adfs/ls/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Umeå University</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Umeå universitet</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://administrationsverktyg.umu.se/ErrorUrl/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Umeå universitet (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Umeå University (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Umeå universitet (TEST).</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Umeå University (TEST).</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-se-te.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-en-te.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/privacy?system=http://adfs.umu.se/adfs/services/trust&amp;lang=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy?system=http://adfs.umu.se/adfs/services/trust&amp;lang=sv</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>umu.se</mdui:DomainHint>
-        <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
-        <mdui:GeolocationHint>geo:63.820554,20.305799</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.test.umu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.umu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.umu.se/english/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Umeå University</md:Company>
-    <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Umea University</md:Company>
-    <md:GivenName>ITS datordrift</md:GivenName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Umea University</md:Company>
-    <md:GivenName>UmU Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Umea University</md:Company>
-    <md:GivenName>ITS datordrift</md:GivenName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
deleted file mode 100644
index acf198f8..00000000
--- a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.umu.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-02-28T16:15:11Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Umea University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Umeå universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Umea University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/Static/img/umu-logo-se.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/Static/img/umu-logo-en.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.umu.se/om-webbplatsen/juridisk-information/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.umu.se/en/about-the-website/legal-information/processing-of-personal-data/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIQZZaF7oNvrrFM0KEHaU+uTjANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZlbmNyeXB0aW5nLmFkZnMudW11LnNlMB4XDTIwMDMzMDE4MTk0MVoXDTMwMDMzMDE4Mjk0MVowITEfMB0GA1UEAwwWZW5jcnlwdGluZy5hZGZzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALHsEXdstjSkejB8LPg7sGTdluCxuZxEV4gI7SVzRuDH0rjerrDv/OYNVqm7sG2VnXZcaUvRoJVRQ7bJXajrnQ2D3Bb3/2sa327jOe8QzwDCB+VHTY4WkG70A2zvGkXnsxImCrlwCl0btjKS1IRvJh0585hjyiSKJsJ52t7UAGH+it69NptFfBJz1fOKfgDFCu1y2oFe9XpBs6h/C0UhXIDKUi6jsd08Q/wBUWEafHxVMaCwvy6NTB+vCQzAslObsu1JB1BpkTA9bW5lmpCLCr8Ss1jyBFYljT8yx0psYOAS9BZOSPsmidKuYAqEzzGBAZDl8EH/9CAp13Q2AG7aavkCAwEAAaNzMHEwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAhBgNVHREEGjAYghZlbmNyeXB0aW5nLmFkZnMudW11LnNlMB0GA1UdDgQWBBQgqiHEOf263xD/m6n/6GJb8UMHcDANBgkqhkiG9w0BAQsFAAOCAQEAe0ZI71gIdAtDagLS1XgAPTsIdIFahZ44rvDDKIgzaOmzIoL/azdKxlwFLwoDIYDnMcgDq0a/huspsf3SJ9YdDQt7k+PFx+77VC3sdbEblYzH9jS1FfBrsYNpohqLrkx3bihbCdd5/bSEh4hbM7Uar14734iBO5L7oYhDIGj8jjTSTWq5MEyKO66nfeReDgKkOHukFGb5L4eKruoCNtdsFCpsOX0ZDLHoUXJrrB1M+s9dyOk3sN7MwXq3d+SuhHSLZljg0W/plgt2L+aA9AeoNqAxPI1qJJZsSjkL0z0KcLlWOFEqFaEmAdMPCrS2NA8dT0daC5W24TYn+zJYBELNVw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNjCCAh6gAwIBAgIQVSHRo4JhuLdHW1GUlYqsITANBgkqhkiG9w0BAQsFADAeMRwwGgYDVQQDDBNzaWduaW5nLmFkZnMudW11LnNlMB4XDTIwMDMzMDE4MTUxOVoXDTMwMDMzMDE4MjUxOFowHjEcMBoGA1UEAwwTc2lnbmluZy5hZGZzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiKlvURcVQKnT+nobTLtNTRAtQR2GFnhjE0vBb6Hrwa/Iy7hZBEEM7cvtOXByuPuKJ45zBN2ystjYbXyN+2ojZ1tVGj+f4kjGDpz2/lsZrX+NSW+dvcE8b1EC6FId1P37THyOpTgzfrlz7mz06mxAFkGwqqwgjjTfnKT05D6Nc3t1YCA0cJ4FtzLTrEFjS+tFqhf/jg1VtvsYm7CCt9QTbi0guT3XfRxBloQUqsMPTc7N95F1iXrxkLWIgLp7pq35Rwf+M5YHQcNVNEna7sNtHFpWKfNfXVGdEpx9h/k/kqs2qc/22BwAjcblzu7idXqeGR6wNkUl4EA/qJW8kx0ekCAwEAAaNwMG4wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAVghNzaWduaW5nLmFkZnMudW11LnNlMB0GA1UdDgQWBBTK78kU5AxbYkP3ZoKCF0nOsCQdEjANBgkqhkiG9w0BAQsFAAOCAQEAXD6IfM/pvFZVB1bx/GitQMOgBwoAfBtuEzkj3bqNov5Ez2a7Duq54MVh4YEkmmIBACRgG1pZ9YG51PfrU45pTntEHaoFdHGCKu6xQJYjC3WCGrALJ+vglsDrVvQNNo0+VW3ZERT+fgh8DAkGYEeABO6aRmNZp86NbfUw+UsPsnGKEOPbySanJLIv5DXr23AXUVkZD1iaXP5cNsk1W9Ze5epWz4arEN+t/lywF1Lk/sBrrAhXOie0vnnesaj5PJWOlyPqYekAUH/Hnvu6TcArHgpgrfofn7Xdmz9XLbjavxayFtpXTVqlBiR0Epvw3t4V8jo+yX7/tJfiRmvRwfvSag==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.umu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.umu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.umu.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.umu.se/adfs/ls/" index="1"/>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://administrationsverktyg.umu.se/ErrorUrl/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Umea University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Umeå universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Umea University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/Static/img/umu-logo-se.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/Static/img/umu-logo-en.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">umu umea+universitet umea+universitet umea+university umea+university umea umea</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.umu.se/om-webbplatsen/juridisk-information/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.umu.se/en/about-the-website/legal-information/processing-of-personal-data/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>umu.se</mdui:DomainHint>
-        <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
-        <mdui:GeolocationHint>geo:63.820554,20.305799</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIQZZaF7oNvrrFM0KEHaU+uTjANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZlbmNyeXB0aW5nLmFkZnMudW11LnNlMB4XDTIwMDMzMDE4MTk0MVoXDTMwMDMzMDE4Mjk0MVowITEfMB0GA1UEAwwWZW5jcnlwdGluZy5hZGZzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALHsEXdstjSkejB8LPg7sGTdluCxuZxEV4gI7SVzRuDH0rjerrDv/OYNVqm7sG2VnXZcaUvRoJVRQ7bJXajrnQ2D3Bb3/2sa327jOe8QzwDCB+VHTY4WkG70A2zvGkXnsxImCrlwCl0btjKS1IRvJh0585hjyiSKJsJ52t7UAGH+it69NptFfBJz1fOKfgDFCu1y2oFe9XpBs6h/C0UhXIDKUi6jsd08Q/wBUWEafHxVMaCwvy6NTB+vCQzAslObsu1JB1BpkTA9bW5lmpCLCr8Ss1jyBFYljT8yx0psYOAS9BZOSPsmidKuYAqEzzGBAZDl8EH/9CAp13Q2AG7aavkCAwEAAaNzMHEwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAhBgNVHREEGjAYghZlbmNyeXB0aW5nLmFkZnMudW11LnNlMB0GA1UdDgQWBBQgqiHEOf263xD/m6n/6GJb8UMHcDANBgkqhkiG9w0BAQsFAAOCAQEAe0ZI71gIdAtDagLS1XgAPTsIdIFahZ44rvDDKIgzaOmzIoL/azdKxlwFLwoDIYDnMcgDq0a/huspsf3SJ9YdDQt7k+PFx+77VC3sdbEblYzH9jS1FfBrsYNpohqLrkx3bihbCdd5/bSEh4hbM7Uar14734iBO5L7oYhDIGj8jjTSTWq5MEyKO66nfeReDgKkOHukFGb5L4eKruoCNtdsFCpsOX0ZDLHoUXJrrB1M+s9dyOk3sN7MwXq3d+SuhHSLZljg0W/plgt2L+aA9AeoNqAxPI1qJJZsSjkL0z0KcLlWOFEqFaEmAdMPCrS2NA8dT0daC5W24TYn+zJYBELNVw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNjCCAh6gAwIBAgIQVSHRo4JhuLdHW1GUlYqsITANBgkqhkiG9w0BAQsFADAeMRwwGgYDVQQDDBNzaWduaW5nLmFkZnMudW11LnNlMB4XDTIwMDMzMDE4MTUxOVoXDTMwMDMzMDE4MjUxOFowHjEcMBoGA1UEAwwTc2lnbmluZy5hZGZzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiKlvURcVQKnT+nobTLtNTRAtQR2GFnhjE0vBb6Hrwa/Iy7hZBEEM7cvtOXByuPuKJ45zBN2ystjYbXyN+2ojZ1tVGj+f4kjGDpz2/lsZrX+NSW+dvcE8b1EC6FId1P37THyOpTgzfrlz7mz06mxAFkGwqqwgjjTfnKT05D6Nc3t1YCA0cJ4FtzLTrEFjS+tFqhf/jg1VtvsYm7CCt9QTbi0guT3XfRxBloQUqsMPTc7N95F1iXrxkLWIgLp7pq35Rwf+M5YHQcNVNEna7sNtHFpWKfNfXVGdEpx9h/k/kqs2qc/22BwAjcblzu7idXqeGR6wNkUl4EA/qJW8kx0ekCAwEAAaNwMG4wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAVghNzaWduaW5nLmFkZnMudW11LnNlMB0GA1UdDgQWBBTK78kU5AxbYkP3ZoKCF0nOsCQdEjANBgkqhkiG9w0BAQsFAAOCAQEAXD6IfM/pvFZVB1bx/GitQMOgBwoAfBtuEzkj3bqNov5Ez2a7Duq54MVh4YEkmmIBACRgG1pZ9YG51PfrU45pTntEHaoFdHGCKu6xQJYjC3WCGrALJ+vglsDrVvQNNo0+VW3ZERT+fgh8DAkGYEeABO6aRmNZp86NbfUw+UsPsnGKEOPbySanJLIv5DXr23AXUVkZD1iaXP5cNsk1W9Ze5epWz4arEN+t/lywF1Lk/sBrrAhXOie0vnnesaj5PJWOlyPqYekAUH/Hnvu6TcArHgpgrfofn7Xdmz9XLbjavxayFtpXTVqlBiR0Epvw3t4V8jo+yX7/tJfiRmvRwfvSag==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.umu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.umu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.umu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.umu.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.umu.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.umu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.umu.se/english/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Umeå University</md:Company>
-    <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Umeå University</md:Company>
-    <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Umeå University</md:Company>
-    <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>UmU Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
deleted file mode 100644
index b2700e1b..00000000
--- a/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://akka-adm.test.uu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-16T18:53:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University AKKA (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration (TEST)</mdui:Description>
-        <mdui:Description xml:lang="en">Authentication/Control - Directory Administration (TEST)</mdui:Description>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFDDCCAvSgAwIBAgIJAKteO8AenOr0MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3V1Yy1ha2thMDA0LXQuaXRzLnV1LnNlMB4XDTE1MTAyMDA3Mjc1OVoXDTI1
-MTAxNzA3Mjc1OVowIjEgMB4GA1UEAxMXdXVjLWFra2EwMDQtdC5pdHMudXUuc2Uw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5Yykfh896zzlUMDkKfgP9
-bDEqGjRGLyIJaj+nDqtBzpStcqutIBbFhg59hkCO0rSQ7tTqAfiyTd+Tumu//+Va
-eP5cs98FPMePfRd53xYECQzIw4UtVAjEQJEgnhrtuW6izhKv8QBy7NE/+w44kwx1
-NyHnwk0LhkmPr8t131PfCqktOZ5zuRu/neqx99CPbsBLtFZ7Sq3YFBrQA8w5UhiQ
-EyHR3moUUYxOI/1QzjrEjBOM/3tRnX5JW1vYJUTuTPpOz3/xNUFYuD3WyVfIGS2d
-/qyDmfJF8W9WZHFosKszJ/ptsLFu1htS8M6X5NE75/Axw1Iq7j/tuf6Ie/PyyIpF
-898YdX7ZNb4SrjkaEK28uKmomXW3eA9OtJfzYZI2n9cKmaEHPP0clBDksyPn16q8
-6sAOq0MWOUUZ6/KnWPmZWczEaHzsvlsAdP715c4QjfRN0eh65T0gUJA8YcKqBIef
-qLaW4buj1udWFCfmH3V9DwOcedEU2v90Qxrn/Og7VUoCaaw05OeouRIxPVZVhyX2
-jCxWtVl1HWXDKcDDwh2q70B2TzCnlmHnEINxldAvAfy2vAW/BusCNxrLiscHdj3a
-1+N97p3xHrtMdUTEs1GsQVnVSNHxinshGiIis3lw+W5xuOnEVFpzBjad2oqLCj8t
-m2IzDvqYtNXE91fg0kwMUQIDAQABo0UwQzAiBgNVHREEGzAZghd1dWMtYWtrYTAw
-NC10Lml0cy51dS5zZTAdBgNVHQ4EFgQUUruxH3bOINDbPvFnLUaZzNmRTzwwDQYJ
-KoZIhvcNAQEFBQADggIBADY78qD6b3UWghVabhCLWLW9MPrMiV0FeKaOHOuQYERv
-DsU3//Nc9lwExqfOavsdQu5sWmjv8DwfJkmRxRz83qtFUlcPCc3NTRwLDkB/BFpy
-RUYXQtzbOfAJA5zHZvFeNVtgDNT+492BrdHlovMCkYEmYsEJbH+JlTuPK0qxwRqI
-mrPt0xTY/uTfr3WJWjUuDJfRXBqk7RduPE/OuRmJgR5y2YTuhD7xuH3g2n11Lcqp
-oDANE9jKgPeFD8otFNmDxb8vzFaHvxPN8VAJEzTbtA0ijvpOWFodlv/yVsn8klvE
-WSLRvWzSCXenOaSCaf4y92Fi4n0WjOXtWV4C7nkjrlO6ov9FxDo9U+p7PQ568T8N
-mt3qQBeVbAFb2McyyB4J8XSO2PGOZOfx/P+QREqCCSQK+vd5/WNZdU/O+QEVOA67
-xLEWZrA8ctG8LISaRvo25r6JAnwrQYF7RaCFCBmqBe1JYYdtEaiSVAbo1WKsxRub
-ijMA4vVFfH6jjSOnzquVyciKxDOaCNNT2h8qqBiVA1DyS0m3N403ebwNrzoFwGrk
-54g7VI1jtxz15prFXwN3yIaG14fUHsRiEAWu84QBAQ2wnufJNWqaLiHHUPDaxTpg
-lo0T4kERMhfIMpY98G4xTyJQrk6qqNItEsD8CWePbYFnlo+c2IxU9tvGM6sLA50k
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Uppsala universitets AKKA (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Uppsala University AKKA (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/aqtest.port.se-shibboleth.xml b/swamid-2.0/aqtest.port.se-shibboleth.xml
deleted file mode 100644
index b07bb10a..00000000
--- a/swamid-2.0/aqtest.port.se-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://aqtest.port.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-06-11T09:09:19Z">
-      <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>
-      <samla:Attribute 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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aqtest.port.se/Shibboleth.sso/Login-ltv"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aqtest.port.se/Shibboleth.sso/Login-lu"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aqtest.port.se/Shibboleth.sso/Login-ki"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Klara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Klara</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Kemikaliehanteringssystem för tester</mdui:Description>
-        <mdui:Description xml:lang="en">Chemical information system for tests</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.example.se/info/about.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.example.se/info/integritet.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.example.se/info/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="40" width="200">https://aqtest.port.se/alphaquest/bilder/loggor/np.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="40" width="200">https://aqtest.port.se/alphaquest/bilder/loggor/np.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>test01.prod.port.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=test01.prod.port.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAJjc2i4BvoZ6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Rlc3QwMS5wcm9kLnBvcnQuc2UwHhcNMTQwMzE5MTMyMjI0WhcNMjQwMzE2
-MTMyMjI0WjAeMRwwGgYDVQQDExN0ZXN0MDEucHJvZC5wb3J0LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoAu2JhOkXmp+ROQBR94r/gajtrXms+JM
-iLDxYb1P7QioKlP0/M6TdqXnyCUh6wJwmdYUxMHFJbzNo9zD+pse3RTv5IlpFV7g
-6jwnFwqYNR0FCEZKyhSx54l5NYNfmEjnYrWHJS+OcMUjYNDQMjvp08L6vqWuygWZ
-PKq/MkMp/wPjB3mYaqSSImpTNk8wjlNUdZh7/yiw2+h9fVHFaa0jypk8yOezJC7e
-F58JPDraq5kZu3B136hQpUu9oPO8oDBXVCxGwMEIcC/kNofUnDfXEjH9BzEmRNry
-b+y0KwzlhWv96xumFysKXrz0zbOu67A4qrYZB9fh3CT4KOk626a3WQIDAQABo0Ew
-PzAeBgNVHREEFzAVghN0ZXN0MDEucHJvZC5wb3J0LnNlMB0GA1UdDgQWBBT92NxF
-6NI0YeE1/fkglTAwoOrpYjANBgkqhkiG9w0BAQUFAAOCAQEARZJcu+kw205IdbnZ
-ksxNKBugjjXPByjDfOexPV50MAT9afx9bvDhlSNEr3R5tfT1eKR7c12JpItQoilP
-khRhxYzfeW1ric20eAwH1FE5Q8ZJ7IHFSo0nHGlPNPEjQsPIlaNkXjUiziWOo+hz
-+CODixF0OhrK1fB6WHMamgRl009Ns7/lx+aXScFUJnNTP1zylj6zIRVf2tU+nw1T
-tc/AUH3947EbCtXmt3xlw7kisKO6wiLkZS3ZF9F2PNYPz79oBUIRHAjLC2B73OYO
-bfjFoe6/viT7p/XJQPt6Zgga/NNt7mvOy+4i9FZ32dZu30DJx323OTFY03eTPmb2
-+q0FMQ==
-</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://aqtest.port.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aqtest.port.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aqtest.port.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aqtest.port.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aqtest.port.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aqtest.port.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aqtest.port.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aqtest.port.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aqtest.port.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aqtest.port.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aqtest.port.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aqtest.port.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aqtest.port.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aqtest.port.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/auth.asiaportal.info.xml b/swamid-2.0/auth.asiaportal.info.xml
deleted file mode 100644
index 1e8aa342..00000000
--- a/swamid-2.0/auth.asiaportal.info.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://auth.asiaportal.info">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-12-05T15:06:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">AsiaPortal: Databases and other resources provided by the Nordic Institute of Asian Studies</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Provides access to databases and other resources for Nias Nordic Council Member institutions</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://guide.asiaportal.info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.asiaportal.info/privacypolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIDD+tuMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTQwMTA0MjAzODE5WhcNMTcwMTA2MTkwMjI3WjCBwzEpMCcGA1UEBRMgRFZVbGd3OEVHZ2JNNXQyL2YxTDJTYmhPZ0IyNk5KU0wxEzARBgNVBAsTCkdUNzM3MjYxMzIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZEUYMC613I+5ESmStfxRfbp4hY+PJgZDpA3EUZXiGI2o3/KfvD1xNZ9Y2Krmvhgc7pgDDc/0hp96XX1B3IFAfho4UOnmfoWVA18Kc7yzGr6we0DNvS3JVOP6zqdCp8EwBEoJ3/vJZfzwWbwf9uxVhGX+o83kujmmj1SaXPqho/ZaemP/MMOsYrhxPTdZIaHk0ma4R5M30BZ81oOkrN+9HYW2aUwO2rqcHfwWvSFNC4q7yUTn7JPdgePUUutovzpDFNJShcv3/m475NaPiaKUGkgr5QGHtBToP1YLpP+FMvPsYOrEUOXxyKVoXiZArn1mpuXfGDJP7YyaXrU5srPc8CAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIUYXV0aC5hc2lhcG9ydGFsLmluZm8wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3JhcGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0OBBYEFEuuKoQbNk5gVHHaQe+MfHRBpQUpMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUHAQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVzdC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3QuY29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczANBgkqhkiG9w0BAQUFAAOCAQEACJsMllEysDu7OSFPBBy0Jnnh4T561u35Lm+OR4J/skLU0L1qX9Kqne75hrIQxWO/t99spKb4gKeu/HIWYfHkSrac9ZsS4dKnjKym5XAszvdwJw4MRcMGcJApUGCCCbZZyoFq9Z5OIewZhkBKEKNRhzvdMqZcg8HWJeXVswWPGs1hgVufbCnn2lXMiNTTRqmZCvEb8l+44/GzeN1pP6mhwxmEOcr2MXhHV95v0xwihZw7a5nZRBH3HVeUDhKxgz4OqywsOttB+6YvFgVl67oFxh8Re4Ti03ckRMBirTHhOXMA1WiA6RRqp498rxth9D5sspjbNttxunfF5E6zn1f7uw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIDD+tuMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTQwMTA0MjAzODE5WhcNMTcwMTA2MTkwMjI3WjCBwzEpMCcGA1UEBRMgRFZVbGd3OEVHZ2JNNXQyL2YxTDJTYmhPZ0IyNk5KU0wxEzARBgNVBAsTCkdUNzM3MjYxMzIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZEUYMC613I+5ESmStfxRfbp4hY+PJgZDpA3EUZXiGI2o3/KfvD1xNZ9Y2Krmvhgc7pgDDc/0hp96XX1B3IFAfho4UOnmfoWVA18Kc7yzGr6we0DNvS3JVOP6zqdCp8EwBEoJ3/vJZfzwWbwf9uxVhGX+o83kujmmj1SaXPqho/ZaemP/MMOsYrhxPTdZIaHk0ma4R5M30BZ81oOkrN+9HYW2aUwO2rqcHfwWvSFNC4q7yUTn7JPdgePUUutovzpDFNJShcv3/m475NaPiaKUGkgr5QGHtBToP1YLpP+FMvPsYOrEUOXxyKVoXiZArn1mpuXfGDJP7YyaXrU5srPc8CAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIUYXV0aC5hc2lhcG9ydGFsLmluZm8wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3JhcGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0OBBYEFEuuKoQbNk5gVHHaQe+MfHRBpQUpMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUHAQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVzdC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3QuY29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczANBgkqhkiG9w0BAQUFAAOCAQEACJsMllEysDu7OSFPBBy0Jnnh4T561u35Lm+OR4J/skLU0L1qX9Kqne75hrIQxWO/t99spKb4gKeu/HIWYfHkSrac9ZsS4dKnjKym5XAszvdwJw4MRcMGcJApUGCCCbZZyoFq9Z5OIewZhkBKEKNRhzvdMqZcg8HWJeXVswWPGs1hgVufbCnn2lXMiNTTRqmZCvEb8l+44/GzeN1pP6mhwxmEOcr2MXhHV95v0xwihZw7a5nZRBH3HVeUDhKxgz4OqywsOttB+6YvFgVl67oFxh8Re4Ti03ckRMBirTHhOXMA1WiA6RRqp498rxth9D5sspjbNttxunfF5E6zn1f7uw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">AsiaPortal Resources by Nordic Institute of Asian Studies</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Nordic Institute of Asian Studies</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NIAS - Nordic Institute of Asian Studies</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nias.ku.dk</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>mailto:bib@nias.ku.dk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 0d4f6909..00000000
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-06-19T11:55:52Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">NORDUnet Box Service Access</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">NORDUnet Box Service Access</mdui:Description>
-        <mdui:DisplayName xml:lang="en">NORDUnet Box Service Access</mdui:DisplayName>
-        <mdui:Description xml:lang="en">NORDUnet Box Service Access</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://box.com</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NORDUnet Box Service Access</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NORDUnet Box Service Access (box.com)</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="displayName" isRequired="true" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="surname" isRequired="true" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" isRequired="true" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" isRequired="false" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUNet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index edfac18c..00000000
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://box-idp.nordu.net/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-06-27T14:11:46Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://box-idp.nordu.net/simplesaml/saml2/idp/metadata.php">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUNet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/castest.weblogin.uu.se-cas.xml b/swamid-2.0/castest.weblogin.uu.se-cas.xml
deleted file mode 100644
index 0a894c83..00000000
--- a/swamid-2.0/castest.weblogin.uu.se-cas.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://castest.weblogin.uu.se/cas">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-16T18:53:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://castest.weblogin.uu.se/cas/login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Interna tjänster vid Uppsala universitet (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Internal Services at Uppsala University (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets centrala autentiseringsservice (CAS) (TEST)</mdui:Description>
-        <mdui:Description xml:lang="en">The Central Authentication Service (CAS) at Uppsala University (TEST)</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://akka.uadm.uu.se/Teknisk_info/Gemensam_webbinloggning/CAS/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://akka.uadm.uu.se/Teknisk_info/Gemensam_webbinloggning/CAS/?languageId=1</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIC9DCCAdygAwIBAgIJAOwNygOxULuiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-            BAMTD2dlbmVpLml0cy51dS5zZTAeFw0xNDAzMTkxMzIxMDJaFw0yNDAzMTYxMzIx
-            MDJaMBoxGDAWBgNVBAMTD2dlbmVpLml0cy51dS5zZTCCASIwDQYJKoZIhvcNAQEB
-            BQADggEPADCCAQoCggEBALmlOXHZH3qX/WRqlHTj2gLZq1CJSBzJvRztgMwSy99j
-            wECvZl3tK3u2MRJAfDuzFN71cSc/043aw1iRFcUmDTNcem3k++gamCkH+ZOU9otp
-            1REyUx48h2P0n954u/pYH800i/gZRHvmBULwXeoXl6Mspsj+/qC1fCKKdQ600QDA
-            nK+0e2n+T5maAHT7nIR8YkCuExoq/Z8/m4gx+W3VTtLO0BSrzmWhNxUAL2JXJeyj
-            0rlA5z9Dds0WvFFX6Q9JuSnmRdpQSFQvIlysQWAFea6a26Bita+pnr6rsi6p3JUS
-            O0U3/hbooWkbk0vMYkWlBMkEmcHeeYkwuHhODr89vd0CAwEAAaM9MDswGgYDVR0R
-            BBMwEYIPZ2VuZWkuaXRzLnV1LnNlMB0GA1UdDgQWBBTQ4oxwpsOll6tzXhCYC2qk
-            708bqDANBgkqhkiG9w0BAQUFAAOCAQEAtYqS4aYzDp/+UATGsN1WQ3PEQ2nM2GpS
-            M+GMJVTdPJql3FdPmerpRljr+kQyPUXHAr+8qWqk/DkERhSb+C47fRsixDsQYiOU
-            lyUCJ2HHbE6ZYI7w6e5o07c5IuTZxQy4VyBmFsH+o2aNhZbMFKNk4TPMAIWQPtbi
-            nW893Xs69KMMmPZT+s6mlp3eoNZCIKh7vIJrZtZYWH88IN1CqV6X0e8ElRHf4vUe
-            uSchaFhZ24so9OWUQwA6z5EG4j9l+dzjKKgI78BHUiIeexASk3BXNqSOQ1Q52KFI
-            Ezr4DJi4GietsCNfksQ5n5h7vzRM3Ob2mVRNfbJZ3AVHm4pc55GTBw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Interna tjänster vid Uppsala universitet (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Internal Services at Uppsala University (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/cloudmore.com-shibboleth.xml b/swamid-2.0/cloudmore.com-shibboleth.xml
deleted file mode 100644
index 980bb1e5..00000000
--- a/swamid-2.0/cloudmore.com-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://cloudmore.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-09-14T09:45:38Z">
-      <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"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cloudmore.com/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cloudmore.com/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cloudmore.com/Shibboleth.sso/Login" index="2"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cloudmore.com/Shibboleth.sso/Login" index="3"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cloudmore.com/Shibboleth.sso/Login" index="4"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="240" width="180">https://www.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>stoprvfe01.domain01.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=stoprvfe01.domain01.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAJOLmVdtpocoMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
-BAMTF3N0b3BydmZlMDEuZG9tYWluMDEubmV0MB4XDTE3MDkwNTE5MDYyN1oXDTI3
-MDkwMzE5MDYyN1owIjEgMB4GA1UEAxMXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQw
-ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4YLswQuTzT9JcYWFe8PFZ
-oR/liIkoELde+7fJquGIUps2PflaSFcb8qf8LFik8OqB/WI3d1+ORN6S7TDrXbUN
-S+TNz4ngmc+qw3FQrHooleAgciPUpvA68g7qHGEjqqC4MggOWf31da7ICgpl+j8L
-rCdGWk0ea4rgH9KT9iercYdJfk41dS6VkwT2ARQVignuDMkqOV9BlR3fEyKFz7VL
-Kc+zYz0vtcSMIx85BffZ24oMbETeJkRCFUMqGkagsf/KKeTVRCbEnOosWYsac/Lj
-xQxFD+aKaKP5z6Wvd9EDKAa5egS5m556z58LUiUXT4QcRqc43OTcoI1OefeQT+B7
-0chHWZRXGzZWxNsDgbjUhBLcELh1H9ehc99TaNIXeIyYJgfZp2zXAsE8UGUqpL5p
-JI+OG/7au2kVipcQqbiMxYm+FhyLqzgRhNQrP4wXPee9Psyvy0ylIwveUY83uwBV
-EsAiyg6LD3KnYC4sZlr80GJ4l1Cp+4Q0101q6WeZRjMCAwEAAaNFMEMwIgYDVR0R
-BBswGYIXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQwHQYDVR0OBBYEFHzZ8nn/1Zj8
-kxrK0kLw3RlA/t9hMA0GCSqGSIb3DQEBCwUAA4IBgQCAOrmhhFLsfqYx6K+wKt7I
-HCqbsB0bhM8pccqWmUaUWP1WlRJOupIpOmP5FvIgvVtXsuEzUKd1voPF4DMfzaV6
-ACU6DxLf0lZ/3NrwM9ipVEE/zpXMHvBTn5802wcOIIm7hF+If83QM79ogex6b7gW
-oLhWfu1yz+2La4twB+6zkcz9THgkgSn0UtUNwd0HzyyHZ3SZuOMCGUIuyz+19c1n
-+KX6CjsXpMcJ4Oc1HsbtCKNkvEwNudxeiXWSWzj5MQHMcALE/ybOiQ/NMmj5SUzt
-oySXpA6JvX5PwGbuyuy1j4u6gwunYWXWzA0/bEyYADM47ZfNhzD+52b3sVaM1ROB
-TFv0Jq/k9XzQGKyrxphatYKLFZZ92DBDrtnwE3YsIXYc8qzWV7fDbSdvJe6eRBJV
-nnp6KW+OGs5W4irV/BM+AE0LMh7hb4xWfN1xO8Z2nrgAWHNJUkFw74FkEa94t9Y4
-KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
-</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://cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudmore.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml b/swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml
deleted file mode 100644
index 4d052c56..00000000
--- a/swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://coip-test.sunet.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAIEijMHQfZuv/n/goQuJ0Q4JizX1MA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmNvaXAtdGVzdC5zdW5ldC5zZTAeFw0xMDEyMDYyMzI1
-MTNaFw0zMDEyMDYyMzI1MTNaMB0xGzAZBgNVBAMTEmNvaXAtdGVzdC5zdW5ldC5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZ3jfjgtkyfH1TJ/rQd
-ziYCIi9h1Rne9yFt83KrsykQVxRDoA/0AbBpQnKNl1sD14iAyj+xpHPUMPz5/MpK
-5b7f1pRXsL+8tEf+gmdPDiJ1rUecV3soyOVdOuOZcROyfx70iddHgkUYmKUbVeeE
-rvU8vKa8BjYEvzG3WRT4o6I2tkQyYEu6mJlw48EjcgCG8CYFbrhKhiTk8d/qMWrQ
-eRfdWaBqLfQnum3DJXPaZ35QvO6Qk+uWN2CcdWPKWyyvpUmNp5/LklPJ4XZC9JqO
-LBzV02EVsnNbNTKjYKjwtlKa5BPD7QoDLp+QJel0jtx8WH5LCmFtvSdwnUFV1oig
-DzcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISY29pcC10ZXN0LnN1bmV0LnNlhilodHRw
-czovL2NvaXAtdGVzdC5zdW5ldC5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-eTW+lqHTyfngd7TOlml27LxY5H8wDQYJKoZIhvcNAQEFBQADggEBAJsa3va2XmyV
-9vt0MtXK7xetQc7YpCl8IPMTPqJyiwIOmRDahU0fOlsnyXgiVbgtBWEkdPU+mFJt
-ieUpQNmHMvNkGWHmBBkSX0ANyor+H54XNYYnaMcxa/dZHE3hCWO1N1Y5AOFRUauv
-qr0ECPqqiM8M/Ir/9iRivLkBpBgLa4SU9O13s/1dgsP7vvNoIbxMecLRhVVaTkwj
-v5OqkXDvlha9dI/NRxBYUsIpts6tU+20DvSmyZG1IbSu5tMSGn6jrDHsClXuig7w
-ZBkqgmTtNcDZXR2FaflUDmM7Xk1gw581bWdYCpQZHNQv7Kh7yAeQWjU2OoYFm3U9
-C2+Rm0cXr6U=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://coip-test.sunet.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coip-test.sunet.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/connect.dev.eduid.se-sunet.xml b/swamid-2.0/connect.dev.eduid.se-sunet.xml
deleted file mode 100644
index 72252050..00000000
--- a/swamid-2.0/connect.dev.eduid.se-sunet.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://connect.dev.eduid.se/sunet">
-  <md:Extensions>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <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-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <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-sha512"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-10-21T14:08:19Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="false" 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://idpproxy.dev.eduid.se/sunet">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">dev.eduid.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">test.eduid.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Login for SUNET employees - Test</mdui:Description>
-        <mdui:Description xml:lang="sv">Inloggning för anställda på SUNET - TEST</mdui:Description>
-        <mdui:DisplayName xml:lang="en">SUNET - Connect Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SUNET - Connect Test</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/info/Sunet Identity Provider Service Definition and Privacy Policy?showLanguage=en_GB</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/info/Sunet Identity Provider Service Definition and Privacy Policy?showLanguage=sv_SE</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/Sunet Identity Provider Service Definition and Privacy Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/Sunet Identity Provider Service Definition and Privacy Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIUHwEGLhFEa8Ow6G6Xpz4I572785cwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMB4XDTIwMDMxODE1MDQwOFoXDTMwMDMxNjE1MDQwOFowGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAouQV4lrmp+k+7a8Q/kfovbIF9me1Ls4LMZ3PyqL5JYvAVd+KcMQG4GGEwQ7HHsSzQnhsypyQsZFQeWqtAu5H81KZL1i7DHqD2n2/DmYqfuV9l2f9FlQ1e3VTLtOWX2PlkmiN38VNTWWFAYDNeJg46EJHn/5kFIuBycVcR0wveaXDs8dtjOTSqSawfnwiGeUCv508OK3OD5L9U1snKp7trT5Q1EPLojnihfpqkol0UwecjSBPhd5Lpocm/VGKLfOqnMWLF71PJvu0QN9V4KMZ17rmD8IQlxo8TQQpcYKov55E7AwX9e0H/q9PjjmMVATAfCBVdUCHX93+VvUuQzEBGdT97F0ldbnZsrsp+ec4niKaeIqRYu77B0oWwNQfgJ0xJazkYdjfyTkM5RhMxjTsRKWjpKBFk6YOfcP7wQZVJMKvSKXkosFBMHgZfttoyfcoERMoItuZfbjR9DhQxBIxJ+/D9+QCT/dXqETmxZ6ftEeRKjqKF86GVnq/OYZVpqZth1EUyQxI7FcF2H9t6SmwR5KaK1eN13i5fB2XCuWAYResk63i9XZmD+idHERpi9NN6oVK7tz1WQBxPcl4UGqLG1VGY22ctlCcb0PI6GFj+DZqhErl1a3wrhMY22oCRhAwZGk68yK39nLti2isq+wYT+aYl8f7ZYWsp97xq3GHm8kCAwEAAaNTMFEwHQYDVR0OBBYEFL4Gvq/MygCukZfrLP5OE9nCKqA5MB8GA1UdIwQYMBaAFL4Gvq/MygCukZfrLP5OE9nCKqA5MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGHfzhiMltgYqZHLn66GYOeY/8ugqu5zQK3D+SFVyxsfOsaQedoxyCqlBUlw1rRtdFUr2pC1xW1onPUcXlUzIkYypJ0AHZwlnfAfAKOSCrK38gsRQI6RDIhPIH7yuPHxyXGq6rWLUBzZpcb40EhWPK8o+KMG5i3cNrCC/+LSU4uL7QVJwkUeqltPBDABL5ZggoT9Dx85bUlU0PgQtEpbyFtt03kbkOut8tC4feiWzbRXAkvhwZhgqFDft+UeKUyF5z6MtScS7Q6oqnDGbyVCL0k77sXmv66mjD3J/wwUywnNSnlfWVfohJAY2E6b1IMYsihjBB8m1Ltb9F3CVrlB2DXtG8MgitBRuHeSAehpXss8676FOdApAVL4VnMoW2GC5JKYmpVA8yx5uZb6tMlRmLRly0GpxKx0Sy4D8joPXSExyjM8XHK22gMjgFYCJixDo3lhTzsLSKv9uwH9gdoxDg+F6gnLaihtTOwJRGcFTgj2S19iYQYWCLg2BNNC6Q8pmSh+KkIHOrf4a3nHVQhnm6fF0mtaKUnLg2D5ivPD8cJswOn+LZ4a75kbbeMcw2l+GArzeN5hhEDgCLwUnD11zhHcK/XYiI23fVLoIM+nOLykw2rtAW16QFjSAQ0FNODex/EiljOCUvSGY97rCQHdhd0UzehdiDakhIDPq2ZRF8Co</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/EduidSP/SunetIDP/sso/post"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpproxy.dev.eduid.se/EduidSP/SunetIDP/sso/redirect"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SUNET NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SUNET NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SUNET CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml b/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
deleted file mode 100644
index 875887f0..00000000
--- a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cpauth.icos-cp.eu/saml/cpauth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-02-11T11:09:51Z">
-      <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>
-      <samla:Attribute 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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cpauth.icos-cp.eu/saml/login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Carbon Portal authentication service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Kolportalens autentiseringstjänst</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Single Sign On for services of ICOS Carbon Portal. Maintained by the Carbon Portal team at Physical Geography department (nateko.lu.se).</mdui:Description>
-        <mdui:Description xml:lang="sv">Single Sign On tjänst för ICOS Kolportalen. Hanteras av Carbon Portal teamet på INES (nateko.lu.se).</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://cpauth.icos-cp.eu/saml/privacyStatement</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>cpauth.icos-cp.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cpauth.icos-cp.eu</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEJzCCAw+gAwIBAgIJANC3VWNs7fbTMA0GCSqGSIb3DQEBCwUAMIGpMQswCQYD
-VQQGEwJTRTERMA8GA1UECAwIU2vDg8KlbmUxDTALBgNVBAcMBEx1bmQxGzAZBgNV
-BAoMEklDT1MgQ2FyYm9uIFBvcnRhbDEfMB0GA1UECwwWQXV0aGVudGljYXRpb24g
-U2VydmljZTEaMBgGA1UEAwwRY3BhdXRoLmljb3MtY3AuZXUxHjAcBgkqhkiG9w0B
-CQEWD2luZm9AaWNvcy1jcC5ldTAeFw0xNTAyMDUxMjI0MzZaFw0yNTAyMDIxMjI0
-MzZaMIGpMQswCQYDVQQGEwJTRTERMA8GA1UECAwIU2vDg8KlbmUxDTALBgNVBAcM
-BEx1bmQxGzAZBgNVBAoMEklDT1MgQ2FyYm9uIFBvcnRhbDEfMB0GA1UECwwWQXV0
-aGVudGljYXRpb24gU2VydmljZTEaMBgGA1UEAwwRY3BhdXRoLmljb3MtY3AuZXUx
-HjAcBgkqhkiG9w0BCQEWD2luZm9AaWNvcy1jcC5ldTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAM2QN1jaZJeuPAH+4sVMZKk7vg4JIbUuTMKk0+KIAg5M
-XiVsRiEUjY+LtIncrvA/kf2CIySI0WkbwZMjcDd03hNj4kLWhuyxfOCwDO6DsUbG
-MbyI6HIYWXJp5ljfEEFgtMqT3dDtD5vwq8h4Zy20ukxOoIokKczrAvn4JjkMsj6Z
-0CEAFBC29o4E8PWQbUBgvt6Z+2ao+RHMLD7nZVBx98Occ9KfnYnDDd9Oi1XFe009
-zaSbcqY2RpN8I9hcW/KQf3KnGW5xZ5dr4rhGklCkYr+h0W3xKu+hin8bk91t1Dkr
-gaKl/N7M3Oof3k+7ZBlwaV97es5InWCeNgDxCGkBRNsCAwEAAaNQME4wHQYDVR0O
-BBYEFDcD7MVudooGaNRYqXBYqQi3VzGxMB8GA1UdIwQYMBaAFDcD7MVudooGaNRY
-qXBYqQi3VzGxMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABS02eZS
-weXGMJ2fEIy2JH0VhCbjuX/rz+8Hfh9LjzNb3QwKHuwP83yvPqRulV9FYmvOoK8T
-fMou5aW0mZ+QgJNKOrxY5vFxUq6pn3OiYbBu3m1C9ajbU/nx2evzt4+qUwTfHFb+
-ZgXpOtmxRekFzVvGZ18BSPJKwAAqqZ11X7skT/NwEAhbgplVPv9WkDmDzqNvHqQJ
-nyRgD2ZqUPU9nEOjGy0gI07dciVcYZQ+CiZeSECIWgQwjDEBDuwMCVAZA6gfdz6C
-KJuN+RUSKPEcxPxle1MiB4MU0ei5X4xUbvLWKn9Ok7TOXg2BpnMAv6eON1wVo0Aa
-D265cqy6Le/toVg=
-	  </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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cpauth.icos-cp.eu/saml/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">ICOS Carbon Portal</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ICOS Carbon Portal</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Carbon Portal</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://icos-cp.eu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Oleg</md:GivenName>
-    <md:SurName>Mirzov</md:SurName>
-    <md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/crowd.nordu.net-shibboleth.xml b/swamid-2.0/crowd.nordu.net-shibboleth.xml
deleted file mode 100644
index 5a2d2e73..00000000
--- a/swamid-2.0/crowd.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://crowd.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-14T10:29:19Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">NORDUnet Tools</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NORDUnet Tools</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">NORDUnet Project and Issue tracking tools (JIRA and Confluence).</mdui:Description>
-        <mdui:Description xml:lang="en">NORDUnet Project and Issue tracking tools (JIRA and Confluence).</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://portal.nordu.net</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://portal.nordu.net</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>crowd.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crowd.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANmt8Ciw6kb/MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2Nyb3dkLm5vcmR1Lm5ldDAeFw0xMDA1MzExMTI4MzVaFw0yMDA1MjgxMTI4
-MzVaMBoxGDAWBgNVBAMTD2Nyb3dkLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAPX2dT9VdcfFwxu7VA00KB7MmJj43/ReptLZNF1qEIEY
-LurgE63gRpalC1RLNx40V0a692ae9vlUJwr5SSuPE///KcIGe7MqKYqxMNR0EVUM
-gkLl/Iws6X6IKPXZFg/WeE/C/cmU6OzaTwdPBmg360Ys9veUOnt/3/ddRhSGRlr/
-QhrFJwZpeRQG/G7f8wIrvVT6HvsY1QOjW6YV43fon8eMBFz1WV7dAAx4L5d1JXX3
-EH+vY6a1nRj98qZPXZ7MY4HBMS8uU/B2/zTN+N9DFBpbwHYWvZQynIviGrUlgGi6
-bDMJH2k+sTGgy9EGZcaAqb2AECMidmXJk3/nOsX5cFECAwEAAaM9MDswGgYDVR0R
-BBMwEYIPY3Jvd2Qubm9yZHUubmV0MB0GA1UdDgQWBBTvR6U7d9zdmqbIl+g3SLa9
-8CChvzANBgkqhkiG9w0BAQUFAAOCAQEAWvDhU3Tk+cCZoThs2I2HLChX7cEjsjz9
-3ZHdWbsgJzPS0xVAdoR1FraNf6PYUvZxbDhsoO2UEZS5IUyOxdWWuP2jaqUpVxY/
-1fSTQQbvOujO+fZzNhJ8nIy/4FgFDWWqABHbVTfGVzImcxC1AJoQ8jkU9Dio5dIl
-uKQCDz8fu1hbkQZ/NP53cNDkTV0t/bvRtEHGrOJYc1rEFRuTLSkPvItsGffWHhIC
-mCrhgP7LeIv2iiNK7qgbhaFRHXAs/JMXAc/Y4YD1renUQCA4cLPF679N4oixMvxD
-Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>crowd.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crowd.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANmt8Ciw6kb/MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2Nyb3dkLm5vcmR1Lm5ldDAeFw0xMDA1MzExMTI4MzVaFw0yMDA1MjgxMTI4
-MzVaMBoxGDAWBgNVBAMTD2Nyb3dkLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAPX2dT9VdcfFwxu7VA00KB7MmJj43/ReptLZNF1qEIEY
-LurgE63gRpalC1RLNx40V0a692ae9vlUJwr5SSuPE///KcIGe7MqKYqxMNR0EVUM
-gkLl/Iws6X6IKPXZFg/WeE/C/cmU6OzaTwdPBmg360Ys9veUOnt/3/ddRhSGRlr/
-QhrFJwZpeRQG/G7f8wIrvVT6HvsY1QOjW6YV43fon8eMBFz1WV7dAAx4L5d1JXX3
-EH+vY6a1nRj98qZPXZ7MY4HBMS8uU/B2/zTN+N9DFBpbwHYWvZQynIviGrUlgGi6
-bDMJH2k+sTGgy9EGZcaAqb2AECMidmXJk3/nOsX5cFECAwEAAaM9MDswGgYDVR0R
-BBMwEYIPY3Jvd2Qubm9yZHUubmV0MB0GA1UdDgQWBBTvR6U7d9zdmqbIl+g3SLa9
-8CChvzANBgkqhkiG9w0BAQUFAAOCAQEAWvDhU3Tk+cCZoThs2I2HLChX7cEjsjz9
-3ZHdWbsgJzPS0xVAdoR1FraNf6PYUvZxbDhsoO2UEZS5IUyOxdWWuP2jaqUpVxY/
-1fSTQQbvOujO+fZzNhJ8nIy/4FgFDWWqABHbVTfGVzImcxC1AJoQ8jkU9Dio5dIl
-uKQCDz8fu1hbkQZ/NP53cNDkTV0t/bvRtEHGrOJYc1rEFRuTLSkPvItsGffWHhIC
-mCrhgP7LeIv2iiNK7qgbhaFRHXAs/JMXAc/Y4YD1renUQCA4cLPF679N4oixMvxD
-Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">NORDUnet Tools</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NORDUnet Tools (confluence, jira)</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet</md:Company>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/crowd.sunet.se-shibboleth.xml b/swamid-2.0/crowd.sunet.se-shibboleth.xml
deleted file mode 100644
index 73392372..00000000
--- a/swamid-2.0/crowd.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://crowd.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-08T16:03:16Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://crowd.sunet.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.sunet.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunets Crowd-inloggningstjänst</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet Crowd Identity Management</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Sunets Atlassian Crowd-tjänst som hjälper till med användarhantering för Sunets Jira och Confluence</mdui:Description>
-        <mdui:Description xml:lang="en">Sunet's Atlassian Crowd-service providing identity management for Sunet's Jira and Confluence</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/Crowd+Privacy+Policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/Crowd+Privacy+Policy</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="128" width="128">https://wiki.sunet.se/favicon-128-128.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="128" width="128">https://wiki.sunet.se/favicon-128-128.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>1b0d6163fdc2</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=1b0d6163fdc2</ds:X509SubjectName>
-          <ds:X509Certificate>MIID6zCCAlOgAwIBAgIJAMap5fIDYPdFMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDDFiMGQ2MTYzZmRjMjAeFw0xNzAyMDExMjQ2NDVaFw0yNzAxMzAxMjQ2NDVa
-MBcxFTATBgNVBAMTDDFiMGQ2MTYzZmRjMjCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-ADCCAYoCggGBAMbW8tDeOxLRESCeqFfEPsBLpBxh19q13zD5QGZPxR1cUZuxJhUs
-9E6AZFtCtX+zu9d2C3GH7NPiRk939ADzLWO4MRtvtgZ9Qhre04VVlOLUM0OapCV6
-Bx1qKzlPk9Vc+Hq1zF2pVVUvOtzHuywdm0BkTI1l1za6PBCb58dHizP4alCr9UHT
-SpQEn2Ri0dVp6K0Nk9SyVsml7WsKcYAhMXJiTIKspnrV/iJU2mBA89jOa0yWl1Nl
-cDEAKAlfrCGn7MP9Rng+u2oN7Sh2iov9AU+Rszu4dDRuJkQNJDO4GAQ0mYSMyQvv
-BElVbNdeq6XTVBlFHdkhBjUuvnqae+dqjY4XGE9icTSASiv9EEad1H7Vmcy4EwLX
-EjlMVMnVfdTz+yi3jK8mOt0C3S9Gz3KjwaitgBKm7uju89FYFn7fG99L4hOeTQB1
-ga+Cii+dL7y0v+kkHAk8jpJALN5KEjj4AmT4IcNPp7uJPBFlNwkq0Zg5rMB161XV
-pfwPEXs8lEzZ1wIDAQABozowODAXBgNVHREEEDAOggwxYjBkNjE2M2ZkYzIwHQYD
-VR0OBBYEFGcYsbkt1uxRugUqMsX2dzGUZ5rOMA0GCSqGSIb3DQEBCwUAA4IBgQAQ
-lYqH1Wob2pDSASiUprmePnuvAGbUPEzwr/cXAJ/KP3xJzHs7LG1qDf8BVcne5n7Q
-meRD8ocFEz/UJWCJ2zp025G+Ch3Q6JMGSNMYzsQPYPLP7DjiTM7MXrg7u8+y/LJo
-uE6XTuAh0c5NEO3szKgMVIHYYVjoTV5GRN15qBk2zhnfEXPdRv4yvPgyLRVnxnVl
-jTZ/4gj8yiuqxfLqLWDNOOdgBtaJNsflR/vSKs5GbrjuFxnG0p3pFBSO2jfFpApy
-POMHGO5/++lxJI0O/UMUfTLbLAHRhStcSuc8jQCg40kBdqiK2+ns5oiSOQi02WeP
-SPx6+DfRbHqYyOt/XGR5Xlx7Cy+Umu76ZjhLYY1Q28Btv4uxlTfjsnPpPgpYnFc6
-arPPNl3iFqtn/BL+kFv4G5DAs+AcR+tw818VU+oC8JOLUKX6x9vt97mc0lmMe6XD
-og+StCZFRCgVG6Yoq6EYaJYK1DsUP+4hBlptoRNdLd4aYwdG52H3By9WhnAE8wQ=
-</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://crowd.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Sunet Crowd Identity
-Management</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Sunets Crowd-inloggningstjänst</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Sunet Security Contact</md:GivenName>
-    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/demo.beta.seamlessaccess.org-shibboleth.xml b/swamid-2.0/demo.beta.seamlessaccess.org-shibboleth.xml
deleted file mode 100644
index 65fc0f36..00000000
--- a/swamid-2.0/demo.beta.seamlessaccess.org-shibboleth.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://demo.beta.seamlessaccess.org/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-10T16:29:41Z">
-      <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"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/DS/seamless-access"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/DS/seamless-access" index="2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/DS/thiss.io"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/DS/thiss.io" index="3"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Demosite for seamlessaccess.org</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Demosite for seamlessaccess.org</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Demosite for seamlessaccess.org</mdui:Description>
-        <mdui:Description xml:lang="en">Demosite for seamlessaccess.org</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://demo.beta.seamlessaccess.org/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://demo.beta.seamlessaccess.org/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://demo.beta.seamlessaccess.org/?Privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://demo.beta.seamlessaccess.org/?Privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>sp-test.seamlessaccess.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp-test.seamlessaccess.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUUCVFQS6x7CAmxA2HjzhtWPGxOOswDQYJKoZIhvcNAQEL
-BQAwJTEjMCEGA1UEAxMac3AtdGVzdC5zZWFtbGVzc2FjY2Vzcy5vcmcwHhcNMjIw
-NTEwMTEwMDM1WhcNMzIwNTA3MTEwMDM1WjAlMSMwIQYDVQQDExpzcC10ZXN0LnNl
-YW1sZXNzYWNjZXNzLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-AOHpIOoSmq/gaofQILX+ZCKqM/s9rMh+DXdDvS0C/yNgq38b+6vaT8e+LsI7W4SS
-1uvSltUH8UXz3INrMo96hUTjgDjS6a8D+XI+qr+cFo9B4e43BBOD/EtqGf0hYnvt
-mbddnVjajOK6Vj/vaaMondFlU65//BsKTb3G7Z8czOZn45/N0xcUSKu2tSHBHoav
-B9Dvr4jlLqwt2ZnuiTsK/B/MBC37gTKiQRFz8VptjGE+LPs6oNwJ3L7R3vho90+W
-uHPSS4+Ur5YuMhoT9KGMVMOofz4pB8bms0YtyQGqYY3zGPsWunaMTj/uKIQvAmxE
-Q79VsiOw0D/vWoL59v3UV540GUahT02hZvsvzWhMSStVWVYhAS2e/NYMlTAqHiH7
-QnN7Sp2DCnARdCyihm8yk1QVg4apaQPo7a5To4YJzTuXmb3cn+t7yGDJKuqRybXr
-v815gBKbsMh6hPGPhUwN7MsUnz0EmBuW9gNJMCCAuhtR0UtAcuseaXzgczL/My9J
-wIxUxllXqTdzi3H+9av4Ejw9jR+xbvCNorTbYLyZCgYb7f2CtSbp0OeqwEzDqQ7h
-fLyr4ia1P31zev9ZQji+CmIrKBLhX7bwftEmJoGZoZnz2e04tBtsWOB7Kdz0E/lj
-hTe3I6v8IqopvY63GoDvWwrB7t3qfzNCTmvse2VU1I93AgMBAAGjSDBGMCUGA1Ud
-EQQeMByCGnNwLXRlc3Quc2VhbWxlc3NhY2Nlc3Mub3JnMB0GA1UdDgQWBBRs9ib4
-WTl39G7AaRY4NQvZxujnUTANBgkqhkiG9w0BAQsFAAOCAgEAWP+5qo2AeXtf2BXG
-5VASPhHi6e2JEH3yDfPXSBWpAluOn07+yz257yNw5um7lsTsIl+4TJF2qQGFrHCM
-/5hRg22ONP648wODatSbPYKP1H1dbnlL8yurw0XawzYakJdD5WrAICJ/Qy61DAXh
-0IT7F2Ez5UcmJbKW2ncWE9ZfZ//BYWKu+XOB3bVQJ5ReS+DBRJezLFZkVwQsHPzn
-Zanlfr+K+hadgGaHD+zyCl++Z4Ws9UHlhx1KaQnktPNtEMrdlHiPIGz7bYB/acRl
-tJytrxxRE1KslRxIeGMn04S+I5hUVVnQNC46Bemq8zOvZArcnCi451Ne1wNwUBTU
-qvxAEbw6mphuK460d+ZuxgTPNGlf2ggc38/F87saD5kR0f7HjuHjX9UNhxq1pLKm
-qvwSntNt7a2NjGZCOcWqKRoOKCm9N3nzf8xL/6vpqwCrb/Uv7VA1O6zwFK3SuQo7
-g8doBXjmrrrcMLv2an5xqUbAiW/d1hjLiBeAkQduMUi0IwJpIld4lRmD22diBlhI
-+Mmvi2kdA9ojDAI+mWYl83aPzcH1oMXdiicrakBY1JZc6BmQPlJKIePVsz68DS27
-OlwG6rVaUIQrpdPUUyNcyoUyr7+czGxGh8KJG6N5gdUQNZ5n1MsIM7gzdYDTPNQx
-JFTDgHzXENHIUNh2t/vaR6jVeBA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>sp-test.seamlessaccess.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp-test.seamlessaccess.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUKSZvgEx+OK/LC6D8JGU52DHTOjswDQYJKoZIhvcNAQEL
-BQAwJTEjMCEGA1UEAxMac3AtdGVzdC5zZWFtbGVzc2FjY2Vzcy5vcmcwHhcNMjIw
-NTEwMTEwMDM3WhcNMzIwNTA3MTEwMDM3WjAlMSMwIQYDVQQDExpzcC10ZXN0LnNl
-YW1sZXNzYWNjZXNzLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-ANwzL8rMbf2N37IbEtZv8RZ+JhhOvfrasE0vTVBPrM1lBVY1PUsVFNT3k0ZxI8Rj
-MVIH+PLBr8r9vyAhVZIdinVPKvROXgZg42qj910UePVxrYNRta7QeFj67v0+cHKa
-ZMbH4Ja37+u9lbWwsnF+uGi56Vo1aDn+2V53qiZwkw161/nEab6T/j00ElrjFC9d
-KcPltZ5WGs7e1Nk9tONjXGAPaSIFuVOyAWWX/daFjBRZgDqCPCO5OTqyJgdE7rbO
-At7g8K3Pcas+bhkTUnSEmevCDTgVsKCMQ4mTavWvJaACnLjsPLYramoeF1cGTa2B
-QJ+NXsa/FGwkJ4/fzaPbCdPaXgQw3qEyImPm10+p/a7AXSvQcDEMQfDVq9hQvZur
-0UNUoeTpyXttYDLpyAstvQ2/OLz6o9rkSnlvL6KzsRWpT8gKuEIV2ZKKErrRJ52H
-hVFF+CFIRZqkKTlfSdRD0xd60RCWnNxU0q2Ewy0H6TR4Q496DmSMWBd3qYS4RHOK
-Q7WVVsH5VimgQh4skWQ/6TMau1niWoiNH+TI9eebvoj60er8C/8mvd9KvUWiWJL1
-EZxcq5S+8ny0TZo5mIrjnP44SrGOyLJ7y4aq0unIRrr0K5D7aBz3Xv97HXTwkeXp
-QjxKvOjfZ7iWEC5kkOFt0nNOf6nrckv3v0whN9eSS56jAgMBAAGjSDBGMCUGA1Ud
-EQQeMByCGnNwLXRlc3Quc2VhbWxlc3NhY2Nlc3Mub3JnMB0GA1UdDgQWBBQN7mjh
-R1B/zhzZAZT+OCrkQi11czANBgkqhkiG9w0BAQsFAAOCAgEAILVcrHTgjKFru17X
-NqSeKGS97s6W0gFS/VrK1Il44S6abCsjWA6eUkTL3pc9QCeW1eVLCroGGhfpXxhF
-5unbm7msBJYtv/ugqLByJQRXp0N23aHpdvyucBGG5kD1XXPklkxJPyJxzMRXD7f+
-v0vybwz9mLR+HD5iRJoLrtdhhdS+OU9FKjgMaXHm+B9+rccZhwGmkwzI9rMdsdgO
-TjA7OXuN4Xiwxuli7sHlDkHLnuEkFvXb0qHAfyfa7H8Yu37/F564IWYDpzkIl7Ry
-LEm0ySLXD2H+ZKXv/Y0NxUV2PWbWv0//MH7rEjYgEsHsowr6IS3t8RhGybqbcA6A
-kQuEmzD7E2u/UgGx8GSIfXvjqR2G/ZNftbr4WSPgcARqYA9KZSvP6C/7yqMxL0d2
-l4wygfcHsTreVqyhlo+gxUMdX+xoPpvMxN1szha1owio9rJhQ7SjVkpyHgXq48yT
-Xqbm1xpoRZrdrfS2X96ESx5PHyNL97H/KUeIiJYcBlE5WYbTL0+iWo5ekDSt1J5z
-/3u1zxA127ttiVLoVyzIfZO7nIltujocDNFyYqjOhptmDCARrZIeGd/kalayu4Ow
-r8159vXCfYmNGBorfzZSG7tLoI8qlbDc1Feb2DHJrgSvCi8MYlwnssUitVHN9W/4
-bNqCPb5DTMATGYE2i3ASOHVdqfo=
-</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://demo.beta.seamlessaccess.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SeamlessAccess.org</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SeamlessAccess.org</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">SeamlessAccess.org</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SeamlessAccess.org</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://seamlessaccess.org/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://seamlessaccess.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/demo.seamlessaccess.org-shibboleth.xml b/swamid-2.0/demo.seamlessaccess.org-shibboleth.xml
deleted file mode 100644
index 3402c5a0..00000000
--- a/swamid-2.0/demo.seamlessaccess.org-shibboleth.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://demo.seamlessaccess.org/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-10T16:29:41Z">
-      <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"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.seamlessaccess.org/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.seamlessaccess.org/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.seamlessaccess.org/Shibboleth.sso/DS/seamless-access"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.seamlessaccess.org/Shibboleth.sso/DS/seamless-access" index="2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.seamlessaccess.org/Shibboleth.sso/DS/thiss.io"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.seamlessaccess.org/Shibboleth.sso/DS/thiss.io" index="3"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Demosite for seamlessaccess.org</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Demosite for seamlessaccess.org</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Demosite for seamlessaccess.org</mdui:Description>
-        <mdui:Description xml:lang="en">Demosite for seamlessaccess.org</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://demo.seamlessaccess.org/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://demo.seamlessaccess.org/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://demo.seamlessaccess.org/?Privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://demo.seamlessaccess.org/?Privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>sp-test.seamlessaccess.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp-test.seamlessaccess.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUUCVFQS6x7CAmxA2HjzhtWPGxOOswDQYJKoZIhvcNAQEL
-BQAwJTEjMCEGA1UEAxMac3AtdGVzdC5zZWFtbGVzc2FjY2Vzcy5vcmcwHhcNMjIw
-NTEwMTEwMDM1WhcNMzIwNTA3MTEwMDM1WjAlMSMwIQYDVQQDExpzcC10ZXN0LnNl
-YW1sZXNzYWNjZXNzLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-AOHpIOoSmq/gaofQILX+ZCKqM/s9rMh+DXdDvS0C/yNgq38b+6vaT8e+LsI7W4SS
-1uvSltUH8UXz3INrMo96hUTjgDjS6a8D+XI+qr+cFo9B4e43BBOD/EtqGf0hYnvt
-mbddnVjajOK6Vj/vaaMondFlU65//BsKTb3G7Z8czOZn45/N0xcUSKu2tSHBHoav
-B9Dvr4jlLqwt2ZnuiTsK/B/MBC37gTKiQRFz8VptjGE+LPs6oNwJ3L7R3vho90+W
-uHPSS4+Ur5YuMhoT9KGMVMOofz4pB8bms0YtyQGqYY3zGPsWunaMTj/uKIQvAmxE
-Q79VsiOw0D/vWoL59v3UV540GUahT02hZvsvzWhMSStVWVYhAS2e/NYMlTAqHiH7
-QnN7Sp2DCnARdCyihm8yk1QVg4apaQPo7a5To4YJzTuXmb3cn+t7yGDJKuqRybXr
-v815gBKbsMh6hPGPhUwN7MsUnz0EmBuW9gNJMCCAuhtR0UtAcuseaXzgczL/My9J
-wIxUxllXqTdzi3H+9av4Ejw9jR+xbvCNorTbYLyZCgYb7f2CtSbp0OeqwEzDqQ7h
-fLyr4ia1P31zev9ZQji+CmIrKBLhX7bwftEmJoGZoZnz2e04tBtsWOB7Kdz0E/lj
-hTe3I6v8IqopvY63GoDvWwrB7t3qfzNCTmvse2VU1I93AgMBAAGjSDBGMCUGA1Ud
-EQQeMByCGnNwLXRlc3Quc2VhbWxlc3NhY2Nlc3Mub3JnMB0GA1UdDgQWBBRs9ib4
-WTl39G7AaRY4NQvZxujnUTANBgkqhkiG9w0BAQsFAAOCAgEAWP+5qo2AeXtf2BXG
-5VASPhHi6e2JEH3yDfPXSBWpAluOn07+yz257yNw5um7lsTsIl+4TJF2qQGFrHCM
-/5hRg22ONP648wODatSbPYKP1H1dbnlL8yurw0XawzYakJdD5WrAICJ/Qy61DAXh
-0IT7F2Ez5UcmJbKW2ncWE9ZfZ//BYWKu+XOB3bVQJ5ReS+DBRJezLFZkVwQsHPzn
-Zanlfr+K+hadgGaHD+zyCl++Z4Ws9UHlhx1KaQnktPNtEMrdlHiPIGz7bYB/acRl
-tJytrxxRE1KslRxIeGMn04S+I5hUVVnQNC46Bemq8zOvZArcnCi451Ne1wNwUBTU
-qvxAEbw6mphuK460d+ZuxgTPNGlf2ggc38/F87saD5kR0f7HjuHjX9UNhxq1pLKm
-qvwSntNt7a2NjGZCOcWqKRoOKCm9N3nzf8xL/6vpqwCrb/Uv7VA1O6zwFK3SuQo7
-g8doBXjmrrrcMLv2an5xqUbAiW/d1hjLiBeAkQduMUi0IwJpIld4lRmD22diBlhI
-+Mmvi2kdA9ojDAI+mWYl83aPzcH1oMXdiicrakBY1JZc6BmQPlJKIePVsz68DS27
-OlwG6rVaUIQrpdPUUyNcyoUyr7+czGxGh8KJG6N5gdUQNZ5n1MsIM7gzdYDTPNQx
-JFTDgHzXENHIUNh2t/vaR6jVeBA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>sp-test.seamlessaccess.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp-test.seamlessaccess.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUKSZvgEx+OK/LC6D8JGU52DHTOjswDQYJKoZIhvcNAQEL
-BQAwJTEjMCEGA1UEAxMac3AtdGVzdC5zZWFtbGVzc2FjY2Vzcy5vcmcwHhcNMjIw
-NTEwMTEwMDM3WhcNMzIwNTA3MTEwMDM3WjAlMSMwIQYDVQQDExpzcC10ZXN0LnNl
-YW1sZXNzYWNjZXNzLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-ANwzL8rMbf2N37IbEtZv8RZ+JhhOvfrasE0vTVBPrM1lBVY1PUsVFNT3k0ZxI8Rj
-MVIH+PLBr8r9vyAhVZIdinVPKvROXgZg42qj910UePVxrYNRta7QeFj67v0+cHKa
-ZMbH4Ja37+u9lbWwsnF+uGi56Vo1aDn+2V53qiZwkw161/nEab6T/j00ElrjFC9d
-KcPltZ5WGs7e1Nk9tONjXGAPaSIFuVOyAWWX/daFjBRZgDqCPCO5OTqyJgdE7rbO
-At7g8K3Pcas+bhkTUnSEmevCDTgVsKCMQ4mTavWvJaACnLjsPLYramoeF1cGTa2B
-QJ+NXsa/FGwkJ4/fzaPbCdPaXgQw3qEyImPm10+p/a7AXSvQcDEMQfDVq9hQvZur
-0UNUoeTpyXttYDLpyAstvQ2/OLz6o9rkSnlvL6KzsRWpT8gKuEIV2ZKKErrRJ52H
-hVFF+CFIRZqkKTlfSdRD0xd60RCWnNxU0q2Ewy0H6TR4Q496DmSMWBd3qYS4RHOK
-Q7WVVsH5VimgQh4skWQ/6TMau1niWoiNH+TI9eebvoj60er8C/8mvd9KvUWiWJL1
-EZxcq5S+8ny0TZo5mIrjnP44SrGOyLJ7y4aq0unIRrr0K5D7aBz3Xv97HXTwkeXp
-QjxKvOjfZ7iWEC5kkOFt0nNOf6nrckv3v0whN9eSS56jAgMBAAGjSDBGMCUGA1Ud
-EQQeMByCGnNwLXRlc3Quc2VhbWxlc3NhY2Nlc3Mub3JnMB0GA1UdDgQWBBQN7mjh
-R1B/zhzZAZT+OCrkQi11czANBgkqhkiG9w0BAQsFAAOCAgEAILVcrHTgjKFru17X
-NqSeKGS97s6W0gFS/VrK1Il44S6abCsjWA6eUkTL3pc9QCeW1eVLCroGGhfpXxhF
-5unbm7msBJYtv/ugqLByJQRXp0N23aHpdvyucBGG5kD1XXPklkxJPyJxzMRXD7f+
-v0vybwz9mLR+HD5iRJoLrtdhhdS+OU9FKjgMaXHm+B9+rccZhwGmkwzI9rMdsdgO
-TjA7OXuN4Xiwxuli7sHlDkHLnuEkFvXb0qHAfyfa7H8Yu37/F564IWYDpzkIl7Ry
-LEm0ySLXD2H+ZKXv/Y0NxUV2PWbWv0//MH7rEjYgEsHsowr6IS3t8RhGybqbcA6A
-kQuEmzD7E2u/UgGx8GSIfXvjqR2G/ZNftbr4WSPgcARqYA9KZSvP6C/7yqMxL0d2
-l4wygfcHsTreVqyhlo+gxUMdX+xoPpvMxN1szha1owio9rJhQ7SjVkpyHgXq48yT
-Xqbm1xpoRZrdrfS2X96ESx5PHyNL97H/KUeIiJYcBlE5WYbTL0+iWo5ekDSt1J5z
-/3u1zxA127ttiVLoVyzIfZO7nIltujocDNFyYqjOhptmDCARrZIeGd/kalayu4Ow
-r8159vXCfYmNGBorfzZSG7tLoI8qlbDc1Feb2DHJrgSvCi8MYlwnssUitVHN9W/4
-bNqCPb5DTMATGYE2i3ASOHVdqfo=
-</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://demo.seamlessaccess.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SeamlessAccess.org</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SeamlessAccess.org</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">SeamlessAccess.org</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SeamlessAccess.org</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://seamlessaccess.org/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://seamlessaccess.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml b/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
deleted file mode 100644
index 6a5bd8d6..00000000
--- a/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://dev-us.cloudmore.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-08T11:09:44Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="300" width="300">https://us.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://web.cloudmore.com/privacy/cloudmore-data-processing-terms</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev-us.cloudmore.com/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>cmpusfe01.cmp-us.cloudmore.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cmpusfe01.cmp-us.cloudmore.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEITCCAomgAwIBAgIJAKyL/KWR/DdqMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
-BAMTHmNtcHVzZmUwMS5jbXAtdXMuY2xvdWRtb3JlLm5ldDAeFw0xNzA0MDMxMTUy
-MzhaFw0yNzA0MDExMTUyMzhaMCkxJzAlBgNVBAMTHmNtcHVzZmUwMS5jbXAtdXMu
-Y2xvdWRtb3JlLm5ldDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALLz
-RYrrIiv11E8u5ivDKbk8CiAchunwwbzApbg9Gbf03qv+MlWI/TizbB4U78qmUQQo
-rBbrxhxHCG6zh7jmCGrKI525JC/Ggq8eLh5scsReS+h+3dP4OLITYX255AxBXsnf
-puHztUqgmvJalxTqv3ZSj+sgL1Gg9miffZU9Qp+PJTDnvFqryyF5RdtYsM8hl1Hs
-gTgkqq1CfNwjAX+K3KPuaXeI13wX5O5XgLy3GL6AvNcjzR7OK6WRVMzusFV5GDkv
-HDmW1SKPOiwVpEajJFG9ALqYpRcVHWLFC9PbY35aElJppKwI+lOc9+gKoe72Pfzy
-NWktXwcCOQFrKTC+OkdocKD9qU0Ykb5a6jxSke/OqCDXZIDNMtcwkaNq2EVQHQ5l
-m5FSX+7aHkovpZ1EldKeN7bbAHR4vbAHu/TzItw2FTqxIIJ3Dhro+cDxHvt2PkVe
-lHi6FnRKEWD/eKuBa4HYi6wNyPJL5DuTWSa9b6EIHcEAEObx/cLCcO5JyrYCPwID
-AQABo0wwSjApBgNVHREEIjAggh5jbXB1c2ZlMDEuY21wLXVzLmNsb3VkbW9yZS5u
-ZXQwHQYDVR0OBBYEFCIqTffYDcKPd0MsT7uJPMPSdFXBMA0GCSqGSIb3DQEBCwUA
-A4IBgQA6x3KG35Lo6+WdDiHc6jItmA3NVtwEa7yP65+e58eDsFwkcZKMpriKT1j6
-oAQLCo9gm90iTMB6Bp3w49Ugff1ZWp8XQDkS5XATB8kuefdclzT8e0l7AZY3XHVP
-wAzc9xIx8fPDzX7EaQWdUKag+xhC3KarIM+fxIi2bpTl/dmqMlfZXnqYD7xwn/d5
-YL+WaojEcT+bAjwBENRveVJzE8F2zP9XWoac+Kq5m+bpUk4mbdsiyopM+JyQbv0v
-LbdC4ymC3I3g7UWdnrOVIxvAmpZSvfcrltBcq3YUYbNUqN0JBi3yp+vM3YC/Wy5z
-1u9OtZv4XRHYhc4MWrHdpQQ9XmM2fP2Z3IUDD6wrt/oD0bsyZikfS+vQyeWKxVpR
-mNH2YgIOVvKd7FdBOG/Azmal9DDVIRBVT71v/UOR3iQKLemFIKbYeLAlDE3bruDF
-pyWYJhS1xRUZKLOk/yUKNAXBGehk9HjEibygik5sJkYKQ4lVNXyXq06saSeR/Sf0
-LAkq68U=
-</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://dev-us.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Cloudmore</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/dev.cloudmore.com-shibboleth.xml b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
deleted file mode 100644
index 5f73158c..00000000
--- a/swamid-2.0/dev.cloudmore.com-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://dev.cloudmore.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-09-14T09:45:38Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.cloudmore.com/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev.cloudmore.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="240" width="180">https://www.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://web.cloudmore.com/privacy/cloudmore-data-processing-terms</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>stoprvfe01.domain01.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=stoprvfe01.domain01.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAJOLmVdtpocoMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
-BAMTF3N0b3BydmZlMDEuZG9tYWluMDEubmV0MB4XDTE3MDkwNTE5MDYyN1oXDTI3
-MDkwMzE5MDYyN1owIjEgMB4GA1UEAxMXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQw
-ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4YLswQuTzT9JcYWFe8PFZ
-oR/liIkoELde+7fJquGIUps2PflaSFcb8qf8LFik8OqB/WI3d1+ORN6S7TDrXbUN
-S+TNz4ngmc+qw3FQrHooleAgciPUpvA68g7qHGEjqqC4MggOWf31da7ICgpl+j8L
-rCdGWk0ea4rgH9KT9iercYdJfk41dS6VkwT2ARQVignuDMkqOV9BlR3fEyKFz7VL
-Kc+zYz0vtcSMIx85BffZ24oMbETeJkRCFUMqGkagsf/KKeTVRCbEnOosWYsac/Lj
-xQxFD+aKaKP5z6Wvd9EDKAa5egS5m556z58LUiUXT4QcRqc43OTcoI1OefeQT+B7
-0chHWZRXGzZWxNsDgbjUhBLcELh1H9ehc99TaNIXeIyYJgfZp2zXAsE8UGUqpL5p
-JI+OG/7au2kVipcQqbiMxYm+FhyLqzgRhNQrP4wXPee9Psyvy0ylIwveUY83uwBV
-EsAiyg6LD3KnYC4sZlr80GJ4l1Cp+4Q0101q6WeZRjMCAwEAAaNFMEMwIgYDVR0R
-BBswGYIXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQwHQYDVR0OBBYEFHzZ8nn/1Zj8
-kxrK0kLw3RlA/t9hMA0GCSqGSIb3DQEBCwUAA4IBgQCAOrmhhFLsfqYx6K+wKt7I
-HCqbsB0bhM8pccqWmUaUWP1WlRJOupIpOmP5FvIgvVtXsuEzUKd1voPF4DMfzaV6
-ACU6DxLf0lZ/3NrwM9ipVEE/zpXMHvBTn5802wcOIIm7hF+If83QM79ogex6b7gW
-oLhWfu1yz+2La4twB+6zkcz9THgkgSn0UtUNwd0HzyyHZ3SZuOMCGUIuyz+19c1n
-+KX6CjsXpMcJ4Oc1HsbtCKNkvEwNudxeiXWSWzj5MQHMcALE/ybOiQ/NMmj5SUzt
-oySXpA6JvX5PwGbuyuy1j4u6gwunYWXWzA0/bEyYADM47ZfNhzD+52b3sVaM1ROB
-TFv0Jq/k9XzQGKyrxphatYKLFZZ92DBDrtnwE3YsIXYc8qzWV7fDbSdvJe6eRBJV
-nnp6KW+OGs5W4irV/BM+AE0LMh7hb4xWfN1xO8Z2nrgAWHNJUkFw74FkEa94t9Y4
-KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
-</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://dev.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.cloudmore.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Cloudmore</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/devrb.lbic.lu.se.xml b/swamid-2.0/devrb.lbic.lu.se.xml
deleted file mode 100644
index bfbb8d2c..00000000
--- a/swamid-2.0/devrb.lbic.lu.se.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://devrb.lbic.lu.se/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-06-13T20:52:33Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">RB ansökan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">RB application</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Research Board ansökningsformulär utveckling</mdui:Description>
-        <mdui:Description xml:lang="en">Research Board Application Development</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEETCCAvmgAwIBAgIJAM1I9kTEg8XpMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYDVQQGEwJTRTEOMAwGA1UECAwFU2thbmUxDTALBgNVBAcMBEx1bmQxGjAYBgNVBAoMEUx1bmRzIHVuaXZlcnNpdGV0MQ0wCwYDVQQLDARMQklDMRkwFwYDVQQDDBBkZXZyYi5sYmljLmx1LnNlMSowKAYJKoZIhvcNAQkBFhtBbmRlcnMuTWFydGVuc3NvbkBtZWQubHUuc2UwHhcNMTYwNjAzMTA0NTEyWhcNMjYwNjAzMTA0NTEyWjCBnjELMAkGA1UEBhMCU0UxDjAMBgNVBAgMBVNrYW5lMQ0wCwYDVQQHDARMdW5kMRowGAYDVQQKDBFMdW5kcyB1bml2ZXJzaXRldDENMAsGA1UECwwETEJJQzEZMBcGA1UEAwwQZGV2cmIubGJpYy5sdS5zZTEqMCgGCSqGSIb3DQEJARYbQW5kZXJzLk1hcnRlbnNzb25AbWVkLmx1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn+G9y8ZuWBgU1xsfnT67wLDhIjIkZoxDFoG36BylX+CriBUoZl2U3hYhts9wjPtjBiErFLjTiYp5hRxY75P3z/tKT/dSmb+JgpPCJWOhiceKxObDqi1K0urWGONp5Rn+TrHONfjzIkr9ODvgFuzD2Qjxk0ZNDYalJwmZpvk2TLPdFJS1piZJAAgANjFfdD7NOqQ2XKXQ9ZiaA80wcqn9/US3quulpAJjnvzzK4q18Ris1G3irv9aPMG3FopzvkEDtKfkfp4IsICvqmJeyQJu7hfoU2bmXNkAOo7vumAR6lqobsAdG1hF7pxBHKa0pDEmFm2kKrz2quL13CYt+urwBQIDAQABo1AwTjAdBgNVHQ4EFgQUlNs94SJn1iGke9FpjMNg5y7GfxAwHwYDVR0jBBgwFoAUlNs94SJn1iGke9FpjMNg5y7GfxAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAbRb3X5Mh1cZscU5SRYv8ZXNscGrEW2erw2QJro4sBiIql7QvDfNZrhkbhsuIfwx/LsU8KCs2JSaOOdo6Vwwxy98y0DV6avGeFeHpMc0+BStynINspEIieGZnS1Hsxd41Z9IwAlUtHpilmwsjBljX7tIfY4I8aO3UWhajxU5oKZD4P2mRxnbnhh+OpX8/Pwm/gyWzdcZkGAz+1OGAcHZ+Algu0VI/L2+fKIy1wYZX1/ZENOwgbINyzzOxzEZOpuXQhctgJopfhH1qT72TZN5ZJSEmR/oMqMXBuElucH9t1GaKPnclUD3mcC+hotzajngUUBFsMv/EMlkw3HHDbSA3Xw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEETCCAvmgAwIBAgIJAM1I9kTEg8XpMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYDVQQGEwJTRTEOMAwGA1UECAwFU2thbmUxDTALBgNVBAcMBEx1bmQxGjAYBgNVBAoMEUx1bmRzIHVuaXZlcnNpdGV0MQ0wCwYDVQQLDARMQklDMRkwFwYDVQQDDBBkZXZyYi5sYmljLmx1LnNlMSowKAYJKoZIhvcNAQkBFhtBbmRlcnMuTWFydGVuc3NvbkBtZWQubHUuc2UwHhcNMTYwNjAzMTA0NTEyWhcNMjYwNjAzMTA0NTEyWjCBnjELMAkGA1UEBhMCU0UxDjAMBgNVBAgMBVNrYW5lMQ0wCwYDVQQHDARMdW5kMRowGAYDVQQKDBFMdW5kcyB1bml2ZXJzaXRldDENMAsGA1UECwwETEJJQzEZMBcGA1UEAwwQZGV2cmIubGJpYy5sdS5zZTEqMCgGCSqGSIb3DQEJARYbQW5kZXJzLk1hcnRlbnNzb25AbWVkLmx1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn+G9y8ZuWBgU1xsfnT67wLDhIjIkZoxDFoG36BylX+CriBUoZl2U3hYhts9wjPtjBiErFLjTiYp5hRxY75P3z/tKT/dSmb+JgpPCJWOhiceKxObDqi1K0urWGONp5Rn+TrHONfjzIkr9ODvgFuzD2Qjxk0ZNDYalJwmZpvk2TLPdFJS1piZJAAgANjFfdD7NOqQ2XKXQ9ZiaA80wcqn9/US3quulpAJjnvzzK4q18Ris1G3irv9aPMG3FopzvkEDtKfkfp4IsICvqmJeyQJu7hfoU2bmXNkAOo7vumAR6lqobsAdG1hF7pxBHKa0pDEmFm2kKrz2quL13CYt+urwBQIDAQABo1AwTjAdBgNVHQ4EFgQUlNs94SJn1iGke9FpjMNg5y7GfxAwHwYDVR0jBBgwFoAUlNs94SJn1iGke9FpjMNg5y7GfxAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAbRb3X5Mh1cZscU5SRYv8ZXNscGrEW2erw2QJro4sBiIql7QvDfNZrhkbhsuIfwx/LsU8KCs2JSaOOdo6Vwwxy98y0DV6avGeFeHpMc0+BStynINspEIieGZnS1Hsxd41Z9IwAlUtHpilmwsjBljX7tIfY4I8aO3UWhajxU5oKZD4P2mRxnbnhh+OpX8/Pwm/gyWzdcZkGAz+1OGAcHZ+Algu0VI/L2+fKIy1wYZX1/ZENOwgbINyzzOxzEZOpuXQhctgJopfhH1qT72TZN5ZJSEmR/oMqMXBuElucH9t1GaKPnclUD3mcC+hotzajngUUBFsMv/EMlkw3HHDbSA3Xw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml2-logout.php/devrb"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml2-acs.php/devrb" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml1-acs.php/devrb" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml2-acs.php/devrb" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml1-acs.php/devrb/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Anders</md:GivenName>
-    <md:SurName>Mårtensson</md:SurName>
-    <md:EmailAddress>mailto:Anders.Martensson@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml b/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
deleted file mode 100644
index 3fbd12f8..00000000
--- a/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://drive-idp-proxy.sunet.se/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-01-15T12:08:37Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <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-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <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-sha512"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://drive-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunet Drive Satosa GW</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet Drive Satosa GW</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Satosa GW för Sunet Drive</mdui:Description>
-        <mdui:Description xml:lang="en">Satosa GW to bridge SAML authentication for Sunet Drive</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/molnbaserade-tjanster/sunet-drive</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/molnbaserade-tjanster/sunet-drive</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.sunet.se/services/molnbaserade-tjanster/sunet-drive</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sunet.se/services/molnbaserade-tjanster/sunet-drive</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUfpoD91rElYtM1W4oRpuiB0FHe2UwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjEwMTExMTQ0MDUzWhcN
-MzEwMTA5MTQ0MDUzWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL0CU4D+mQDn25wJuGY7ivDkAcAdO/JK
-aF3e4stMkiFM+gazkFVEm7JN55GOFHUQpUoBnVR9CErGjR60LoVGCCKw0hncdBV5
-BkHa3sg/klLn6cEDuDwSygb5GCeYZcXfDbNzE1SOxAuMrdRvuLCrJNvEfqub/fMw
-f47Iasyxfv/ce+6XrieGR80UBmUqmAEIO4TAZLLAGm+I9/T14EMYu8QJ4I7R2hQ0
-yEAshgjCX3etRugT+bkecG/wdqyxqh3IsfCj6jS6dGn3UhxCmJoUueZX76o/6FD0
-qslz9T0Nfwp6Cz5RUzXOiDNgRfd2XmiebiY4PVdCg8TH+qU8zTQkxQe1BVPdDsqP
-v6m6CUv0fqj2V46K6GWPNx8Stboaz9hGqrTSUSWqV0J7kyEM8oHac3Op6AU6IO8d
-8rtPwocF1PYlxT+3oEZgTcFESwy4Qvp8ksBBhCWNNVNNowVmjIGWQ0ivW8YRkxAQ
-8+RF6nLq7Ku96zDXGWA4B2qsQbxENzysMz+vnQ5CG5Hdc4/1Npth1wVU9ccG8FWl
-6K04pDPuUjhNurYVriyUX9CGgCmTN9VVAskwMI56wx0ebVI4jhRyIDezV+IRtjiS
-FmKqRvuKG69r622CcfRCNNMnR2A7E3cgw4yinaCHeJbqXXjhuXPy+q9wtrcD6z+Y
-BFM+QGXvHMC9AgMBAAGjUzBRMB0GA1UdDgQWBBRXN2srAeP5dL7WAcdWNwZ/j8yZ
-pDAfBgNVHSMEGDAWgBRXN2srAeP5dL7WAcdWNwZ/j8yZpDAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQApiuWq2am1fQbX44fWNdHaJr6fCPAqOzcZ
-Xbfn3KU4yGxX3XihHpaJtlkOOp++5ouTJsBI4dTACUf6EvH4/xusLZ+ZYFBDzELT
-eT0t7zcQGb6/vqFM3750nVpmklEHS2hPmru61rZgXHwo+WS2nSPn4AKOIXSJcLCz
-x9aP1O/b3A+1Th7CwpIssCeFQyX4t7117h07DPdNjqzLcC1HG6kAjnPWMsLUjECQ
-boNEsfl7SRVJbBa/LVINSIVe52sCb8IV+2wmT4gGraIbxV/fU5W1mx0M+jjVyLlx
-n9ghH2Lniy+fhk8qvmtMv/7mdgP8tJvfMHZUmBLUSJ6Wubm7jrhKGFjOO4v/mUfH
-zuZHvAAzU/ScV6uzXXmELDY8yipyX23VWUcxCG/9EjqCf4bqAK/QNUfsjJvwxPJw
-AbPAqCK/McjQ/78KKabzwupa3A3IFGkkxMMzvMgAPRO2uyddFxcuVBHZvZTUfyJW
-nFazsTrNSZlEGo3j2eQJF+jcoe/dBg/fTJkDpehuCObZ6KOCGBIiYSu6wISlbti9
-22/anTiScRCuw21MqOxtut6H0mYADVO5Wuz2FZXT0lBhzX+ncH1scfhY7Cjti0Gm
-8b11Xs4wmMWoykY6DXt1F86FyBJ0mXPcN6KoMTQR30/ZwzWg+FM0wErMgU0KtVpN
-803vVnQUPw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUfpoD91rElYtM1W4oRpuiB0FHe2UwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjEwMTExMTQ0MDUzWhcN
-MzEwMTA5MTQ0MDUzWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL0CU4D+mQDn25wJuGY7ivDkAcAdO/JK
-aF3e4stMkiFM+gazkFVEm7JN55GOFHUQpUoBnVR9CErGjR60LoVGCCKw0hncdBV5
-BkHa3sg/klLn6cEDuDwSygb5GCeYZcXfDbNzE1SOxAuMrdRvuLCrJNvEfqub/fMw
-f47Iasyxfv/ce+6XrieGR80UBmUqmAEIO4TAZLLAGm+I9/T14EMYu8QJ4I7R2hQ0
-yEAshgjCX3etRugT+bkecG/wdqyxqh3IsfCj6jS6dGn3UhxCmJoUueZX76o/6FD0
-qslz9T0Nfwp6Cz5RUzXOiDNgRfd2XmiebiY4PVdCg8TH+qU8zTQkxQe1BVPdDsqP
-v6m6CUv0fqj2V46K6GWPNx8Stboaz9hGqrTSUSWqV0J7kyEM8oHac3Op6AU6IO8d
-8rtPwocF1PYlxT+3oEZgTcFESwy4Qvp8ksBBhCWNNVNNowVmjIGWQ0ivW8YRkxAQ
-8+RF6nLq7Ku96zDXGWA4B2qsQbxENzysMz+vnQ5CG5Hdc4/1Npth1wVU9ccG8FWl
-6K04pDPuUjhNurYVriyUX9CGgCmTN9VVAskwMI56wx0ebVI4jhRyIDezV+IRtjiS
-FmKqRvuKG69r622CcfRCNNMnR2A7E3cgw4yinaCHeJbqXXjhuXPy+q9wtrcD6z+Y
-BFM+QGXvHMC9AgMBAAGjUzBRMB0GA1UdDgQWBBRXN2srAeP5dL7WAcdWNwZ/j8yZ
-pDAfBgNVHSMEGDAWgBRXN2srAeP5dL7WAcdWNwZ/j8yZpDAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQApiuWq2am1fQbX44fWNdHaJr6fCPAqOzcZ
-Xbfn3KU4yGxX3XihHpaJtlkOOp++5ouTJsBI4dTACUf6EvH4/xusLZ+ZYFBDzELT
-eT0t7zcQGb6/vqFM3750nVpmklEHS2hPmru61rZgXHwo+WS2nSPn4AKOIXSJcLCz
-x9aP1O/b3A+1Th7CwpIssCeFQyX4t7117h07DPdNjqzLcC1HG6kAjnPWMsLUjECQ
-boNEsfl7SRVJbBa/LVINSIVe52sCb8IV+2wmT4gGraIbxV/fU5W1mx0M+jjVyLlx
-n9ghH2Lniy+fhk8qvmtMv/7mdgP8tJvfMHZUmBLUSJ6Wubm7jrhKGFjOO4v/mUfH
-zuZHvAAzU/ScV6uzXXmELDY8yipyX23VWUcxCG/9EjqCf4bqAK/QNUfsjJvwxPJw
-AbPAqCK/McjQ/78KKabzwupa3A3IFGkkxMMzvMgAPRO2uyddFxcuVBHZvZTUfyJW
-nFazsTrNSZlEGo3j2eQJF+jcoe/dBg/fTJkDpehuCObZ6KOCGBIiYSu6wISlbti9
-22/anTiScRCuw21MqOxtut6H0mYADVO5Wuz2FZXT0lBhzX+ncH1scfhY7Cjti0Gm
-8b11Xs4wmMWoykY6DXt1F86FyBJ0mXPcN6KoMTQR30/ZwzWg+FM0wErMgU0KtVpN
-803vVnQUPw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Richard Freitag</md:GivenName>
-    <md:EmailAddress>mailto:freitag@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jonas Hagström</md:GivenName>
-    <md:EmailAddress>mailto:jonas@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SUNET CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/edusign.sunet.se-shibboleth.xml b/swamid-2.0/edusign.sunet.se-shibboleth.xml
deleted file mode 100644
index d51c90e8..00000000
--- a/swamid-2.0/edusign.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://edusign.sunet.se/shibboleth">
-  <md:Extensions>
-    <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"/>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-04-29T17:51:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edusign.sunet.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edusign.sunet.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SUNET eduSIGN Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SUNET eduSIGN Service makes it easy to electronically sign documents</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">SUNET eduSIGN - tjänst för e-signaturer</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SUNET eduSIGN gör det enkelt att arbeta med e-signaturer</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/eduSign+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/eduSign+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>edusign.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=edusign.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEAjCCAmqgAwIBAgIUN8YgaACgKdJIfG5ZniLAZK/3WwMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAxMQZWR1c2lnbi5zdW5ldC5zZTAeFw0yMDA0MjkxNDEyNDNa
-Fw0zMDA0MjcxNDEyNDNaMBsxGTAXBgNVBAMTEGVkdXNpZ24uc3VuZXQuc2UwggGi
-MA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDKbiClJfmnt5Cc8OhoKZ4MzQHX
-7+MS1g7JtDGw1ttkWwGtbn4I80TNuiu9S3FUln3cA1/GgilzYXAPT+TOgxPXHmeC
-8PNnuj4yc4rJYEhR61BTpP2sEEju4DcXFGvUy8Kd89VUEJ9siIvUMdzK/jOox/p9
-SB7NW8nGsfZsmirWH4N2Emh/gx1co1IJQX6/ZVGRzskQvj9sVIOxCGDQKzyAHbHi
-D8YXxlEWbSX7+fak8+dB5AY4CzMtyySr991pQW9wDmfweOq7lWNEdLj9gfPY4c29
-y+77gk/RB5wpmdfcITI+pOHxwvylYhOhl02VJBFs884dRb2n4PvzeBjvdhMiolVu
-g6S2n3iXy4wZmG6y7c86WJA7rQdBUKzTaLjcGdJ62K0+mi8Q50nkCgtnGyz6w99l
-OnJpU/3Vf9H96xsablpPVoh1POo1g8lgSWxf/DqNVJvVRF7EismQp/oVOLYvb3LE
-Sudb3ZXFXzjKA1YSBIVD8wfOxrvuUGxa7/qxHX8CAwEAAaM+MDwwGwYDVR0RBBQw
-EoIQZWR1c2lnbi5zdW5ldC5zZTAdBgNVHQ4EFgQUu3z8fJer1M/P5NuYK163YkEP
-ysswDQYJKoZIhvcNAQELBQADggGBAHRH2ratIcyX8c2ZjL+6ChYPkmhD1wSiXOWj
-GOMB8SXqnZx/srsqsGnzJllyv3hv+lIyAwKdzH770w9s7CD4nKnycSpCsEUh/Cwm
-Zr20pP7oXRJuk7YlFVIx3mfQ0YERsGA8O6VrFuDOnHVsmHZUpEKSW2nVQcXjMT9E
-UzgChgJiR7eBnBxzMvZW44AdSSVuFeLACV7K98MztJHCyPdYdhQGMpc12rZQzZnx
-ZXG+mRzFsn/MG2hAVqGxpMOseJu1A7tG88rDrrJ81+7gljQGiqoKo7KTfI7zVuB3
-ofmGAkPZhwPTCVfav+lzx2qiHWeTCJSa554MLguc10zXiwqGicZ2cWVn/ObWRtEJ
-3IRvnkYciEFPHSR14TXwuaCkUD34c2lutnfOYM65XfNo5jbj/4JtUHhN8ISyp/sy
-OgE98IGafmnnEjVe5o5q3bQRB13pjWwSTeXFII8/0FkApV1IENNvNiRyiMAj9VZ4
-q6i3w8KKR5Zi4g5QHRTk1QFroyidLA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>edusign.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=edusign.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEAjCCAmqgAwIBAgIUN8YgaACgKdJIfG5ZniLAZK/3WwMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAxMQZWR1c2lnbi5zdW5ldC5zZTAeFw0yMDA0MjkxNDEyNDNa
-Fw0zMDA0MjcxNDEyNDNaMBsxGTAXBgNVBAMTEGVkdXNpZ24uc3VuZXQuc2UwggGi
-MA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDKbiClJfmnt5Cc8OhoKZ4MzQHX
-7+MS1g7JtDGw1ttkWwGtbn4I80TNuiu9S3FUln3cA1/GgilzYXAPT+TOgxPXHmeC
-8PNnuj4yc4rJYEhR61BTpP2sEEju4DcXFGvUy8Kd89VUEJ9siIvUMdzK/jOox/p9
-SB7NW8nGsfZsmirWH4N2Emh/gx1co1IJQX6/ZVGRzskQvj9sVIOxCGDQKzyAHbHi
-D8YXxlEWbSX7+fak8+dB5AY4CzMtyySr991pQW9wDmfweOq7lWNEdLj9gfPY4c29
-y+77gk/RB5wpmdfcITI+pOHxwvylYhOhl02VJBFs884dRb2n4PvzeBjvdhMiolVu
-g6S2n3iXy4wZmG6y7c86WJA7rQdBUKzTaLjcGdJ62K0+mi8Q50nkCgtnGyz6w99l
-OnJpU/3Vf9H96xsablpPVoh1POo1g8lgSWxf/DqNVJvVRF7EismQp/oVOLYvb3LE
-Sudb3ZXFXzjKA1YSBIVD8wfOxrvuUGxa7/qxHX8CAwEAAaM+MDwwGwYDVR0RBBQw
-EoIQZWR1c2lnbi5zdW5ldC5zZTAdBgNVHQ4EFgQUu3z8fJer1M/P5NuYK163YkEP
-ysswDQYJKoZIhvcNAQELBQADggGBAHRH2ratIcyX8c2ZjL+6ChYPkmhD1wSiXOWj
-GOMB8SXqnZx/srsqsGnzJllyv3hv+lIyAwKdzH770w9s7CD4nKnycSpCsEUh/Cwm
-Zr20pP7oXRJuk7YlFVIx3mfQ0YERsGA8O6VrFuDOnHVsmHZUpEKSW2nVQcXjMT9E
-UzgChgJiR7eBnBxzMvZW44AdSSVuFeLACV7K98MztJHCyPdYdhQGMpc12rZQzZnx
-ZXG+mRzFsn/MG2hAVqGxpMOseJu1A7tG88rDrrJ81+7gljQGiqoKo7KTfI7zVuB3
-ofmGAkPZhwPTCVfav+lzx2qiHWeTCJSa554MLguc10zXiwqGicZ2cWVn/ObWRtEJ
-3IRvnkYciEFPHSR14TXwuaCkUD34c2lutnfOYM65XfNo5jbj/4JtUHhN8ISyp/sy
-OgE98IGafmnnEjVe5o5q3bQRB13pjWwSTeXFII8/0FkApV1IENNvNiRyiMAj9VZ4
-q6i3w8KKR5Zi4g5QHRTk1QFroyidLA==
-</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://edusign.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edusign.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edusign.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edusign.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edusign.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edusign.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edusign.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edusign.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">SUNET eduSIGN Service</md:ServiceName>
-      <md:ServiceName xml:lang="sv">SUNET eduSIGN - tjänst för e-signaturer</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90-20 59 100</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 20 78 60</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SUNET CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/errorurl-sp-demo.swamid.se-shibboleth.xml b/swamid-2.0/errorurl-sp-demo.swamid.se-shibboleth.xml
deleted file mode 100644
index 91c2c238..00000000
--- a/swamid-2.0/errorurl-sp-demo.swamid.se-shibboleth.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://errorurl-sp-demo.swamid.se/shibboleth">
-  <md:Extensions>
-    <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"/>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-06-09T16:53:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/DS/swamid-test"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/DS/seamless-access"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">An errorURL demo site for the REFEDS errorurl group</mdui:Description>
-        <mdui:Description xml:lang="sv">An errorURL demo site for the REFEDS errorurl group</mdui:Description>
-        <mdui:DisplayName xml:lang="en">ErrorURL demo site</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">ErrorURL demo site</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://errorurl-sp-demo.swamid.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://errorurl-sp-demo.swamid.se/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/ErrorURL+demo+site+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/ErrorURL+demo+site+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>error.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=error.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/zCCAuegAwIBAgIUFKVolPsx/hdahBaWIPDs9TKqOVYwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAxMPZXJyb3Iuc3dhbWlkLnNlMB4XDTIyMDcwNTEyNDU1OFoX
-DTMyMDcwMjEyNDU1OFowGjEYMBYGA1UEAxMPZXJyb3Iuc3dhbWlkLnNlMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyiyIDOsQsZf57NaYmHYPsSuQOg0i
-iGm6vlXk5y+E99CKeMlasLFYz6lpU1mY3lDQV/DAyh0dq/8/v00Pzj5AfauliG7i
-a6ozWU12uhGWISrg8TAGzL4md30NsFzGKXGQOpMB/bzRKRE/rn2e5rVU1yMyX4ND
-8P9bnDfRJ40irKzHl2wRiJmIs5SLk0bAZFTVGjUHULlM5tj7fZUKhgcqPU5J6C19
-+TmZR0cn/YpwX3J5fFXIF4UlUQbxMcAWsyqC4iNO5iaRjVjf2055aUQ3xrjda65X
-qztXUxwgPC62H7XYZerLYg2rUWc1k7Tn9TjXzegSKTNz/eYNeXl0ilkic3b08LtT
-dIrXBnqPXMuQd9uqSIrUL8aOy0OU1jXE7cRskwSpRoMxkuqQOmP4AZx9wX0a2ICU
-7qIWmdsNqUTI6rl+lwu70ca03sI1QmLdnxFLppvmwRqsTbG7vMHLQo/oHB94hZ+D
-4nEYoXcSDN7orUv/EuUDTSwFWDoK4LiAt5EDWVcVCScc3TBGKAG/pnQd4oDX6sed
-6uH69Zw6/xXYfdc4cRif2BuBlI6NF+KRDp/Y8mMECusObuR8PBW4kt53ep/NFIld
-/44iOQqMibdgZVMaSOqCaJL+2C+5JZ/rCpqvVkrATgKxZCT8xdBLrbNmWbSido75
-mAFK38bjrDOlZZUCAwEAAaM9MDswGgYDVR0RBBMwEYIPZXJyb3Iuc3dhbWlkLnNl
-MB0GA1UdDgQWBBQUcuS2gpHGsU3swbMMXOsAbFMznjANBgkqhkiG9w0BAQsFAAOC
-AgEAg5HGOXvBmnBEmkiFQk2DgLoTyiNhVDtb64AlEn1pzcUsTinQeMgUO3ztpXpt
-ue9vUNtFw38FRsBPYtOkECEn3FE2W9RGreKpwTFXEAmiJgDn/PV8SsntdFvlGGtQ
-0BMp6RSsDeizTbpgIVEiYiWO9tydKUMBfqOvNhSohFhWQlqMjnmDtJOlqo2HHLav
-B4sfgXGcPwn9bEyvDZh0F83axbyPHEPV6Ab26gdcKPWFWa6cP8b8SXpqaMBz1hMt
-7SeAXvdIphcSog7mbWx6J7xcK0oDCBMQNd7Mpwho6EZcsDmRpi2lGWwJ1vPlfeaO
-swS7epQIdrzULmLt5NJiIKmszH2fX5ws7BamnJwGiSUWnXst7prbEYNMOetMnTPg
-51UzTOEiOmLOnKcNygdA1vc6zCP3TCz5RhFJ1r6IXYU0VujmnuHllWkshT8aGKna
-pSLBg8x2mt0ZVkucAZIjeeW/Fy1JcdQuPn1ycAhNVGFW39Tzypb1mr+FSCekNz/W
-lOGljjKHAILfGBQzz03Z/cugJbkxvAu0ID57ZcqQwFYfx2ZHyZCZ5Ml8TkXjQbkM
-DVYbComYA8cRvpRtjxXXV9NjApOfecvFkw3tgksNP3U5PeO6aNN2bxYpwe2c3CiK
-68MtiEVMSPWeT0Kuv70Xw+U1870VMFjmG805Bqx6YIa+fpM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>error.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=error.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/zCCAuegAwIBAgIUFjaHqGRITCUL4ENi6EbNLScdEr4wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAxMPZXJyb3Iuc3dhbWlkLnNlMB4XDTIyMDcwNTEyNDU1OVoX
-DTMyMDcwMjEyNDU1OVowGjEYMBYGA1UEAxMPZXJyb3Iuc3dhbWlkLnNlMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAucGkJuAIZXwQMB6Z5Okw2t00QeLH
-WNjznY3v0oEAggnhsj3My6djvhqoo1Vh80r4sbdBSeMrt13usfDauT3JkvD4s1q1
-dvoAot4Zot+dsEj57LCOcK8/azkRkBJBGhgqs8px94EgzXei6ySZaMBlvPHREQtW
-qpVDlKOM81T2deYUL8uTvRRAq5n7ROFmMadG+dz9s93IIVlElDf1cDeCiMSPau1a
-d4bieT1pmENElUTyhbGEj2IIBATdokPiqbJkZeDfU2bBkN2Wikp+/Y2YkNLaFDb2
-sxGj+cuFppQXlgny++BX2tCzm44kS9mRxrR7sfieb9/YK+eS5FYfieFULamvInNa
-z/6e5wBh6MneLg+cZkkeDkJ9xLOOzTmfcWSCDDi67PZXFwWhOJSrCd2MuSL3aZTK
-sk+AQLfd9K8TkFpY/03qq5af7r0lDqRT0FD7WDitAWMPqqlfESbX7d4/+iaAzeP2
-3DPJd8O3/ipreRRGJuBWw6FpS62mRyKPjg/w8u2iRHdDA6v4l/MxeneLysyHauTa
-fVQM0Po2wIwYWaQ86Y7ASkInNAzpH4uYpMzAlcmf9Bu7xCBXCPm/8LSkDqRpfJ4f
-ZIxBFcnC0BxpofJ/sKzqFP8Z1HMQZ5XKSXNUt0stu4JESVKvgOjm+0LVO2VOAmJB
-IMum5exL/luuXoUCAwEAAaM9MDswGgYDVR0RBBMwEYIPZXJyb3Iuc3dhbWlkLnNl
-MB0GA1UdDgQWBBSYZfdgyldg3ZSpA6oz3HNJwHNTPTANBgkqhkiG9w0BAQsFAAOC
-AgEAULR9QWwK9bX15JwVhN07lzs22KCHMGPUIwoWaWFc9Hgj9icotNv7J/HoSc0x
-73QY8rkDeLYrrwe3F/Y/p5NhY9ND28kiu3Pb5agKMIdlrL7r7D585yHNSF4zCk5h
-F1NxW0Ekkro3HucZMmhYiNBFcxitnyWCqug0xE83508aWvaN4IahXywCwmjmRFUK
-BH4Opd6Q68JskZortmOjXg5wJuu/XarZ2YJvpUIG1Kl0s5DKArLLZVzz0xjpMvor
-Y6Pca9FVeXUUweOZF8RO1jt9RmGS2NugXJA/fx6Zxsv2CqlwJgWfqJb08W+yv+zx
-h9eDUzGleptuR+liDhTRthBS/wuRsGIM6b+ej7+1swd6ioQKWNUeceQmsmaFoPnW
-cIY8r78egb7PLsRM4b0o2VSrULFU4q/L2CEMdVEH1OzojRyQCrafuIw8Wpj3K/RM
-z7CLgUzNsrJ2oVFJDJwioG9fcVpjYZyfgQRvpyVrIF6XWZ6skVOldNMtaQJlClf1
-vmx7r7oDZIu6YvgWDXuUtQVlgV72sD+jiWmaRdAmz9TPRVnYiKPhcAFOxIrjvlRV
-QNNfztGY9WigM2KO7U8li1ooCCp2nYYFp2AuijjSXh06EnosQy8UyndqYAVAkNtv
-IwCa2w+k4o3YNB5PX0O6FXjwmT1JLwXwNR/e/wGwnWn/xeA=
-</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://errorurl-sp-demo.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://errorurl-sp-demo.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SWAMID</md:Company>
-    <md:GivenName>SWAMID Operations</md:GivenName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SWAMID Operations</md:GivenName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SWAMID Operations</md:GivenName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/fds.idp.hhs.se-adfs-services-trust.xml b/swamid-2.0/fds.idp.hhs.se-adfs-services-trust.xml
deleted file mode 100644
index 2023c1d1..00000000
--- a/swamid-2.0/fds.idp.hhs.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fds.idp.hhs.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-23T16:46:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://fds.idp.hhs.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">DO NOT USE - Handelshögskolan i Stockholm [ADFS]</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DO NOT USE - Stockholm School of Economics [ADFS]</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">ADFS IdP för anställda och studenter vid Handelshögskolan i Stockholm</mdui:Description>
-        <mdui:Description xml:lang="en">ADFS IdP for faculty, staff and students at Stockholm School of Economics</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.hhs.se/sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.hhs.se</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="122" width="122">https://ex.hhs.se/SWAMID/SSElogo122x122.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="122" width="122">https://ex.hhs.se/SWAMID/SSElogo122x122.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">sse hhs stockholm+school+of+economics stockholm+school+of+economic handelshögskolan+i+stockholm handelshogskolan+i+stockholm handels handelshögskolan handelshogskolan stockholm</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">sse hhs stockholm+school+of+economics stockholm+school+of+economic handelshögskolan+i+stockholm handelshogskolan+i+stockholm handels handelshögskolan handelshogskolan stockholm</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ex.hhs.se/SWAMID/doc/PrivacyPolicyEN.htm</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ex.hhs.se/SWAMID/doc/PrivacyPolicySV.htm</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.10.48.0/24</mdui:IPHint>
-        <mdui:DomainHint>hhs.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.34161,18.05659</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIE3jCCAsagAwIBAgIQYAfQpwQSIrtGdBbgbu3ESjANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY
-    3J5cHRpb24gLSBmZHMuaWRwLmhocy5zZTAeFw0yMTEwMTgwODIwMDJaFw00MTEwMjMwODIwMDJaMCsxKTAnBgNVBA
-    MTIEFERlMgRW5jcnlwdGlvbiAtIGZkcy5pZHAuaGhzLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgE
-    Aw0SZ0W7h+9alqRR40/tYwLMKmOaTJjOp5SbVWXbgUYVcN/Rx7OGEwRPkS4l1eHk22djU/zpw1hJs11IQADJFzvB
-    DbwTbaeBbRc4UEFVs77BZA5QUR8B19BTYF1iFDjb+MD+i2PyZ3SN7S+I64l1vA7bxtHDwiW39+VaOX8T+xp0CKS+
-    E6iy/azZbsPTXBLN0+bIbEy9vgvuRvdJHjjWeDVZuqEKfGWq75Zd8/drOKjZ/s9k7VgAUVfw2QZiKiLtHPMvkvQl
-    8ggf9HrmQB3MdB2YoDlHkqHoM4G9xOzOfYyMxLibRmCTSYzwfA2c/bDu36i8mcawIi/McO5Zjo3D4gTyZ5DQ1FR6
-    OY8zyFhVBVtWtuaR0tN+66hEky+fNyXcpc17tbS7NrzEMDr1cJZQSZUFOXwNPVuOAKYGQtHdss41VEpvRHklVpsx
-    f1HTT8qoju278hK2qqlqoYSqoQDl8oF/UnQCH8pMOtQ2hPl2oAj5VwtE+raSNbMj9kytuTgcIhKU7y63JMWLiuii
-    Yk9QD8c1A8OdNqXG7tHyoZTIvzPibWT08plS1ZNirS8lqsvD2f6qXaSYjL6Mhp3G3pk6bk2oTNqpxwBkLXY1FiZY
-    HRBQ7HGM8B6pgrCjyyZLDbZHcUn9Wg/z952XsJ1hL17X7YENnTGz74RqSVsvqT1M0p/kCAwEAATANBgkqhkiG9w0
-    BAQsFAAOCAgEADu0NfkPxZi0hKd7WpuT3Mwht4KpTN6BXgf0ha5W9EWKrAEdXHAWLXVkwNw1483B7zUjiYODuZpv
-    P6fw/lrusEXLort1AuWuhXS4GVOhTTjVmGxuJsej92Lo4l7LcYGjlaBCLShBF1geLwe5xDl2563mqiE97SBj7iOn
-    IR5CVGxn/2vgAIIJR3//y3UN1WRFWD02bO3LycW6IvAnqpkbDidqAVRnpD2Ib+e3JIXD9zVLTBEx2Bvf12v9RMHI
-    YmHxsllYbWdx2hnW+HjyOkfI7QbG7lNihE8kqrt07J3dVDu1hEXCywiOwLVGCMnnL5wzGV6WL69KHzO8Geay6qxJ
-    Vc+1HIeiMYfEgjzGEu54NiJJvyIbqs5q9UA8C0BTqOFmLErwkAlSPSIxqSzHJscEFyIrdVtLZkbvRAFSGp09sU9t
-    I5dUpVHwBUl3fvNE+PiuaO2H60XwKzvISwSjt2h9CK2npcCOep5OI7vsC32a+OsMiBQbCu8FxL5FluWxLrC5GocH
-    vdHogcGgOLYPmLlno2TSwCpfCxL1F56qLJTNugJxF9cUS+Hsh8iieXDkUFh8zPH6kzgvvssO0iScoeeq7MQ81Ldj
-    HP1ZtoE1yL24P55tpE7NsVE/N/dlAPM/XarY5kAnh/xGweeg0QpaScgB8N/hKvhmEYuhZ8Yzo1aIuqMs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIE2DCCAsCgAwIBAgIQG1318bPbsbFNA09+qRfEazANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFN
-    pZ25pbmcgLSBmZHMuaWRwLmhocy5zZTAeFw0yMTEwMTgwODIwMjBaFw00MTEwMjMwODIwMjBaMCgxJjAkBgNVBAM
-    THUFERlMgU2lnbmluZyAtIGZkcy5pZHAuaGhzLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxgvl
-    IOJJqKNqOsJabZcgGfSWhGjknpGarIqZmyGpK8vRaY/teKJLZ++3JNimCMputvPR8QIK635eUczow4asOXsLv2yEl
-    ZhadeFdcaxd5J/0m/tw7n3JU6VhKoyMncG/O6HzRfY7cvTD/YtZR5RqzNQe6wnlBELTjgdBKoLYIiehmJVewSR7se
-    IQFwHhgcpC2AnrXaF+TcbQFuGzPS2e08LAjJRiiBfc6W0Cqp9C1r3pVJvBvbRT6GOA1nL53nckpQZeQakEpVvPwh3
-    x+/DkjsgnQ3+e7A44tFJgVWfRZmpgvhunTpLr+iuk/VjzYcRxKpNsGOSw/DJTfGgyTxsTBlocPzqHJf3oJhKZWa/m
-    I0Mwfp1eMAdKAv9L3A60p2fsYt1UVjB0c5G9z4wb4or/gAFtGFRyCIVkVxzfPiXhVeJJk+7e9mKhf9DXBN5beuYMGe
-    ZhfnE9BbBtMyUi3fZ6ZH65o83HZ1o5lEdnecpX5PwWZlx/CBwlHQIj1eGuezuE/J1i/2LCwfjdcsVU6fbwxD9Qu+ti
-    R12aPciFXM/DhyPby/E0tVvqtZZj0jhBaVWlx+RR8SzdiCWBb//MZdvwMZot79+X1usRk6niqsGAQYCYTAGXeRtlhQ
-    GqwhHtW+YwbH67GYtjUCxtdGTuIdXQzu4EDFKZBU+96/J/RuT9Uv0CAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAUym5
-    DXVFgYlyVofqs7jvxrHJtMftAp9pBlB39fN3EdS9aSUxltDsgBQxvmQuapIQTTHY3u2LfK2OU9BgUbzAYYjXsZZq15
-    g5KRsX/xHfANJ81cS7hDtSDpTPOtDh1/3XSkePIzGFRlx3gqje0vO91tP23orKfL4oG35cqKJnUCOUkzKtnrWXSIqv
-    n7LHrwri5/unBEboEgVt1GNWpQ+k+i+uAVvj+Hc/a4auARa3mn+sMgxNrzuBfoHl/YY0M0oREQuYTBFaokZezGn2nQ
-    vrN/q0F1lVyUxxRxBcv2HTujJ1AqJYvGp+LqrJaQOfn35VKQXsVgda/IH6Z9hL5wQNAZR8oQPSdfwN0r7W5aYHtxvA
-    EVGgVs3Oip2bft5NV96Vj+BjGzsmOxKZU6rAGPdKa/ZNi+9RhPY1kKU7yu5Ufn4sjJYiiNapD7+Jny6zjt6+jKnycq
-    onViJtmxJZKPsZ0ZnAlD4SPb8dvCJ79RF2p/6l/0tkx4uHziHBauOMSB90QFQWd3WVTyGOHA56C67dNFdepOBKXD0I
-    0TLZRnGXSnKtKjILVLtn1GxzlZG8nNHsZk27GLpuQZ8UKOl/Xur1hGsUoCM1AjmKP8hq382ZdcgBTlaMZdVeYVJ7Dj
-    fliBUJyrZCAGIWn5ELYZvDgzSXlGRQQ1kGVcTKArkN6XHV3/0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fds.idp.hhs.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fds.idp.hhs.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fds.idp.hhs.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fds.idp.hhs.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fds.idp.hhs.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Stockholm School of Economics</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm [ADFS]</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics [ADFS]</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.hhs.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:swamid.tech@hhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+4687369400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:swamid.support@hhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+4687369400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:swamid.admins@hhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+4687369417</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SSE Federation Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:its.security@hhs.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/federation.uniarts.se-adfs-services-trust.xml b/swamid-2.0/federation.uniarts.se-adfs-services-trust.xml
deleted file mode 100644
index 88dbcc4d..00000000
--- a/swamid-2.0/federation.uniarts.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://federation.uniarts.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-10-01T13:12:17Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/hide-from-discovery</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://federation.uniarts.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uniarts.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">student.uniarts.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Identity Provider for uniarts.se.</mdui:Description>
-        <mdui:Description xml:lang="sv">Identity Provider för uniarts.se.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Stockholm University of the Arts - TEST</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Stockholms konstnärliga högskola - TEST</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.uniarts.se/english/about-uniarts</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://uniarts.se/om-skh</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uniarts.se/ovriga-sidor/service-definition</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.uniarts.se/english/other-pages/service-definition</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="103" width="200">https://www.uniarts.se/storage/ma/ec61f94a5d5e4446ac2b69c2a3cccf5e/72755a4a08d242c3b9de8442e841a3e6/214-40-0-png.Png/27A4856A025F3910DD9E316B93B5211AC48C1686/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="103" width="200">https://www.uniarts.se/storage/ma/ec61f94a5d5e4446ac2b69c2a3cccf5e/72755a4a08d242c3b9de8442e841a3e6/214-40-0-png.Png/27A4856A025F3910DD9E316B93B5211AC48C1686/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC7DCCAdSgAwIBAgIQUGkTgukYU61N88S7/0Oo3jANBgkqhkiG9w0BAQsFADAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBmZWRlcmF0aW9uLnVuaWFydHMuc2UwHhcNMjEwOTAyMjM1MzMxWhcNMjIwOTAyMjM1MzMxWjAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBmZWRlcmF0aW9uLnVuaWFydHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+uGkFGLKSZVB0PdWw9EoQZ0ZsOCetFrumW9nHdD8wmzyUMDlRbBEPWduN1Qwtr+PNZixMKuVU/RauoUU4cOc50ATd7w0cStoiQIaVm8k+r6RdvdXXp8VyFX00V86ShNmayBobcwELKo/Tp9tuzVmiS9kjmtvKUGR4aVRTCyrRm/2o7Mzg7GXBBiXy/lccOnZiv4Ex90RDmPRGBOwToo5H0XRgAO41VFm3kjnQ/dVgtNRzjvSdTYGpbZchxN0RgaMCcoWg36/ca7102T4rmOimmsLf5QE3Iy7Ry9E1ERCMRV0D0/483Egswsh5X3IQUenySJGJE/fleip7YlIerg+xAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALdS2SQWqYkCKutZkjI8aYOv9FESyiKlcY+O4UfJnUoOmV2Ha49FbD5CBoNBB6CbBw4JsuyTarflQTR7+QQKgFpWmHhRUagVl6rzYMZeDxaANBfylEPboYf7jL4Ld19DzNjbvaKa75PUBBncMxutMAM26P/bCkHkdn3vYdAIbnOd3mKeLccZOntjAE0FCu8CO5Ga3Rib5QuyBvC5uwZSV/1ZuS6xV0wxd0e+w5+RUyLFU/WtM8P0GJxCzed9uQ2PjqADNzZQImIeTAWktz8tQJBbws6AbKtgR7ZD8mXDMFVBI1tr72edFSIHLRBGTQObKJq2sPmbulPofRr05S6EVT4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC5jCCAc6gAwIBAgIQNRa82AaMWq1AEZuHoDK/QzANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBmZWRlcmF0aW9uLnVuaWFydHMuc2UwHhcNMjEwOTAyMjM1MzMzWhcNMjIwOTAyMjM1MzMzWjAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBmZWRlcmF0aW9uLnVuaWFydHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk1GFfjvxhDKtrIH5P/4jIEtclGYEmJsC+uQ/1m0hLBItAOxL2S0DnjxAz3P39lpnLPrs3iUw0ECqXfrJk5nTC44LeiqOFY+xg7BO0/LxNuHsDeRoOdZd6dWqaMNLeJaiEA7c+/1dkJxe+Xw1JCiBUfBfTAe1qXoXtyhSl5CtVjmq44lAJereoxYHIfI7FySdCGkAYlHoIuswzKhgbSGDt9bB2qDsVOnASDh/ijqmsb7eLh2zN4eKoFQCikjuVOFp9/XURYM5oO9pzqSP0qvGy8WAyD/gdkz/m7g+3uJ13MGRxkaEQsioom9JNwolBhmJomwynQF0YdHHOzXnvnkDxAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMmwyOwBVZk5CCgfSs7hG6zPOMDBknem0A1PwhmeOP27HAMCBX9kiIVkyLu1tYqhqhnZW+/+bjbwGmTQnRPdwcgxztxeoJo6gIvmPKwF2M6juUJtyOj98t+GzEd8MAJReY0L8mMm2RO3XDwKyys3Bzr3AzjAmEdn/Qbp2cXwCABUF3x0IkfiRFcdbK9EchizUO5QS8FtrVWnsXlxcc4VNZjt/xwddV0u27IEBIXOV1PK4fR6rRld/O/aokTBaqHw6z4Wnpr0LKiyFxINGo9+IyWLTKxZkoEOWhh7Ozv+xOLVA39krasfvS1NS69FAJh3BJwkTmp1CulJ8ledY9uaCmQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federation.uniarts.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.uniarts.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.uniarts.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.uniarts.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.uniarts.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stockholm University of the Arts</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Stockholms konstnärliga högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm University of the Arts</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms konstnärliga högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uniarts.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uniarts.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sven-Erik Wilhelmsson</md:GivenName>
-    <md:SurName>Wilhelmsson</md:SurName>
-    <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ingrid</md:GivenName>
-    <md:SurName>Wallnäs</md:SurName>
-    <md:EmailAddress>mailto:ingrid.wallnas@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400220</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Zacharias</md:GivenName>
-    <md:SurName>Böhm</md:SurName>
-    <md:EmailAddress>mailto:zacharias.bohm@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400012</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
deleted file mode 100644
index f254ccfa..00000000
--- a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://flax.nettst.chalmers.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-17T12:29:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://flax.nettst.chalmers.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">nettst.chalmers.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">chalmers.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Chalmers test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Chalmers test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider for Chalmers (test)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Chalmers (test)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.chalmers.se/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.chalmers.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="81" width="625">https://www.chalmers.se/SiteCollectionImages/Logotyper/Chalmers%20logotyp/Chalmers_black.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="81" width="625">https://www.chalmers.se/SiteCollectionImages/Logotyper/Chalmers%20logotyp/Chalmers_black.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDxTCCAq2gAwIBAgIUd6HjHPm3c+w9WK7GshdZwbGl394wDQYJKoZIhvcNAQELBQAwcjELMAkGA1UEBhMCU1YxCjAIBgNVBAgMASAxFDASBgNVBAcMC0fDg8K2dGVib3JnMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMSAwHgYDVQQDDBdmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0yMDAyMDUxNDQyMDlaFw0zMDAyMDQxNDQyMDlaMHIxCzAJBgNVBAYTAlNWMQowCAYDVQQIDAEgMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzERMA8GA1UECgwIQ2hhbG1lcnMxDDAKBgNVBAsMA0lUQTEgMB4GA1UEAwwXZmxheC5uZXR0c3QuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxUIvhpYaSc7UfeV0XDRifE9U/oSh2UZKI5PHhoIq8hwFFkjmpI5dSKCHZDypl4gIkuPr8hXdaIxdvLGNL021+ilpdBCUn9mZl8BdKraCOGxjuqBuq2yNdg+Ao3SgJvp4HiAJAaqtzfU1HY9Qb+Ab80mCzeS/6RpepDcrOMw4TGBopoDc4QoxPz7/AY6Q/F9qgRuNVxXBKDrwiE8lR4GyQgak1mHp+w5GtSG4dMWncqHupgtazS5lAzOO11cRi+/x8ooiEnJvAzdbtjEKOfd/ENRkVLtYrb19cEduC3YBzAgNXx931X/U8g8scIb1mwwiou3v/FfW7kkPBAXGz2i7pAgMBAAGjUzBRMB0GA1UdDgQWBBTjAEdvtF865Ag04s8z/Xjq6AEuJzAfBgNVHSMEGDAWgBTjAEdvtF865Ag04s8z/Xjq6AEuJzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDrtyrlt4VtpVZfPBB6MU+3AkINCAaQUsa2UK7enkLAf7PLxikspijRqDEGT45uygajxXAviZeLorLHEE/4sz2XJCvpyDy2h9YXQMNZhCEnrETgvmIc4TRpBzSwb63eUVHbasgYHTKB/WH+VtBGj22SeeMJlykDp25lwfmbudRPMXHUd9O7HNRCbKmG2kK+EOmkotikdxkFDcJWpES8GH7Jcjt3gE920Oin+2K4ZMJkaI+7YjqokJgrVPbprMX25ldS7fAKmNFBwiW7tFnITwOLqsmcMiEKe/6gkK6/n1i6isAeiyFpojU1kMikvFretXEGxJsiS01NZEvqD+3Ze1F5            
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDxTCCAq2gAwIBAgIUd6HjHPm3c+w9WK7GshdZwbGl394wDQYJKoZIhvcNAQELBQAwcjELMAkGA1UEBhMCU1YxCjAIBgNVBAgMASAxFDASBgNVBAcMC0fDg8K2dGVib3JnMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMSAwHgYDVQQDDBdmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0yMDAyMDUxNDQyMDlaFw0zMDAyMDQxNDQyMDlaMHIxCzAJBgNVBAYTAlNWMQowCAYDVQQIDAEgMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzERMA8GA1UECgwIQ2hhbG1lcnMxDDAKBgNVBAsMA0lUQTEgMB4GA1UEAwwXZmxheC5uZXR0c3QuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxUIvhpYaSc7UfeV0XDRifE9U/oSh2UZKI5PHhoIq8hwFFkjmpI5dSKCHZDypl4gIkuPr8hXdaIxdvLGNL021+ilpdBCUn9mZl8BdKraCOGxjuqBuq2yNdg+Ao3SgJvp4HiAJAaqtzfU1HY9Qb+Ab80mCzeS/6RpepDcrOMw4TGBopoDc4QoxPz7/AY6Q/F9qgRuNVxXBKDrwiE8lR4GyQgak1mHp+w5GtSG4dMWncqHupgtazS5lAzOO11cRi+/x8ooiEnJvAzdbtjEKOfd/ENRkVLtYrb19cEduC3YBzAgNXx931X/U8g8scIb1mwwiou3v/FfW7kkPBAXGz2i7pAgMBAAGjUzBRMB0GA1UdDgQWBBTjAEdvtF865Ag04s8z/Xjq6AEuJzAfBgNVHSMEGDAWgBTjAEdvtF865Ag04s8z/Xjq6AEuJzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDrtyrlt4VtpVZfPBB6MU+3AkINCAaQUsa2UK7enkLAf7PLxikspijRqDEGT45uygajxXAviZeLorLHEE/4sz2XJCvpyDy2h9YXQMNZhCEnrETgvmIc4TRpBzSwb63eUVHbasgYHTKB/WH+VtBGj22SeeMJlykDp25lwfmbudRPMXHUd9O7HNRCbKmG2kK+EOmkotikdxkFDcJWpES8GH7Jcjt3gE920Oin+2K4ZMJkaI+7YjqokJgrVPbprMX25ldS7fAKmNFBwiW7tFnITwOLqsmcMiEKe/6gkK6/n1i6isAeiyFpojU1kMikvFretXEGxJsiS01NZEvqD+3Ze1F5
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://flax.nettst.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola Aktiebolag</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.chalmers.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.chalmers.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Chalmers</md:Company>
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Sandell</md:SurName>
-    <md:EmailAddress>mailto:biorn@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Chalmers</md:Company>
-    <md:GivenName>Niklas</md:GivenName>
-    <md:SurName>Rosenqvist</md:SurName>
-    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Chalmers</md:Company>
-    <md:GivenName>Servicedesk</md:GivenName>
-    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Chalmers</md:Company>
-    <md:GivenName>Chalmers Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@chalmers.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 31 772 8450</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/fs.bth.se-adfs-services-trust.xml b/swamid-2.0/fs.bth.se-adfs-services-trust.xml
deleted file mode 100644
index a8f8a730..00000000
--- a/swamid-2.0/fs.bth.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.bth.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-02-24T15:21:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://fs.bth.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="200" width="200">https://www.bth.se/wp-content/uploads/2022/01/logo_bth.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="200" width="200">https://www.bth.se/wp-content/uploads/2022/01/logo_bth.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.bth.se/eng/about-bth/personal-data/swamid-service-definition/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.bth.se/om-oss/personuppgifter/swamid-tjanstedefinition/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>bth.se</mdui:DomainHint>
-        <mdui:IPHint>193.11.184.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.128.0/19</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:2a::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:56.181775,15.590592</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1DCCAbygAwIBAgIQYpg0VnmB9opJdWXyvop8hzANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBmcy5idGguc2UwHhcNMjIwMTE5MTM0ODAxWhcNMjUwMTE4MTM0ODAxWjAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBmcy5idGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNtbQBAr0QcjEne13jcyYRJC0ceIARs7kFS58K5wHtwALgsRNlCUR4KDgqnzW+igeoCTLHdwL90nFutqhSOn6jflyvwCLKhwBAG4t5FnCzoRUNs7LVkcEpK8tJgbWfQzEk8ab0MBjtxPJOJeRera/NZJqBvYzXQLMwAuSwa4JPSWcIlU0gHiTFq3EuFjktQBYyMSBISh4WtKv9gI8pSdo576resG/SUO/3bMucwKVKyvVR78zwyd2NOWs07w+FHFFGzjcpFTnEUJqhxwAvYhcBHvYdjRX17DqCg/Gpuql8Arsf92leIrrw8W7kG+NmyxmQRksi6C/mWf5nAt9Rq3H9AgMBAAEwDQYJKoZIhvcNAQELBQADggEBADuYsmMJJLYKZPc2JhyWntwLNToPVU0G7X5NFMraF9GAJMMXMEg0d4fqAyOsJvYp4PmdhrxFrxoWwKqQpA/HwtERj6No2rguCcZh7LEhFq2tGG3TXuNi8nUfZlWdp17YT1gm3djW1v49faVggKHwuUVV+2OfRsn25bBY1yo08txpIDMGZJozZTCI/a10F2KN2uU1UE0sz1EvnME7t8qxhvA11NimZt+FEsYgsGPB3Mpsl2WMDPOfCQJ5HJxvoNzc4SWjwrc+PxgFAqAcRhm/Tav6Ic4zWK1pe6m4kkdGSVkl697x5Uk//volYBt1h8fyT5k7XzlmuPhgHp144OnpxpE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICzjCCAbagAwIBAgIQWsxMrLy9paBNchENdLbUwzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBmcy5idGguc2UwHhcNMjIwMTE5MTM0ODAyWhcNMjUwMTE4MTM0ODAyWjAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBmcy5idGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXQ/uDJxPs6nmUVOiZYmkELsASbLyVavymTv66Bk7FgOt5pkYrfC3zCKAK7kh5TKOdjAY0qHqQwUQDwv1lNwQW9ItlHdzMaohuO8M/BzPz3E94nVdLN/UeEWgIincd0KzLHc6i9E/pRMX2gJU7ryIpMcsb61K6D9JdoHu/EqTo4vysPjW5jNsNSkUtrEYzcr7s3C2kGpeCWfT4xOumZ1fHHSJUFsD/UQ2HGeIwoZssJZmeBTnXseAuZmWYd70XZItKMwRbSXGg57DhD2NPlGsWvYVGo3M0cACbSjzo1SYByPisdLFe++gAnyNNw2AGvwD/7/ZO+1ax3Z2UcAqo4o6JAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABPxBqf3Yfyh7EmV7xLT9DSZjrq7qvdKOUenRanpIE7Pq5j27zW1JqyMHV9cl2dtuXsWQnKNWvqCu4il987/VL56Qaf1AjNxTAMNNwHOvzfvnySfH023YfHQVTPy8u+G1S3bx+85BfHl51ABLs2UH03ZlpzWCKO30lb0FPZUWKU0KHD1CWoDse3eVGBtnNgbdFmj4RT9vXXB4EljcF3lF0RE7wwXO6+ivaBnt4uzwukODiB7EanpmMVcQt5gagXcbN8vTdsufsBHkonvnu8v53ck5h5YWD+K7VpJWG2JGgJ3FB4pMT3Wmxs5rm7KnOaPt5PsYAdWz5hkuMzBGLIyJrE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.bth.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.bth.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.bth.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.bth.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.bth.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">BTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.bth.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@bth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
deleted file mode 100644
index ba35b0c9..00000000
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.liu.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-08-22T07:40:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Linköpings universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Linköping University</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="121" width="350">https://liu.se/mall11/images/logo-350-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.liu.se/?l=sv</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIQFPektIXgbZRBYUGmou4GaDANBgkqhkiG9w0BAQsFADAb
-MRkwFwYDVQQDDBBmc3NpZ25pbmcubGl1LnNlMB4XDTE3MTIxNTA3NDM0N1oXDTI3
-MTIxNTA3NTM0N1owGzEZMBcGA1UEAwwQZnNzaWduaW5nLmxpdS5zZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALbCDIqrM4xMhU9tKSgJaDyK+JGWw/lH
-sasvDfHVk33ocobSTkJypNESx9oS6ToOmD+W25/6rUlSJBsYb6TdasNP7zcxqPdT
-d1pFO15U4rchRVGn1+GK3FZPbhqTY0sdc6Wba0w9EiroxQ92AO6boQfgUded3CQu
-Jx76xPtoQCGJaObIrhQGwm9O8hXdfUclP2+cUm4I3pN7LV5MM7R1rrJrmXAtcHx8
-1lNwE/OA97k+E5stpDAMfmcL8Ccd2UDD3fbyZuPjnw566mJnilq/17eDm0ZinSfX
-N0b5E7Be3T1By2L8dYnyAsdWR9j27JnF/0QFQrypvvG+V7p3/PTegg8CAwEAAaNt
-MGswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAbBgNVHREEFDASghBmc3NpZ25pbmcubGl1LnNlMB0GA1UdDgQWBBRRcAPfymvT
-MLgK5jMTzffTb6uTXzANBgkqhkiG9w0BAQsFAAOCAQEAJILiWPT6+wlSt70xEi/b
-2rXFgKc16HqFvHGzMUnU2goDAWje3R9hFQJe53btvOuhlCCVgHnjuQsyeSeK50vL
-G8N7PUL+TzqqVCpsk56BJeg3399mJ610S41x8b27hw6icz95mBWdTztScjyJYg6n
-/hQYf48auRXMVUTJ8ckUl72/NWrQvZ3XouyNV9S2A3DC1qtCF875TipSxbUOM2V7
-7GwXH2sdanMfhsGQYoTsZ5qE0qnjuQWVDiRnOMnvRnvzDAlCKjRtAqGlOLMOIHLq
-u8bHcIBe4v+veexfA6vNpgY75s2JxiNUDN6BEHmvl4q0e9M30gZl5SjvG2o/9A8z
-sw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIQXl+Ab5+AALlEmUMLnaw2ajANBgkqhkiG9w0BAQsFADAb
-MRkwFwYDVQQDDBBmc2RlY3J5cHQubGl1LnNlMB4XDTE3MTIxNTA3NDAyN1oXDTI3
-MTIxNTA3NTAyOFowGzEZMBcGA1UEAwwQZnNkZWNyeXB0LmxpdS5zZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+KCOjlPhfT4jLdwPf3CH7FRfA7dvWk
-QbbpIVEqBZTqfnii2s7J5ZSNsaEJf9oWZO+lxesGc0TvJkuh3MKX9+biT9E6INL1
-9mSs3Q7xh0fiWvYHtoZE+7kN8mLEf9XkmS4XF1XyUgqQ1p6sSlSa8JOhTB2xGpZz
-iQBl6yLWITc07Fn2yo2LhODlIetmyGbzzMlkfysWh7k5E10xQK8a17v7SNL9GSbO
-gk4LC1vId6KN85K7klzXcPrDTJLqcPXx8D2B/IDLZnUs8lWvrhCmQSNGoNoDjITf
-hPQISI30ww3FjLx2LEkAAeylDYy+YMhms8SPJNLuC07Vh2mT1M2KwE0CAwEAAaNt
-MGswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAbBgNVHREEFDASghBmc2RlY3J5cHQubGl1LnNlMB0GA1UdDgQWBBQVHtUN1F4N
-ZcsN4rLCbBxWP+awbjANBgkqhkiG9w0BAQsFAAOCAQEAn9vYZND0aRWq0U+daDN0
-ZcwYMh3kUkb96QElhZkxMWkIALyW1n3GsVIfwBh1h211tnMfvBiIwoW+GXEt/veo
-PEW3cacq/MatOMkj+RfQXeibYqEzNkluv5aS/O/v2dYAMop8IuOdriyu5uDsbBsV
-y76yLQQ+F40IPHZH4Si9bXQSaydlxSSjT9MNmHIMw3swUTYfxecsNJdaW8Vq4EXc
-3Qfa07tt/bO9U7O2HPPViIxlgO8Np5FEfzjD0TxJ5TgnU1lb795nZIAbvzSGULdS
-uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
-3w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.liu.se/adfs/ls/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Linköping University</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Linköpings universitet</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://liu-errorurl-prod-wa.azurewebsites.net/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="121" width="350">https://liu.se/mall11/images/logo-350-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://liu.se/artikel/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://www.liu.se/?l=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>liu.se</mdui:DomainHint>
-        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIQFPektIXgbZRBYUGmou4GaDANBgkqhkiG9w0BAQsFADAb
-MRkwFwYDVQQDDBBmc3NpZ25pbmcubGl1LnNlMB4XDTE3MTIxNTA3NDM0N1oXDTI3
-MTIxNTA3NTM0N1owGzEZMBcGA1UEAwwQZnNzaWduaW5nLmxpdS5zZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALbCDIqrM4xMhU9tKSgJaDyK+JGWw/lH
-sasvDfHVk33ocobSTkJypNESx9oS6ToOmD+W25/6rUlSJBsYb6TdasNP7zcxqPdT
-d1pFO15U4rchRVGn1+GK3FZPbhqTY0sdc6Wba0w9EiroxQ92AO6boQfgUded3CQu
-Jx76xPtoQCGJaObIrhQGwm9O8hXdfUclP2+cUm4I3pN7LV5MM7R1rrJrmXAtcHx8
-1lNwE/OA97k+E5stpDAMfmcL8Ccd2UDD3fbyZuPjnw566mJnilq/17eDm0ZinSfX
-N0b5E7Be3T1By2L8dYnyAsdWR9j27JnF/0QFQrypvvG+V7p3/PTegg8CAwEAAaNt
-MGswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAbBgNVHREEFDASghBmc3NpZ25pbmcubGl1LnNlMB0GA1UdDgQWBBRRcAPfymvT
-MLgK5jMTzffTb6uTXzANBgkqhkiG9w0BAQsFAAOCAQEAJILiWPT6+wlSt70xEi/b
-2rXFgKc16HqFvHGzMUnU2goDAWje3R9hFQJe53btvOuhlCCVgHnjuQsyeSeK50vL
-G8N7PUL+TzqqVCpsk56BJeg3399mJ610S41x8b27hw6icz95mBWdTztScjyJYg6n
-/hQYf48auRXMVUTJ8ckUl72/NWrQvZ3XouyNV9S2A3DC1qtCF875TipSxbUOM2V7
-7GwXH2sdanMfhsGQYoTsZ5qE0qnjuQWVDiRnOMnvRnvzDAlCKjRtAqGlOLMOIHLq
-u8bHcIBe4v+veexfA6vNpgY75s2JxiNUDN6BEHmvl4q0e9M30gZl5SjvG2o/9A8z
-sw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIQXl+Ab5+AALlEmUMLnaw2ajANBgkqhkiG9w0BAQsFADAb
-MRkwFwYDVQQDDBBmc2RlY3J5cHQubGl1LnNlMB4XDTE3MTIxNTA3NDAyN1oXDTI3
-MTIxNTA3NTAyOFowGzEZMBcGA1UEAwwQZnNkZWNyeXB0LmxpdS5zZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+KCOjlPhfT4jLdwPf3CH7FRfA7dvWk
-QbbpIVEqBZTqfnii2s7J5ZSNsaEJf9oWZO+lxesGc0TvJkuh3MKX9+biT9E6INL1
-9mSs3Q7xh0fiWvYHtoZE+7kN8mLEf9XkmS4XF1XyUgqQ1p6sSlSa8JOhTB2xGpZz
-iQBl6yLWITc07Fn2yo2LhODlIetmyGbzzMlkfysWh7k5E10xQK8a17v7SNL9GSbO
-gk4LC1vId6KN85K7klzXcPrDTJLqcPXx8D2B/IDLZnUs8lWvrhCmQSNGoNoDjITf
-hPQISI30ww3FjLx2LEkAAeylDYy+YMhms8SPJNLuC07Vh2mT1M2KwE0CAwEAAaNt
-MGswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAbBgNVHREEFDASghBmc2RlY3J5cHQubGl1LnNlMB0GA1UdDgQWBBQVHtUN1F4N
-ZcsN4rLCbBxWP+awbjANBgkqhkiG9w0BAQsFAAOCAQEAn9vYZND0aRWq0U+daDN0
-ZcwYMh3kUkb96QElhZkxMWkIALyW1n3GsVIfwBh1h211tnMfvBiIwoW+GXEt/veo
-PEW3cacq/MatOMkj+RfQXeibYqEzNkluv5aS/O/v2dYAMop8IuOdriyu5uDsbBsV
-y76yLQQ+F40IPHZH4Si9bXQSaydlxSSjT9MNmHIMw3swUTYfxecsNJdaW8Vq4EXc
-3Qfa07tt/bO9U7O2HPPViIxlgO8Np5FEfzjD0TxJ5TgnU1lb795nZIAbvzSGULdS
-uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
-3w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.liu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Linköping University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Linköping University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://liu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://liu.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@liu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>LiU Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@liu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 13 281744</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
deleted file mode 100644
index ecdda021..00000000
--- a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.test.ad.liu.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-05-30T09:38:51Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Linköping University</mdui:Description>
-        <mdui:Description xml:lang="sv">Linköpings universitet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
-        <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="121" width="350">https://liu.se/mall11/images/logo-350-sv.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.liu.se/?l=sv</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQQCEHVKlQ/J5NcNnCootmozANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NDMyWhcNMjcxMjEyMTMwNDMyWjAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3h91j+L3z6SoseYD3RNjkHU/6NqJ6esnczHdUXEuXMYCufiqG562uv59YqoN8UxnNynWTZmFAU3wxdFMYsXKFkmzbb6gI/dFwsTCXA9AXKy1Htcs7ny0t9mU/V5OV8kdsprJ6MGirMqvOY5vdkl5nddJuDlyaEhSWe+ygdkGfTPKUW8jQlKHe5W//kfgf84yl3UG+yWH+eZs/rZ6ij5bTeTYT0CAbKauI+62HbbcwO3zNnsztZLdLMl7im90KmJuGE9P79XJZNvZBL2fbcizfQfdIoEdF++KWyRsn1att58kSs8VYwaPXcbrN3/wDAPW93yDhTWZYe6LwP1SpnW4bAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNkZWNyeXB0LnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSQ3Z/B+aCdqaxXMa8lGtR5yY6GCzANBgkqhkiG9w0BAQsFAAOCAQEAonKrwHHRCea1ATrvzJKTbiyKHpk4LFnAGt48i3tc7b7t6YVcsMBQ2LpriiUpIPpgEpTYSrkg43xsim7ACynmXd0Hb3ENTedzCiMPKAir8N3bqXNImrpb64Sb5EhaQLXxUS/HAxSx7+5tMJki6CRwoWoRK9gouj8rYImScVlZ1lUORvBgxEQEWi9zhm5+UBklvj9BuX2pWL52k8TjovpWXRdZCDLdE5a0II2pmXUAvbJurDEYPN6r+IZgOb27JbazISgmcNKSvbOZb33nafxRhEUKy4tTrEKUGDdW8pMlxAgJJ7wm2OtLASuFjkuabarjk+i0xV8vg/YMI9kwrTttyw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQeq/xL/dgt4VCKKovegQWtzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NjQ2WhcNMjcxMjEyMTMwNjQ2WjAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTPF7hdUl+i8tmPGO4RRtjmSwCGsPFADy+wb67uimM/xM8cf58Cj73MhbSuPK1o5d5VGnzVk+wp51H+BxLOFr0pSuVPTVvybeA8d9ZipN9A6Fi7JzGixsixCnbWfPmvDZVzy1V+658nlVTouoQjD4SiHpTVBBoroim8UNWJxBWC392WLXxeslmzXji/L6eD3S4VK/whuFiQm46z65whtGz9Iyy1b/4Uk8+tcmtbMSqK3fgWtbAFE3CpnklD5zplSJVmOENa+FPunELmVxiC3l/pjfbyAeDXEn6lhJ7ca/JNZxVtfO7DKmLooHz+pEfX3Aa3foub+qrQ4Z5WoUORLLnAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNzaWduaW5nLnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSKnmy1oaliBcoA6U200WScQU/KLDANBgkqhkiG9w0BAQsFAAOCAQEAMK3j0b5sqfedV8NshBu/AcA/6OdSCy7iH1COS5NdT24G/H58mkuCTzWdiJQNIP9haF+4w84+vFfJtDn/dBcpv5k7vq0CG+3DtfE6sIizd035SnApWU86RsRYNo4QnEzz4VqU2ExvNe1K8FWRa2n81CCzvEEJ+bEEeEAzenAB6Txpt6EPJFKUwDqwmcytGPbZfNAr9+eju4VGmjsdeX6fj+QYt9yc6ioNz0I8JOjDpYGhY/mIr/S/OnD+BaNuPsHThXlfl5aw4JA6tCmSCty9NQHiMjzmz4muzAxgNwpjne18g/7YyubRB60RKX+/WA77RATGlF6xwEB137kOnBw1+w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.test.ad.liu.se/adfs/ls/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Linköping University</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Linköpings universitet</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://liu-errorurl-test-wa.azurewebsites.net/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Linköping University</mdui:Description>
-        <mdui:Description xml:lang="sv">Linköpings universitet</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.liu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">LIU Linköping University</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">LIU Linköping University</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>liu.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
-        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQQCEHVKlQ/J5NcNnCootmozANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NDMyWhcNMjcxMjEyMTMwNDMyWjAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3h91j+L3z6SoseYD3RNjkHU/6NqJ6esnczHdUXEuXMYCufiqG562uv59YqoN8UxnNynWTZmFAU3wxdFMYsXKFkmzbb6gI/dFwsTCXA9AXKy1Htcs7ny0t9mU/V5OV8kdsprJ6MGirMqvOY5vdkl5nddJuDlyaEhSWe+ygdkGfTPKUW8jQlKHe5W//kfgf84yl3UG+yWH+eZs/rZ6ij5bTeTYT0CAbKauI+62HbbcwO3zNnsztZLdLMl7im90KmJuGE9P79XJZNvZBL2fbcizfQfdIoEdF++KWyRsn1att58kSs8VYwaPXcbrN3/wDAPW93yDhTWZYe6LwP1SpnW4bAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNkZWNyeXB0LnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSQ3Z/B+aCdqaxXMa8lGtR5yY6GCzANBgkqhkiG9w0BAQsFAAOCAQEAonKrwHHRCea1ATrvzJKTbiyKHpk4LFnAGt48i3tc7b7t6YVcsMBQ2LpriiUpIPpgEpTYSrkg43xsim7ACynmXd0Hb3ENTedzCiMPKAir8N3bqXNImrpb64Sb5EhaQLXxUS/HAxSx7+5tMJki6CRwoWoRK9gouj8rYImScVlZ1lUORvBgxEQEWi9zhm5+UBklvj9BuX2pWL52k8TjovpWXRdZCDLdE5a0II2pmXUAvbJurDEYPN6r+IZgOb27JbazISgmcNKSvbOZb33nafxRhEUKy4tTrEKUGDdW8pMlxAgJJ7wm2OtLASuFjkuabarjk+i0xV8vg/YMI9kwrTttyw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQeq/xL/dgt4VCKKovegQWtzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NjQ2WhcNMjcxMjEyMTMwNjQ2WjAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTPF7hdUl+i8tmPGO4RRtjmSwCGsPFADy+wb67uimM/xM8cf58Cj73MhbSuPK1o5d5VGnzVk+wp51H+BxLOFr0pSuVPTVvybeA8d9ZipN9A6Fi7JzGixsixCnbWfPmvDZVzy1V+658nlVTouoQjD4SiHpTVBBoroim8UNWJxBWC392WLXxeslmzXji/L6eD3S4VK/whuFiQm46z65whtGz9Iyy1b/4Uk8+tcmtbMSqK3fgWtbAFE3CpnklD5zplSJVmOENa+FPunELmVxiC3l/pjfbyAeDXEn6lhJ7ca/JNZxVtfO7DKmLooHz+pEfX3Aa3foub+qrQ4Z5WoUORLLnAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNzaWduaW5nLnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSKnmy1oaliBcoA6U200WScQU/KLDANBgkqhkiG9w0BAQsFAAOCAQEAMK3j0b5sqfedV8NshBu/AcA/6OdSCy7iH1COS5NdT24G/H58mkuCTzWdiJQNIP9haF+4w84+vFfJtDn/dBcpv5k7vq0CG+3DtfE6sIizd035SnApWU86RsRYNo4QnEzz4VqU2ExvNe1K8FWRa2n81CCzvEEJ+bEEeEAzenAB6Txpt6EPJFKUwDqwmcytGPbZfNAr9+eju4VGmjsdeX6fj+QYt9yc6ioNz0I8JOjDpYGhY/mIr/S/OnD+BaNuPsHThXlfl5aw4JA6tCmSCty9NQHiMjzmz4muzAxgNwpjne18g/7YyubRB60RKX+/WA77RATGlF6xwEB137kOnBw1+w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.test.ad.liu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Linköping University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Linköping University Test</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet Test</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://liu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://liu.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Linköping University</md:Company>
-    <md:GivenName>Saml</md:GivenName>
-    <md:SurName>Admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>LiU Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@liu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 13 281744</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/fs.test.bth.se-adfs-services-trust.xml b/swamid-2.0/fs.test.bth.se-adfs-services-trust.xml
deleted file mode 100644
index 7050206c..00000000
--- a/swamid-2.0/fs.test.bth.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.test.bth.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-18T16:17:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://fs.bth.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">TEST - Identity Provider for Blekinge Institute of Technology</mdui:Description>
-        <mdui:Description xml:lang="sv">TEST - Identity Provider för Blekinge Tekniska Högskola</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - TEST</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="200" width="200">https://www.bth.se/wp-content/uploads/2022/01/logo_bth.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="200" width="200">https://www.bth.se/wp-content/uploads/2022/01/logo_bth.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.bth.se/eng/about-bth/personal-data/swamid-service-definition/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.bth.se/om-oss/personuppgifter/swamid-tjanstedefinition/</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - TEST</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>bth.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:56.181775,15.590592</mdui:GeolocationHint>
-        <mdui:IPHint>193.11.184.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.128.0/19</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:2a::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcagAwIBAgIQalxoJEiFpIdNREHOs3S8BTANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBmcy50ZXN0LmJ0aC5zZTAeFw0yMjA0MjExNDAyMDVaFw0yNTA0MjAxNDAyMDVaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGZzLnRlc3QuYnRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1wOMycoPklDSSlaAgHFxPiEr2xArck4t9VYHfr84APzT4uD+mTHiU1NSB7It8K77BEnPjJfcHudMhSv/1aNrZPZHil4EfrR+w2To+N/+80OUJ8Jdmw7orMD5foCYfrdAxIOnzYVShrfyA47SXq5f7p3h5hNKi+pH+F3Zoblkg6X5+MmwUZa4OaAVjbMshDdS5RbYin4FnbI03vq4D/j4SsC7XF/noj4jT18vFJZYWtRR9MvQ9Cx8Q6MsOXSS0qi4jBXS6rgE2/5DuEe5L1+CXz5WOQ++1SHjRMux++ogCw4sFd8GGDqtcSQ7+ozqlm8Fs8QM57ZivQsy2OqAwLWa/QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAMsv5aZ2Ui2LlMSNv+olLdx9QvbstJJ330wi8UjM9iWpZdY0626OyLnVn7HBxqz2huts+SY+4wR0prg/6CTL3s9B3gS1hBl3+3fPpHGHRYlOjsrJ5ytdYUHW7IZMKHdKGFyMv/g2qrpcmj/Qm+qPTow6c2xeKQUQUnW+SUFAAd224t0iK+SFUskQejulMKDCZZePabSOTnWMFnIpwMTayiyktp+xiDZ77BZdjiphYW6bSDSPovqT1pCJk9AEImAhinVq1Vu6WOrv8wVR43LKrE1IJaZdJ9JtZXAWv7Wx0rrt3pnvKe4krSbbOltQclD888HukhEg48fcLG8HKXWOKJ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC2DCCAcCgAwIBAgIQQTOp2BcAHLpH+3erh3BjzDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBmcy50ZXN0LmJ0aC5zZTAeFw0yMjA0MjExNDAyMDZaFw0yNTA0MjAxNDAyMDZaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGZzLnRlc3QuYnRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA49Vq8ZG5Ig1l8cb2pBXVSFcmlbj37MFWraQftQ79APGlwstwM0U/5a6hYHaODDagrVdda5nJhM6uoDfRPE9Jl2q6KaLvMZOuqKsCYKiqq8dG05/VQk0Z652DJ0N/1D0A9fSVmPB0B89U5PexSdGQj++n4RWVNzMzdCS+2MPrTahf+4+6lQD09HfvDquONVwPpYz+fzbJP/E0BVvdzy1EWerF9aKmSFtuGPMohXvp9UnPLxjkk3U7MMCDBgG4KysOQLM3AX5uRjWIpYubqiMyXEXx9qa9MchhHhgikzaYzEW2Qgv6siok2mRy9F6vRgWCbPG0DQTP9NHqQWys+jNjzQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQDL6Skh79Db+hUO+IEqSsQZT7cDVXRgX9dbpHKME9sS1lEPHLPlAVhvvJ9nsYKg/eFlH04/9j83zBWlBLlend/85kq+bFnY498w7M6iUXVReI4virO1WIoqVw6W71hSnkUxhotBqLnA6GCnjripgr2BASpjVAH03XQjV8XDJ3pyX1S+pZrgUiHL9NT222IM9MG0GFuMaTzCDhye4fWhpSDC1UiaVG7R0Fxg3psSj2LeXo7qsi9TFA97L5qHyGXlvSBpUL2l2THPo/NCMlNqT51OcZ0GS7e/ps3CQudOs+LR0z+WYvQTwdiiPjVnKiPsr6sQ0662LykvX5jGov/8z5zA</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.bth.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.bth.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.bth.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.bth.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">BTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.bth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@bth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/gdb.vr.se.xml b/swamid-2.0/gdb.vr.se.xml
deleted file mode 100644
index 8bc19f0c..00000000
--- a/swamid-2.0/gdb.vr.se.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://gdb.vr.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-12-21T09:45:28Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <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"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gdb.vr.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gdb.vr.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Vetenskapsrådets granskardatabas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Vetenskapsrådets reviewer database</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Granskardatabasen är till för Vetenskapsrådets personal</mdui:Description>
-        <mdui:Description xml:lang="en">This service is for Vetenskapsrådet personell</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.vr.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.vr.se/english/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.vr.se/behandling-av-personuppgifter.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.vr.se/english/information-on-processing-of-personal-data.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>gdb.vr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gdb.vr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID7TCCAlWgAwIBAgIUHTuNGOWWZD8HZrKF1b6fI8fa+YowDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAxMJZ2RiLnZyLnNlMB4XDTIwMTIxODA5NTgxM1oXDTMwMTIx
-NjA5NTgxM1owFDESMBAGA1UEAxMJZ2RiLnZyLnNlMIIBojANBgkqhkiG9w0BAQEF
-AAOCAY8AMIIBigKCAYEAubwCe/SSJ12YCgTSO7UqQ0rnc3XGQH6OvArD7cKNXBPq
-TeUAgInD/HHZpx6CvpdDlc6ksEx1jzFjZ5CsK21BYOgRzKwKGBpcaL0SXH4Qsbiy
-BnbBn4LMtiD7zl8YArg6BSIyx9e68RBffHnaUxyH6TUCQl3tjsCpmMULvOWjRBiM
-0JzPT69Fhyo0APp8itEC3ZUGRDlOmPsCJ++/zf1JICznXwGhRaZdAqdJ5HvurOoe
-1xNwBPfRFCVNlnefGDUlozWrgkqQ9eBW93BIZYQXcaVIBIbV3uzNnF8Q+4noUfVv
-JxVCOWfC9DLiihvqoLWMYZZU2NiFuMXcX6vd+/MP6Cf8HAnRFA+YXsKccx6Qh2QI
-uw7jCDzc8RfqcUzwQG7Lxpn+LL2VL7Qjh0444S9j2rQsqy5F+eiTdq0+WNrY/I9+
-mgHO8UhYpsXSGAF9fL5c5HcyZJb+NFkex8VJpmw/rxgj5GPsuXX6hCq/dvBHcaTj
-urU8X0xZavZaiNQqudUxAgMBAAGjNzA1MBQGA1UdEQQNMAuCCWdkYi52ci5zZTAd
-BgNVHQ4EFgQUpu78z/RHZQzh45m1LVWOsE2mdX8wDQYJKoZIhvcNAQELBQADggGB
-ACyC4TUIZAS3252HQM2fRpSZd+loB8vhYuS+6Dq+wzjcXOfkn3j22xI5wxPcD5cW
-xyYKklBIwAfPbMVgmx+3i+ICn3Nk8x7tJXijnTJFKkXgsIew3WN5nnSWxt16+uXg
-bOHN7e+YxOm4hLC00QK4tpdNS6Ry7dl1WpyDYl7zqBWNVBDr5qANUbVOW9vsU4AE
-cTJt56cnxekn5OVWIG8vOh3Md6k0bBDj01zRjo9DLJ0dwYfqfycQC01DrUQty1Cw
-youq1E/ViMng/MKYOeBwnrDjhTYZq9iDoRYTptq+1SDMTq2j5jUdcupLHzEfhnp7
-G67BoNvlPGjU4htb32Ri8a88CJ179Lf+VjnrqffSg10gheeJ6GRpU6a06GMAFteZ
-mRKH2iKX98lOo36CWBvYX8mRvxNNW08IbgS5XdiQ5fBB9fjq4oI3pT2hj2NKMWOJ
-ZmCvWMy0Tq4xRtVivWY7tePnTEKs9LMKoFMKWZliUVZiR0TO5BE0yTUAKluZBHrz
-1g==
-</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://gdb.vr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gdb.vr.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gdb.vr.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gdb.vr.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gdb.vr.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gdb.vr.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vr.se/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.vr.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Iver AB</md:Company>
-    <md:GivenName>Henrik</md:GivenName>
-    <md:SurName>Valstedt</md:SurName>
-    <md:EmailAddress>mailto:henrik.valstedt@iver.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Vetenskapsrådet</md:Company>
-    <md:EmailAddress>mailto:swamidkontakt@vr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Iver AB</md:Company>
-    <md:EmailAddress>mailto:support@iver.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Vetenskapsrådet</md:Company>
-    <md:GivenName>Säk ansvarig</md:GivenName>
-    <md:EmailAddress>mailto:swamidkontakt@vr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml b/swamid-2.0/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
deleted file mode 100644
index cab87ab3..00000000
--- a/swamid-2.0/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://gitlab.fysik.su.se/swamidproxy/gitlab.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-02-12T15:46:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gitlab.fysik.su.se/swamidproxy/disco" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Fysikum Gitlab</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Gitlab version control service for Fysikum at Stockholm University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/gitlab</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/gitlab</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIUceEae1qy6s0evAJiI8SFeIvw5sowDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLZnlzaWsuc3Uuc2UwHhcNMjEwMjA5MDgzOTIxWhcNMzEw
-MjA3MDgzOTIxWjAWMRQwEgYDVQQDDAtmeXNpay5zdS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN4w05kBX8MyH67s+8gZMZ3dJKp0GAVK3TEYwuVc
-QyoiDkmSvfOh3CYTYv1HVTd+ID4SwSmk+/kEwaAZAfcraibLAEYBbTEVhRqktIYT
-DiiEX3BFZLcY4t5IbPdJrNQJDOF7ynslVtwZYd1ABBdmaS2lNSoSubsSmC8twU85
-0TkmViFScZnrP4GcqCrqSTKcrAOmOpUvRnm7FD2Ji/wHIbTwykfrI0/xBhcRVOgn
-zxO9KdT9+IzOHMdkk+7Vkd8cNpIp8/KYCEGm5RIT6owrDh9qhKm+LhgT9cQ+k6qU
-CSUghLM3ZleSaj2m7PDHikN2ZyQOp2vcrXnwo7idrUkYkN8CAwEAAaNTMFEwHQYD
-VR0OBBYEFKbEd6l1/+77do2d+FHaxTzAwvuOMB8GA1UdIwQYMBaAFKbEd6l1/+77
-do2d+FHaxTzAwvuOMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AGq9c0XCIcEhM9FPJFsZmuWkX4rp8j9SOPsxokkWLQmmk4LTgDdJ/DsFWvjbgBJ6
-nCiFn/RXNFCfzHb3nSSenksfoQFcLYG9F+Df+ufxA7DXXcwK8S3HACkHYJTyBVAm
-sgbxt7ZksKfH3sJ0bTlfIlMGb9ekaVbXolNdQOXPM9vh36/nANy0DAWB9lmCMVhp
-w5h/FiB+Ekr0VdVMPg2cWhSzl+iIfQS9RFbZLGthwbal/NMYcZLM5bBU+FFyssWc
-iE5Bsy5LCIS3+4nDKZGPKiYv1gpb/8rktUEQQE8yZskovdRF1VQg3ooT7enjJG/Z
-rl1vDdOSp3KzuoZsaikbcJE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIUabOWu51DaQv4g8C5nTpVGfHVA5UwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLZnlzaWsuc3Uuc2UwHhcNMjEwMjA5MDgzOTIxWhcNMzEw
-MjA3MDgzOTIxWjAWMRQwEgYDVQQDDAtmeXNpay5zdS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMJnZd6HSGWyggWODHozsDvZeN2rLP/liaG/B7GB
-kJrfarl6AobJ+BM9Lqy72ARiDmShBdVyuMOpHcb+UpAnNxk1wbT9dRT8lebM6NjT
-aCx6D5R55PfRZ2uHUJlFgCgH4qfklUNkDnXiKu9OMFLJU+7EpJNc8Ld6Z7BQvaAC
-rX+bexNWW60iB9ob8MypGZU3MWv+YLBkEW+uPLLlSQ8YUmDsgfJN25VTrhly8NvD
-FOtxG7ALxLHQHVuNfvJ/vbZpHPQj2+nRl3SvJqEX30xQhnqzoKwRY7OXgnY5sC7g
-GIn4QbkK4SZARcFgUT+LMXEf7qWdUr7Ca0/+haFGNSE08xMCAwEAAaNTMFEwHQYD
-VR0OBBYEFN2kthn92gITWdTvlWVgBXxP62BAMB8GA1UdIwQYMBaAFN2kthn92gIT
-WdTvlWVgBXxP62BAMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AE7EmFVhCf4iNPKVn26zrygjLoj486Mi1Lxc1FolfRTC1jmP/iYYouI/34cj1qqm
-re++szlY9l6SbhpqA/FndYMF0FVR0wIkhVSXqcuPyk31TyRa3BA6VExFAWKt3y1Y
-oyuNYOzV4qhixNSP0ZbCqi7I/ucG7dM85s6CF1I4FzDgdSUWXdWNmJzPVkTgGufo
-+W3ANL8PL1bcpUjakJfekKVBgcFsQtJC1Vs1KPu35dCoq6YT0yRx5kX3fbbMeQVo
-3Jxu4j3RRutM2VpiWgLqwPXD4tk2WQKut/OgELX/Xox44dEFdv4UfmIXUgekLBGB
-es55lJTi6JO0uz/1fmpfswc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.fysik.su.se/swamidproxy/acs/post" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Fysikum, Stockholms Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fysikum, Stockholms Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.fysik.su.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fysikum</md:GivenName>
-    <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Fysikum</md:GivenName>
-    <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Fysikum</md:GivenName>
-    <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/graylog.nordu.net-shibboleth.xml b/swamid-2.0/graylog.nordu.net-shibboleth.xml
deleted file mode 100644
index 30cf076a..00000000
--- a/swamid-2.0/graylog.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://graylog.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-05-03T13:14:46Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://graylog.nordu.net/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://graylog.nordu.net/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">NORDUnet Graylog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NORDUnet Graylog</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">En graylogserver hos NORDUnet</mdui:Description>
-        <mdui:Description xml:lang="en">A graylog server run by NORDUnet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>graylog.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=graylog.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDCzCCAfOgAwIBAgIJAJxFp9Eiy2eZMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMMEWdyYXlsb2cubm9yZHUubmV0MB4XDTE3MDUwMzEwMDYxOFoXDTI3MDUwMTEw
-MDYxOFowHDEaMBgGA1UEAwwRZ3JheWxvZy5ub3JkdS5uZXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDQzEVXo+G1PQpLHX7cbhqkO8mkD9VgnPmY4YYD
-FaqoSINDmecjP1hXRTJ6c0WeyYUlVRN4Fd6HlgIqOrg72ayWY5zKaALc2zBBluKx
-eDl0ojMuhcGFQfjZ+0yAUk48UW0QpZxd+E/0uH449kJwoQ3QpqVMZLR0io7Q9ejY
-72waNcPIYsAQpP8JXDzg7Ej7ZO7wuhMp8V3tLRkPPAKZFEj/NFJSkFHXSiZ5bLw3
-zKI2qsyljVq6xjICjR3vc4m8YZpalLdu7jIP3v5eVT9gPRW2kFf9r/0z8+FrD/JF
-tfbALu7egzP8YrjpIHYk40/gJR+GQIoxjl93whGWY0SkXXUdAgMBAAGjUDBOMB0G
-A1UdDgQWBBQeMwRaHeA89oG+bOrRpj50rGJZSDAfBgNVHSMEGDAWgBQeMwRaHeA8
-9oG+bOrRpj50rGJZSDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDG
-ETYnToNIV9Jzq9GdQZ80MRw9dhnbLdxlx4dfiWdEDMjsNRFUoiYuuxNlfsPqlSV9
-4ZpySVC2NxfSKZdbsEMTp1+uJPvkKTlTOeOp81/ixsu7LldQskz0ky/E2uPxZLGK
-GQIg/0d+cwEKLZnh82Z/8EqNlzuWqQ7XusYeLD9HM/fhU/rTT1wGnEnbWkQ0gZQ9
-FjlxPxeQButpr1QOUlF4WeyvRV93dH6O8khrQZTw4eNYCpgeEK5iAWmv1gFckZ61
-pc0/wSWsXlCKKdvcilYf9uc4RGpsdIHYHlCIBveUNMaqK3Ce2niYAgSGVH3vejoq
-44OGEs0L2FPx7UE2rXEb
-</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://graylog.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://graylog.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://graylog.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://graylog.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://graylog.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://graylog.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://graylog.nordu.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://graylog.nordu.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sunet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sunet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fredrik</md:GivenName>
-    <md:SurName>Pettai</md:SurName>
-    <md:EmailAddress>mailto:pettai@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
deleted file mode 100644
index b79ab830..00000000
--- a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://hbidp-test.test.hb.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-09-06T09:33:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://hbidp-test.test.hb.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Borås - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Borås - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
-        <mdui:Description xml:lang="en">Test Identity Provider for employees and students at Borås University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hb.se/genvagar/om-webbplatsen/integritetspolicy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.hb.se/en/shortcuts/about-the-site/privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>hb.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.171.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.172.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.173.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.174.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.175.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.245.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.246.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.247.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.64.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.65.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.66.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.67.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.68.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.69.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.70.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAP5G1DjR56XDTmOVO7FhPQT6yrvEMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVzdC5oYi5zZTAeFw0xODA5MDQx
-NTM3MTNaFw0zODA5MDQxNTM3MTNaMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVz
-dC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIunv38tROIT
-xylJLYRGXbBNrvvd1y5TwtZLUPYWl9bRKrMPy5yKGmlohWcOn9eTUgw9ONd/tQLB
-VR8R/WIEJ0G8TqieihcEf0NHhldinQ59ZUvjv/T3ViELURjZcewuoBUVV0vgAfcF
-xqyGKtPjyBRbDh4X9qyWhNi9/+Gm+21EKxtVdq60tG6XDVfvR0r9VNfQY89elOsE
-6MXJSo6mwTzE6hF4LkQ5HBbPVKtEic6uipS7bAV1cGaWva7HTO9IxWSB6LNqzyQy
-ABHjztJ44ts9VA4T+m6J/p+gUTO9X0E6HCGkYEU5q7LPhWfxwYjaUMNuJ/IKqksj
-7ojzku6rbykCAwEAAaNxMG8wHQYDVR0OBBYEFK8VTzfmTmMM606LaD4mJbFKhW1z
-ME4GA1UdEQRHMEWCFWhiaWRwLXRlc3QudGVzdC5oYi5zZYYsaHR0cHM6Ly9oYmlk
-cC10ZXN0LnRlc3QuaGIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAAkpALSFhOKx/OYjt+N9A+Hzy6mt15PudqmOl2xubEF9634wdpkQZ5DvBW0z
-TbBcz9TUwHLEEex67XqXJWOTs6yBdTQlhtuDwlwbSw/gchNKOLCcoIBSzdbozu8o
-ta82KzzzlHJ2KPluBw1sCaYm6HTFIKOAYe2VefHQ/9PHsLcYGqd3on93/kzVVroq
-tda2MpeOada2bR3fXk5WDs68ztbJ/szEsXZvssPsdq5I0BzltjoSjHrMGuFv8cWT
-TdHegNv759FRVCXUUWR2ZI6Y7N/kirs6BcCHjAB1ttgbbbXPngsCX9pV0dV0BqhH
-HeJFPfMchJSIf4t2ui7XHSfm5/U=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUXRI6TnTqyLdbWXY+ybzzfbGoeZwwDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0LmhiLnNlMB4XDTE4MDkwNDE1
-MzcxMloXDTM4MDkwNDE1MzcxMlowIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0
-LmhiLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgqktYAX0lZcZ
-KjQBkdgNN3VVHi0XmPQWQzZULb8mIEHet0oF2Cu84m6q5+yeLesbVpr17VIiqeYV
-rDmfYEoVYKuIxpZkcE/Df4QRtQLMM/zlfPmivjMgY9cA6xy2UkxO3yLH6yWtwvf1
-L+6oOEpix9ZBnK1fxtUP0rqjof4+pwkT6qj6OtgvEcA/0Y4uK9r7gP3bX6qB6vTS
-3XW0oZKf9KfNk7ES+pu19mCYSvwUK6UlHeNWZfOzz6/cmHBIJfWnirdE6GZrbIZL
-rZT28KwF43zBQ93OjfQxjvoVTFNI0ienSMJh1wquLEez0rgoyfvnnaPwEmdg+xK8
-3Z3JzAkPaQIDAQABo3EwbzAdBgNVHQ4EFgQUi0AQ8gh4n344u3KqkqSr5zXM8osw
-TgYDVR0RBEcwRYIVaGJpZHAtdGVzdC50ZXN0LmhiLnNlhixodHRwczovL2hiaWRw
-LXRlc3QudGVzdC5oYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAaMzc+G/kwGYh6K4nX5fUXqVKSWeYoqj37ewoWDF7ZP+1/iQJ+AEp7yPtDXZQ
-e1Hbepeyw/nRDucI8Zs5rw2B7CbQXIhVhzWd4MvD//GZRJn8gllwM7MQ4GQeveG5
-HxkE3HkGyuMw81EqYd+zxbnw9i0OgUaKCjQYv7z66GDN5BnBi0RkwN1K5FdeNq2N
-tmwzSXBUYd5AuOluabpjCVJE87CnSIOJ+6ZyFWqhE1owqM2vw2YDR+5qMhqxCn3l
-Wkw27URn2McUdKeTUMRQBp4TgHUlPruxui51DsU842gJIeRjKvGpKBEr3whEVwEQ
-ulMd7RBwYluu5OV3k9qVEF28oA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAPWsuZ2aCN3fS5mXG2JLmHm1AZgOMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVzdC5oYi5zZTAeFw0xODA5MDQx
-NTM3MTNaFw0zODA5MDQxNTM3MTNaMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVz
-dC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQdXtQn6Aei
-wNIfovjsFpCSF9UO7nho+gsB48rU8PTWPnuodWhQaBqlyf8FTazrpF/Ring+wJg6
-glPKlBgoWgtUQTOprwkgnqGWRpL5ult7nQTfa1JQjdHBxm+vBFpvEE6+0RKkSmBh
-Llm0dd7zBJnyfG28y0Ouv75BDMK6gvoodHucYndBbEPnyUrnf44OvJD/VKg+DAlb
-pZaUBJkDeR1jM2VUJNBiMbmUmU8v7HgjgplPu5PvL3u4yMU5i0NI+eL9NWo5eRbI
-QNzKQQ4JBW87W90OzoJjaP0VRG7zoO9I27qdlNtVi3I6q2yEEimjx6oC1520JAk/
-aYmG7Cmrg8MCAwEAAaNxMG8wHQYDVR0OBBYEFHWo3WwleQ0SQ1cV9kC+e9D/5AoM
-ME4GA1UdEQRHMEWCFWhiaWRwLXRlc3QudGVzdC5oYi5zZYYsaHR0cHM6Ly9oYmlk
-cC10ZXN0LnRlc3QuaGIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAFv7/0GOeil7iLorFfP7fgiW0PSpOrz1IqdKaPWjGpluav8PW+iBT4l82cNB
-ES3wNEcNbqhnRWmP7su5AJqQX8XdorGl330eK2jd99j/lKWS/6e5H9lq4arWEsTF
-5UwwfT3/NVDI0lBLh1oewROauWN3c8BWd4fmyJ2vMMp+3BTOMgHMzurelZWkMFbj
-emi03bjNx3BEln9TAib40eDwWBJkSzGjsFvjZKhXkA8HunKOqqQrTJw3FK9Z0i+r
-3/7dJXfTLB9biTO3FLytC7lHlFHp9V+k0zeFO6hZdyWPggmYjpyD4ayRdAeekjgJ
-YPbGFDgtXE/LKeKsvKgyQIfKUW8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hbidp-test.test.hb.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp-test.test.hb.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp-test.test.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp-test.test.hb.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAP5G1DjR56XDTmOVO7FhPQT6yrvEMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVzdC5oYi5zZTAeFw0xODA5MDQx
-NTM3MTNaFw0zODA5MDQxNTM3MTNaMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVz
-dC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIunv38tROIT
-xylJLYRGXbBNrvvd1y5TwtZLUPYWl9bRKrMPy5yKGmlohWcOn9eTUgw9ONd/tQLB
-VR8R/WIEJ0G8TqieihcEf0NHhldinQ59ZUvjv/T3ViELURjZcewuoBUVV0vgAfcF
-xqyGKtPjyBRbDh4X9qyWhNi9/+Gm+21EKxtVdq60tG6XDVfvR0r9VNfQY89elOsE
-6MXJSo6mwTzE6hF4LkQ5HBbPVKtEic6uipS7bAV1cGaWva7HTO9IxWSB6LNqzyQy
-ABHjztJ44ts9VA4T+m6J/p+gUTO9X0E6HCGkYEU5q7LPhWfxwYjaUMNuJ/IKqksj
-7ojzku6rbykCAwEAAaNxMG8wHQYDVR0OBBYEFK8VTzfmTmMM606LaD4mJbFKhW1z
-ME4GA1UdEQRHMEWCFWhiaWRwLXRlc3QudGVzdC5oYi5zZYYsaHR0cHM6Ly9oYmlk
-cC10ZXN0LnRlc3QuaGIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAAkpALSFhOKx/OYjt+N9A+Hzy6mt15PudqmOl2xubEF9634wdpkQZ5DvBW0z
-TbBcz9TUwHLEEex67XqXJWOTs6yBdTQlhtuDwlwbSw/gchNKOLCcoIBSzdbozu8o
-ta82KzzzlHJ2KPluBw1sCaYm6HTFIKOAYe2VefHQ/9PHsLcYGqd3on93/kzVVroq
-tda2MpeOada2bR3fXk5WDs68ztbJ/szEsXZvssPsdq5I0BzltjoSjHrMGuFv8cWT
-TdHegNv759FRVCXUUWR2ZI6Y7N/kirs6BcCHjAB1ttgbbbXPngsCX9pV0dV0BqhH
-HeJFPfMchJSIf4t2ui7XHSfm5/U=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUXRI6TnTqyLdbWXY+ybzzfbGoeZwwDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0LmhiLnNlMB4XDTE4MDkwNDE1
-MzcxMloXDTM4MDkwNDE1MzcxMlowIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0
-LmhiLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgqktYAX0lZcZ
-KjQBkdgNN3VVHi0XmPQWQzZULb8mIEHet0oF2Cu84m6q5+yeLesbVpr17VIiqeYV
-rDmfYEoVYKuIxpZkcE/Df4QRtQLMM/zlfPmivjMgY9cA6xy2UkxO3yLH6yWtwvf1
-L+6oOEpix9ZBnK1fxtUP0rqjof4+pwkT6qj6OtgvEcA/0Y4uK9r7gP3bX6qB6vTS
-3XW0oZKf9KfNk7ES+pu19mCYSvwUK6UlHeNWZfOzz6/cmHBIJfWnirdE6GZrbIZL
-rZT28KwF43zBQ93OjfQxjvoVTFNI0ienSMJh1wquLEez0rgoyfvnnaPwEmdg+xK8
-3Z3JzAkPaQIDAQABo3EwbzAdBgNVHQ4EFgQUi0AQ8gh4n344u3KqkqSr5zXM8osw
-TgYDVR0RBEcwRYIVaGJpZHAtdGVzdC50ZXN0LmhiLnNlhixodHRwczovL2hiaWRw
-LXRlc3QudGVzdC5oYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAaMzc+G/kwGYh6K4nX5fUXqVKSWeYoqj37ewoWDF7ZP+1/iQJ+AEp7yPtDXZQ
-e1Hbepeyw/nRDucI8Zs5rw2B7CbQXIhVhzWd4MvD//GZRJn8gllwM7MQ4GQeveG5
-HxkE3HkGyuMw81EqYd+zxbnw9i0OgUaKCjQYv7z66GDN5BnBi0RkwN1K5FdeNq2N
-tmwzSXBUYd5AuOluabpjCVJE87CnSIOJ+6ZyFWqhE1owqM2vw2YDR+5qMhqxCn3l
-Wkw27URn2McUdKeTUMRQBp4TgHUlPruxui51DsU842gJIeRjKvGpKBEr3whEVwEQ
-ulMd7RBwYluu5OV3k9qVEF28oA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAPWsuZ2aCN3fS5mXG2JLmHm1AZgOMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVzdC5oYi5zZTAeFw0xODA5MDQx
-NTM3MTNaFw0zODA5MDQxNTM3MTNaMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVz
-dC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQdXtQn6Aei
-wNIfovjsFpCSF9UO7nho+gsB48rU8PTWPnuodWhQaBqlyf8FTazrpF/Ring+wJg6
-glPKlBgoWgtUQTOprwkgnqGWRpL5ult7nQTfa1JQjdHBxm+vBFpvEE6+0RKkSmBh
-Llm0dd7zBJnyfG28y0Ouv75BDMK6gvoodHucYndBbEPnyUrnf44OvJD/VKg+DAlb
-pZaUBJkDeR1jM2VUJNBiMbmUmU8v7HgjgplPu5PvL3u4yMU5i0NI+eL9NWo5eRbI
-QNzKQQ4JBW87W90OzoJjaP0VRG7zoO9I27qdlNtVi3I6q2yEEimjx6oC1520JAk/
-aYmG7Cmrg8MCAwEAAaNxMG8wHQYDVR0OBBYEFHWo3WwleQ0SQ1cV9kC+e9D/5AoM
-ME4GA1UdEQRHMEWCFWhiaWRwLXRlc3QudGVzdC5oYi5zZYYsaHR0cHM6Ly9oYmlk
-cC10ZXN0LnRlc3QuaGIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAFv7/0GOeil7iLorFfP7fgiW0PSpOrz1IqdKaPWjGpluav8PW+iBT4l82cNB
-ES3wNEcNbqhnRWmP7su5AJqQX8XdorGl330eK2jd99j/lKWS/6e5H9lq4arWEsTF
-5UwwfT3/NVDI0lBLh1oewROauWN3c8BWd4fmyJ2vMMp+3BTOMgHMzurelZWkMFbj
-emi03bjNx3BEln9TAib40eDwWBJkSzGjsFvjZKhXkA8HunKOqqQrTJw3FK9Z0i+r
-3/7dJXfTLB9biTO3FLytC7lHlFHp9V+k0zeFO6hZdyWPggmYjpyD4ayRdAeekjgJ
-YPbGFDgtXE/LKeKsvKgyQIfKUW8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>University of Borås</md:Company>
-    <md:GivenName>IRT HB</md:GivenName>
-    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/id.test.easyvote.se-saml2.xml b/swamid-2.0/id.test.easyvote.se-saml2.xml
deleted file mode 100644
index e81b4476..00000000
--- a/swamid-2.0/id.test.easyvote.se-saml2.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://id.test.easyvote.se/Saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-10-24T09:29:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Testenvironment for electronic elections</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Testsystem för elektroniska val</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Lund University test environment for electronic elections</mdui:Description>
-        <mdui:Description xml:lang="sv">Lunds universitets testsystem för elektroniska val</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIQbZ8VRUM4Tr9OtQ5lSgpTTzANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDDBlpZC50ZXN0LnNhbWwyLmVhc3l2b3RlLnNlMB4XDTE5MTAyMjEzMzMwM1oXDTIwMTAyMjEzNTMwM1owJDEiMCAGA1UEAwwZaWQudGVzdC5zYW1sMi5lYXN5dm90ZS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQQDX1eG5SuMAukTuSP+M+j4qdzzD5shhC8NL582Y7MK4b13pultm9ELqCyvxeBBi+uUjt2iOlk7eP0DqA5oM2UB2rfoOG4EdJXj2HZ+FAzRIZbaGRPe/4K8NK1fRYb/2GPR/Ow7jSgivHx3nCLZ3w28nkLhiN4K2LSV4wdS/C8X2TrI3QoftVuQZw1S97B3RgvLAAz7zNrud40VMnS0X/fAiG7El0eiEteMZm1LJrNOmSD/XgOUZlLKJV83+7jDBdP/Qwa1qgNy+5qPknehrzmropwyneOOARqGDGeuUOMr25tXZ2TJ5+toXR+9lh8SpP4VcgnbF2JVEf4NADwunUCAwEAAaN2MHQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAkBgNVHREEHTAbghlpZC50ZXN0LnNhbWwyLmVhc3l2b3RlLnNlMB0GA1UdDgQWBBQQVAbrP50xPK+eruZsJylRqZz1LDANBgkqhkiG9w0BAQsFAAOCAQEAmOVnrNd38uUuk69QBtdDaP0u6afOFQfx3Jdi0g1MtE0aY/qW6i8/ycYi0e9wGCB+C+RnC3MCbFFvYlT8g2wsd4ludjQPYeFiGqta81ff19h/KfQ7hCRez/CcyIXo8tN6W15R3TCHcSljedDr0wI7xsbTpZLyFoVmNSuOtw2zF5+Uh0vjhj3akmWZgTTGeb/OTQHBydmevvoyGWDLnrv19tCJJ+T7qXuY/+beb+uEt/clsXnheNQjKTRTFVk8zNYJEPUr39bPUyeSqeywTCvSaZq2K8m1XG8kyBCfvtLyZFQr8+QILp3UvGy+xNCQPg1aTmNpfXV/xU7Sqe29FxIfiQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.test.easyvote.se/Saml2/Logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.test.easyvote.se/Saml2/Logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.test.easyvote.se/Saml2/Acs" isDefault="true" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.test.easyvote.se/Saml2/Acs" isDefault="false" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Lunds universitet</md:Company>
-    <md:GivenName>Anna</md:GivenName>
-    <md:SurName>Åkesson</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Lunds universitet</md:Company>
-    <md:GivenName>Eskil</md:GivenName>
-    <md:SurName>Swahn</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Lunds universitet</md:Company>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-proxy.drive.test.sunet.se-sp.xml b/swamid-2.0/idp-proxy.drive.test.sunet.se-sp.xml
deleted file mode 100644
index 18582672..00000000
--- a/swamid-2.0/idp-proxy.drive.test.sunet.se-sp.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-proxy.drive.test.sunet.se/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-24T16:12:48Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <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-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <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-sha512"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-proxy.drive.test.sunet.se/Saml2SP/disco" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Sunet Drive</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://sunet.se</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Sunet Drive</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/SUNET+DRIVE+Privacy+Policy</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="sv">Sunet Drive</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Sunet Drive</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://sunet.se</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/SUNET+DRIVE+Privacy+Policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUE2xnj8gjIi/2p3JZ4rEhFVShtx8wDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjIwNTIzMTIxMDQ2WhcN
-MzIwNTIwMTIxMDQ2WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMNV5YpT9Dtnz7Gn85ndJhOgcFEe/UFy
-Po0T9BT0BbdoOP9asSae7xg3rqxgkSfL9MTc/W75Q5mxqqXySXPBx4pkTmYwx+6p
-v4nNOyAsxfg68q4eXjTC0/ylwIv1EqvGMI/0/yyHtde/WvxCwFGnOlLtx/T7iclm
-/5zPYacpSi7O7bf1SeZExHXMimiv7CxBDBPRVjvC+AYZ78D2T8rwhmN/3VKI8apl
-429DPV2v/pEl8YZeDWeO3+vdAM7FQa/+WXtI9w7zKAoypFye05Py9OhneGcBKGcD
-Zho246SoJERYut5llR6nkzqKf/gPi3dYmSqb4V5U07yiojtastPjUBO9oJAMMt+h
-QAIGHJhMj366TDRaW8hdDHjaQfGzis/ZQgvqxsqlpdjZTqOpAacclimsbh+RNwBY
-iTaEGmmzw0bmPxhDerrux2biqqpny57e4AMP1p528/xwgtF57sAKfUZ+5cJmu8kk
-r7k5E6oiQIiMe3ujFt4KCVX5QbeTsf62jyZ3vVHUNfDHYIatI/vy8hNuEN3eTw2y
-GMxNmsyZjxfZNdCbo/+6rmK3cE4opsxFc7BMZYc6IaHJ3mPgdHhXd4Bq5HOAJAXS
-uLPFFEDpYC18BYYMsRjpdc63+jkJYiKBSQHXES4gnIvN9X7GkPlM8sbH22U67nIb
-bWllLCTBpCOvAgMBAAGjUzBRMB0GA1UdDgQWBBQ1lVon2lnw0GDNgx6cRokXAwtK
-yzAfBgNVHSMEGDAWgBQ1lVon2lnw0GDNgx6cRokXAwtKyzAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAA8w4NuWkKgs7AvQAdiodcqMq0e3dQgnGI
-ZC5xSMfr6iOfFkp2limim19J5JY0xPK4NNUgVWpuArZ7VY9eg1OpvL7NPaPZF4dC
-7DIbso6faZyP5mqWqZIoRfrZCX/zRQsWDUQ79/YcDGqEt39kwuc+ZI+swVkoVNi9
-QaA6qyzKd5IQ+kXKSht7N37+rj/XvI6Beqqzl+v5aX3b1QHVA3O1/A//KkIEVDiN
-4FJQPATmNbzyAcW8HFCmsgn6/+p5xKgIQXPbtbUPXXpoJ7IbPU1QbrxlnjsyD+/U
-PsyWPjlP6nP1w7GObWDkbE9W9f3TP/wRkQuf0FV0Nj/8CVDa088MQhdpWqovg+wo
-syciIWNrgtvN4u6+VdJ3HYDlVKGj3p3vkr8cJPXWXWqFLmL40mKZFq85Qmw2kkv+
-793QkjFtBibQwQr0JM62yz1FmX9/bvGXMyy6Y286XAZT0nroKaegqvhk8WnKOLzm
-4bNeJ630MQoiYnRdH14MRS6nsU58+HkhuNm2n9K2L9vblC2Q2PKuTtnpHB9szLlB
-FMfj8vdeNgpJz+o08TQ2Yg9woX4jBX8LAPI4xG04GPIZUbrrpeYreVCdAuNtDVrk
-0hvza9fwTghIW3diCvTHJ9mZA0JxqCHBqjgjfanLorbr27FbY9mQtwbcG5xagnot
-bn4dcALpOQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUE2xnj8gjIi/2p3JZ4rEhFVShtx8wDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjIwNTIzMTIxMDQ2WhcN
-MzIwNTIwMTIxMDQ2WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMNV5YpT9Dtnz7Gn85ndJhOgcFEe/UFy
-Po0T9BT0BbdoOP9asSae7xg3rqxgkSfL9MTc/W75Q5mxqqXySXPBx4pkTmYwx+6p
-v4nNOyAsxfg68q4eXjTC0/ylwIv1EqvGMI/0/yyHtde/WvxCwFGnOlLtx/T7iclm
-/5zPYacpSi7O7bf1SeZExHXMimiv7CxBDBPRVjvC+AYZ78D2T8rwhmN/3VKI8apl
-429DPV2v/pEl8YZeDWeO3+vdAM7FQa/+WXtI9w7zKAoypFye05Py9OhneGcBKGcD
-Zho246SoJERYut5llR6nkzqKf/gPi3dYmSqb4V5U07yiojtastPjUBO9oJAMMt+h
-QAIGHJhMj366TDRaW8hdDHjaQfGzis/ZQgvqxsqlpdjZTqOpAacclimsbh+RNwBY
-iTaEGmmzw0bmPxhDerrux2biqqpny57e4AMP1p528/xwgtF57sAKfUZ+5cJmu8kk
-r7k5E6oiQIiMe3ujFt4KCVX5QbeTsf62jyZ3vVHUNfDHYIatI/vy8hNuEN3eTw2y
-GMxNmsyZjxfZNdCbo/+6rmK3cE4opsxFc7BMZYc6IaHJ3mPgdHhXd4Bq5HOAJAXS
-uLPFFEDpYC18BYYMsRjpdc63+jkJYiKBSQHXES4gnIvN9X7GkPlM8sbH22U67nIb
-bWllLCTBpCOvAgMBAAGjUzBRMB0GA1UdDgQWBBQ1lVon2lnw0GDNgx6cRokXAwtK
-yzAfBgNVHSMEGDAWgBQ1lVon2lnw0GDNgx6cRokXAwtKyzAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAA8w4NuWkKgs7AvQAdiodcqMq0e3dQgnGI
-ZC5xSMfr6iOfFkp2limim19J5JY0xPK4NNUgVWpuArZ7VY9eg1OpvL7NPaPZF4dC
-7DIbso6faZyP5mqWqZIoRfrZCX/zRQsWDUQ79/YcDGqEt39kwuc+ZI+swVkoVNi9
-QaA6qyzKd5IQ+kXKSht7N37+rj/XvI6Beqqzl+v5aX3b1QHVA3O1/A//KkIEVDiN
-4FJQPATmNbzyAcW8HFCmsgn6/+p5xKgIQXPbtbUPXXpoJ7IbPU1QbrxlnjsyD+/U
-PsyWPjlP6nP1w7GObWDkbE9W9f3TP/wRkQuf0FV0Nj/8CVDa088MQhdpWqovg+wo
-syciIWNrgtvN4u6+VdJ3HYDlVKGj3p3vkr8cJPXWXWqFLmL40mKZFq85Qmw2kkv+
-793QkjFtBibQwQr0JM62yz1FmX9/bvGXMyy6Y286XAZT0nroKaegqvhk8WnKOLzm
-4bNeJ630MQoiYnRdH14MRS6nsU58+HkhuNm2n9K2L9vblC2Q2PKuTtnpHB9szLlB
-FMfj8vdeNgpJz+o08TQ2Yg9woX4jBX8LAPI4xG04GPIZUbrrpeYreVCdAuNtDVrk
-0hvza9fwTghIW3diCvTHJ9mZA0JxqCHBqjgjfanLorbr27FbY9mQtwbcG5xagnot
-bn4dcALpOQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-proxy.drive.test.sunet.se/Saml2SP/acs/post" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Administrative</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SUNET CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-proxy.test.sunet.se-shibboleth.xml b/swamid-2.0/idp-proxy.test.sunet.se-shibboleth.xml
deleted file mode 100644
index 0ee0a4ba..00000000
--- a/swamid-2.0/idp-proxy.test.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp-proxy.test.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-10-25T15:33:50Z">
-      <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"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://idp-proxy.test.sunet.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>idp-proxy-1.test.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-proxy-1.test.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEHTCCAoWgAwIBAgIUB/sxpk5CvANYnwpfP21edPgXvTwwDQYJKoZIhvcNAQEL
-BQAwJDEiMCAGA1UEAxMZaWRwLXByb3h5LTEudGVzdC5zdW5ldC5zZTAeFw0yMjEw
-MjQxNDA3NDZaFw0zMjEwMjExNDA3NDZaMCQxIjAgBgNVBAMTGWlkcC1wcm94eS0x
-LnRlc3Quc3VuZXQuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC1
-KbN/WcN3kr3m0P6cLxg0AMIv/dOSQbmYj7rAolmWUHr4psCpYDpo+eyMaS4kBFrn
-KbSz7+rWOi3gdSJZUz4NE7d2Ww1uBucoGnLOloqYLq20whAwTU9EtrMXvv+D43rx
-x9gJxZGIeFNpGo/0xAjdtXiUIjBA+hWwm8LvncyFsSV7LfjhggZu8Su/LU4RocqM
-3mIcZyfIT2MWH9IWRINdhbgjCCSWYaKuoKdniWHb/+wp2SjUxcoJyA3bcQgoXyAZ
-b/UJx40DjldWaTIQoKthwQTOdn2BrE8/vSxhAIdJXEPLnYTIuUh0jika/aNG49QZ
-2xuY0Bew1enB/yX5WSHwAZzACSpONBOadx+4zfJrr1IDYkyNR1qIdMCddO+vN+n7
-YMq/Hk66IS6nfBi/3/dm9j4VaCyfFPJI0cvQ5NXGiaUimtvoSK/LzS5oIA7Ew1UU
-xdFmO28Jji9qmxokuv349zrM6Uj88Fi5bOe91V6/i3i+8QtTDgDKxckXCZAwpP0C
-AwEAAaNHMEUwJAYDVR0RBB0wG4IZaWRwLXByb3h5LTEudGVzdC5zdW5ldC5zZTAd
-BgNVHQ4EFgQULWwdE5s3x9SGq1N797eb10Kr48QwDQYJKoZIhvcNAQELBQADggGB
-AEiTZvEBDBVoNo3pzP6N+JgelKYYkOFwbcV2pgUEjpTPnJOXYsY5YsE3J093J+UF
-fy9YqkR+PrK/azOd2763SaBDjDYTkdvLCCUJhdHNwSQkafU2psWPTsAe0uqvFUPw
-7K/WdEG6UWi9DimJGbjZjEEWFGQbbxw0tJ35l2o/R3+X6Hd0hIddcfrY/glTWSQN
-KyOd8BqBiiuo2GAsyo0YdIclROhXAR+Ix9hAsKBl/05D3f1nRQa2hPaPugH0AXuq
-EkJxG42AnzuHDcBIzcsOlb8vzfFaq4r3WXBn/+zGhVXZk/D6L59s+FcdN0a243NG
-aL42e2/JwSHeI+rYzxA1fJYokQXjn/NaURkMnxeaQb00judcMzVaHGdPQlazxHY9
-3vyA7nfY1wXQdci/KwgSAZ6qApBrCuvkCz9NsUShw30AGSmN6ckHEQzFzF19PyBD
-Nv/+GFKBH2fYKldCZLejoonbNPQjXfQlA9DC+Vb83N8boYYzvPPuBe/iZmHPnZSK
-pg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>idp-proxy-1.test.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-proxy-1.test.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEHTCCAoWgAwIBAgIUUrTewyCMMWV/IurG9Gp5nQce3+0wDQYJKoZIhvcNAQEL
-BQAwJDEiMCAGA1UEAxMZaWRwLXByb3h5LTEudGVzdC5zdW5ldC5zZTAeFw0yMjEw
-MjQxNDA3NTJaFw0zMjEwMjExNDA3NTJaMCQxIjAgBgNVBAMTGWlkcC1wcm94eS0x
-LnRlc3Quc3VuZXQuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDF
-Z2Sf9xH4imFrTvOEjVxGoV4WqIjIrb2c1Ay/RiJk/E7IcYQQVGC0gO6NjPrknzfo
-8aWKa6hlgbmCWf6RwlsDQPBgVGOBhm85/zG5NMUNP1ha9XLmTjUSeFUL27zHcT66
-YlAfwfSfEpezzByYg1Y1Rp/+w7dsLrfbpkqosDvaDG1HilbJk76BUYzKKR4iPgMY
-xBvjgzfpyOYLXjeSw+/rqavfbfuTD7fuxu0xHUB/BMveLXAc9cwV8CNytVzrxRz5
-hEgqU7sajZTGF4P3eTnB/yELKFLoHSri2EuHfxrKIwAeBVHSbkhOL07VFkqxQ78F
-fQY6mnV+3tZQl2NMAb7avqHUaCr5ep8NkDXXQrXPBgb5UpyDWX/W7lz+u1VKZdW9
-kC7IdNATfiDOZ+IoFwu39Ooev7To4fGhr4dBcK5m9Cjylq8P2tsxBoYXLFXVhynv
-UQqD+piuLE6Jsx/hrREYi+uyfY2JfK2pq4TF7LsGQuP9gkUvewIRWTcwOZeJe6UC
-AwEAAaNHMEUwJAYDVR0RBB0wG4IZaWRwLXByb3h5LTEudGVzdC5zdW5ldC5zZTAd
-BgNVHQ4EFgQUJ2aJ0bRK0VXQroVaaVfj9v2+6ZUwDQYJKoZIhvcNAQELBQADggGB
-AIPWEjMQZ+mpsvvfeidgs9txLHYAQ1Qr8kiG+5M30zK51RmzberE+xuQ6FVln6tD
-pfufBp+HRYkqaqo/FEZf7O5LUzkdmD63yZiVkMaJfq4rMg1fZIN/LWTU3L3eJEXY
-3H6QtLgEMA1QNU0gEz9T1pDQktNaTIJw0I2oxOcsKzOWyyS4fQrXzUZ4JGlbasqv
-WAkyk9+c0uSxg15heOvks0R+LuiSy9HBAYw7y7C9TbCk+8ynknbJo7mvO4VTAVYp
-azMIeSD/goL61NQSjfejVxYSKsOKxLEUWURH6AXZpkDUPNAmiVjVqu19zTf+HCGd
-52g3fLErLMv4g6V14C+okHx21uFk7c7y0mmO2hhgBmakIk3lPe3TXwy6XaWTujzo
-oznnONxouqLL+uFy0Oetc4EbUcFpHT3Gs0pw6+7XojIJD9YE4A8/ovfB5Z7sluhe
-9hv7wp7Q4i0QTM+QYykFAz8UTmHUXosLh+GwCLWNqvSijp0Er9IcSL96vZPh6OCq
-Fw==
-</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="http://idp-proxy.test.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://idp-proxy.test.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://idp-proxy.test.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://idp-proxy.test.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://idp-proxy.test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://idp-proxy.test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://idp-proxy.test.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://idp-proxy.test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://idp-proxy.test.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-shib.slu.se-idp.xml b/swamid-2.0/idp-shib.slu.se-idp.xml
deleted file mode 100644
index 31a04b99..00000000
--- a/swamid-2.0/idp-shib.slu.se-idp.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-shib.slu.se/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-13T10:19:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://saml-error.slu.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">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Shibboleth Identity Provider för SLU.</mdui:Description>
-        <mdui:Description xml:lang="en">Shibboleth Identity Provider for SLU.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://idp-shib.slu.se/info/om.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idp-shib.slu.se/info/about.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idp-shib.slu.se/info/integritet.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-shib.slu.se/info/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="102" width="102">https://idp-shib.slu.se/images/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="102" width="102">https://idp-shib.slu.se/images/logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>slu.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEJzCCAo+gAwIBAgIUZwFc9nyrWtX7X0Z7VsMOHadCW18wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxNFoX
-DTQwMDkxODEyMzIxNFowGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
-BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsR3Ce/qb3iyn/SE0/4NBDez7pTv8
-WXJIMSBxCpjhAqj9N5rdcZpTnuQCVOHRuojT95ng6wXxZtRqcvmtoOu+YspV+GVi
-iK2zOR321TQd24Bw4Jym5JJ8exUaTzXEdRZ8iEx1vbKuISVKRzNkYLpbRFwWmtwZ
-4NsXZZ8HaTjPvDcWdPnhL6DKgbNgIX5WMML3bVZw5X6GzjRtfgruB6urkwPH0K2W
-NumhbmABvs3uFzDL28OZ9aYBL9w6oY9/KntsfQeROWaJuQDULmlW/mS73DD8bX+r
-fAweoGbNfa390nxkBnhlsONsbQKM0mQaTRKaHcfxRXndHgsxeuP1O4zQK3Lw0be2
-fw1vcpLhtdUxCaUsyVj1zfU9Z15LdyKd0zSe0prbRm0Zpgew3ZDq9IRabuo9dnXa
-ExtFuFZdNBotUiKFRyvurKP+8f/6pgjc4Cdf+NeOiOIvoEhrna1hvUWydfFk41X/
-BPdWZeKJ6d0ohB81MTGMzx1CwENzKzAzNw35AgMBAAGjZTBjMB0GA1UdDgQWBBTv
-eHIkHnbocyEjglf8XgFUXRVLWTBCBgNVHREEOzA5gg9pZHAtc2hpYi5zbHUuc2WG
-Jmh0dHBzOi8vaWRwLXNoaWIuc2x1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBgQCTmD6u4TVtBD0+317QyjnjtigT9mV6eQh27j3EioDbsUPKRs9x
-D8QDqA365v0puxUxR5+FEuyLP9KReMH9ChPxLAjmWS27R/9QnBP+ebly+IHyzbsU
-3kdekOs0nkr22ARBOoJ9PvRRWoq6t+c1G2rDiBTVhQqDfl9+miPbPKHvWt3/GYl8
-MhcOijELu1QzaOUFg3bel01emigFy8eikvHdNmU8LEqbwdl3/bzR0vLnTdCTZzRS
-ft3olZwcny84Nx6Ql4Emmpwy5+UBth7tny+l3SeeaPIEcCYP3bMoODjOyhYu8zoo
-GJBaVeOOmSKCrscIVIjwF5gwJKjY8ewSHw+57Qk7oApOo2RHHy1+XCkd7djLxLeJ
-ufIV5d7gdyWrCh6cM53cqU5lJQF/UM/0QCtpeg6Ld8LpnX+qlfZLObzE+LN4lrcR
-SktSFtsAxKMkt86J5whFsuM11acH+UzNI38vNEzHhrlVPdqr9Wfi1kwn+sO3KMe4
-wPg6Xtq8Rb1EphE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEJzCCAo+gAwIBAgIUC48PxjALn7sXgB/pTvkwu7185A4wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxM1oX
-DTQwMDkxODEyMzIxM1owGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
-BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAip5MBDd8vgTvs9n2egO7WrcekJu8
-oE1lc0S0mfKgJx8/B3L21p2AeNJ5bpCu1bfseMG+LGVk9Ak0gVw4bC3k1BDqgr9l
-XVoQsoBm9akJQkFE70Dn5YKp69ElZEK1lOW+sdOZ57ZYieUJ2EUQtwzuQraofARt
-giQOck8cQ1pMuWwGpt56FlQiIfte2eP3UFdosdO+HZovnuudC+FSmFs4fZK44nuL
-I4NIs6x5kMroMRPj28TZyiDFhqc5OacvTISqknIAZibEvVgWjwozUWHfZCxiz8jf
-myRDqxiHXrAw9OSweMhLYVtuvgMjinmLp1qKH8Xyo6zcbnugadSbiWtN+plGJOdD
-3H3mKSMGVBhC/fJ3IHLb8jNoM2F0fI1j+t5AAhXgmHrso1UCH51j2eKZCaEnco2A
-sFTJFQH1dx7z3vGBwbBGN40L2+E/9Muy4OhktTq5S8Q3FwSQKfL7gTsnGaEGVdAX
-Bd1GBBXmPSdDEoG4OD0uBrU9W4guqUsfhfKRAgMBAAGjZTBjMB0GA1UdDgQWBBTr
-BKReDs0/3v2lO20AjqHW/BvwRzBCBgNVHREEOzA5gg9pZHAtc2hpYi5zbHUuc2WG
-Jmh0dHBzOi8vaWRwLXNoaWIuc2x1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBgQBU9FjUNNd+j0zM0d5d8E7PaSBr2Ur6obOtRkK1OvgVXwzyVzLW
-F4Nt8wH1TnVoSYS7rkaaXfZyUxDdZidOX8vlY437C1VrJj1lhDfL+JyZWvP085v8
-37ayXrUbQZ0O8mI3y/JtvbnmvCaGACDHO1BdCNF0a7Grgnchx2LpFJBeeISiJDQA
-HQ/WWsWm55wBUKjOmSR1OwdpaqjhfEbSjz0EEwpvtpdhyOvhOmcRsUufyS1E1u3L
-i6MNP47jwhxYb5mSxS/ztV3bvVAESh6hzlgNUzvhfCkZqMvcYKbaOole6dNjK1mF
-Y3Dry6gqRyCsKHGJMm//vdtfLarTLv5y7H1ZHAGxRikyWS+Y/iziFPY2npJizkyI
-6HlPnaQZM1Vuy1Oreottr929cyUQqonWt6+b23G2WbAbOab9uKWPMLe4tOBiiDE7
-ujeic7u2uPDoyu8mYgS3r++bjQrfqRRo/wYI5VF/n3KSFkCXZPx3CxbkMJBG6JeA
-UgKStld+SURLHX8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKDCCApCgAwIBAgIVAJFX5qhjYlrtgOfgtb57wSa/EhuQMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTAeFw0yMDA5MTgxMjMyMTRa
-Fw00MDA5MTgxMjMyMTRaMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAI+DF3Vz6IlU5hxi+a3718iunTb7
-otIKbB4q5xWeFOKawlzQ1yLHe1BoNAb7tMc2X07804OxZblqh3SEjBexPv9Of/7f
-iltbRWyKGskjqVyskxzuk/H2sv3j9jKF+umWvTjb4t4RDpLjagYWti35hOvBXM5A
-bTSphHapUIcEowaQ1echecNQUOoduqntM4mZzEAMCEdtoNk/Tx9fOoo2avvkKwBs
-6ITxAAe4FVReVR93o5vMTwkV1nbPniwqHYURivRhudg8z5Y3Eq3gvA4ZvWWUV0By
-UKVhdQ+1QVCjMTfmIbO3BS/nASreTWWzINtaU1bw8x5qnePRFwnBAtykoet0hexx
-HDL/v8n8HrMP8iG+ymWII0gfKq5pNuDf2yTpnxNkzW07JcJRaMIORy2dfts3VvpG
-8SlAT71k4F6aPIyNEVQwyaGvtcYVB8Lnr0DhXszrSlUCmRATepYHOZib06ieSph9
-wTxKMlcjFUCH/EAvLD4C/qF+NKgcsuFt5QHMTQIDAQABo2UwYzAdBgNVHQ4EFgQU
-lPxFc2SumHftUVBWOKqt5OaNJb8wQgYDVR0RBDswOYIPaWRwLXNoaWIuc2x1LnNl
-hiZodHRwczovL2lkcC1zaGliLnNsdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAYEACKA9LILXqOIYgumpfeohy8ft3l+h33NPGPuXXlViwm1v8uWo
-ACRvrARooOllmFaDJNrilHGSi34bYnLIeSpqhYzLc8tauTP/jwmHdq68WEQdC0s7
-uhC6O2JBdhgpUGXMpjuPuuwH6DdXHQymYMjGNDl4NUwl7N3Hod8sJjl30HpJ7f4/
-UV10MuCAh54MWeBHo2ooxEsgYU06qvkT+hO5tAtgR1vDHLoPBqMgPhY/PjsxF5WG
-SWe/AdSARRe4hxWBNwHSo1HlrpG/Gobhh/yluvSVLMd8BNdjKWWFaSwNCe0tw91U
-dt5jXfcmrDtr6sRuHoEmrm27lk9q4cj82Do1f5q79v51jYMtITNOpGZlx5Dskmgk
-cJo78+sWNUwKDrCtXE6e6hs8W/RD7VDZtP7OIvCVZpjCodjoiPdz8zOirIFcahPf
-jHiyDn2ImKKJdsVU8n21d7aEShNxDviRnRhiZaILmaqVZHvslZq32XNbgZTPySWL
-ffEVzH+iKOe5hd6R
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shib.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shib.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shib.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shib.slu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEJzCCAo+gAwIBAgIUZwFc9nyrWtX7X0Z7VsMOHadCW18wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxNFoX
-DTQwMDkxODEyMzIxNFowGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
-BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsR3Ce/qb3iyn/SE0/4NBDez7pTv8
-WXJIMSBxCpjhAqj9N5rdcZpTnuQCVOHRuojT95ng6wXxZtRqcvmtoOu+YspV+GVi
-iK2zOR321TQd24Bw4Jym5JJ8exUaTzXEdRZ8iEx1vbKuISVKRzNkYLpbRFwWmtwZ
-4NsXZZ8HaTjPvDcWdPnhL6DKgbNgIX5WMML3bVZw5X6GzjRtfgruB6urkwPH0K2W
-NumhbmABvs3uFzDL28OZ9aYBL9w6oY9/KntsfQeROWaJuQDULmlW/mS73DD8bX+r
-fAweoGbNfa390nxkBnhlsONsbQKM0mQaTRKaHcfxRXndHgsxeuP1O4zQK3Lw0be2
-fw1vcpLhtdUxCaUsyVj1zfU9Z15LdyKd0zSe0prbRm0Zpgew3ZDq9IRabuo9dnXa
-ExtFuFZdNBotUiKFRyvurKP+8f/6pgjc4Cdf+NeOiOIvoEhrna1hvUWydfFk41X/
-BPdWZeKJ6d0ohB81MTGMzx1CwENzKzAzNw35AgMBAAGjZTBjMB0GA1UdDgQWBBTv
-eHIkHnbocyEjglf8XgFUXRVLWTBCBgNVHREEOzA5gg9pZHAtc2hpYi5zbHUuc2WG
-Jmh0dHBzOi8vaWRwLXNoaWIuc2x1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBgQCTmD6u4TVtBD0+317QyjnjtigT9mV6eQh27j3EioDbsUPKRs9x
-D8QDqA365v0puxUxR5+FEuyLP9KReMH9ChPxLAjmWS27R/9QnBP+ebly+IHyzbsU
-3kdekOs0nkr22ARBOoJ9PvRRWoq6t+c1G2rDiBTVhQqDfl9+miPbPKHvWt3/GYl8
-MhcOijELu1QzaOUFg3bel01emigFy8eikvHdNmU8LEqbwdl3/bzR0vLnTdCTZzRS
-ft3olZwcny84Nx6Ql4Emmpwy5+UBth7tny+l3SeeaPIEcCYP3bMoODjOyhYu8zoo
-GJBaVeOOmSKCrscIVIjwF5gwJKjY8ewSHw+57Qk7oApOo2RHHy1+XCkd7djLxLeJ
-ufIV5d7gdyWrCh6cM53cqU5lJQF/UM/0QCtpeg6Ld8LpnX+qlfZLObzE+LN4lrcR
-SktSFtsAxKMkt86J5whFsuM11acH+UzNI38vNEzHhrlVPdqr9Wfi1kwn+sO3KMe4
-wPg6Xtq8Rb1EphE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEJzCCAo+gAwIBAgIUC48PxjALn7sXgB/pTvkwu7185A4wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxM1oX
-DTQwMDkxODEyMzIxM1owGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
-BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAip5MBDd8vgTvs9n2egO7WrcekJu8
-oE1lc0S0mfKgJx8/B3L21p2AeNJ5bpCu1bfseMG+LGVk9Ak0gVw4bC3k1BDqgr9l
-XVoQsoBm9akJQkFE70Dn5YKp69ElZEK1lOW+sdOZ57ZYieUJ2EUQtwzuQraofARt
-giQOck8cQ1pMuWwGpt56FlQiIfte2eP3UFdosdO+HZovnuudC+FSmFs4fZK44nuL
-I4NIs6x5kMroMRPj28TZyiDFhqc5OacvTISqknIAZibEvVgWjwozUWHfZCxiz8jf
-myRDqxiHXrAw9OSweMhLYVtuvgMjinmLp1qKH8Xyo6zcbnugadSbiWtN+plGJOdD
-3H3mKSMGVBhC/fJ3IHLb8jNoM2F0fI1j+t5AAhXgmHrso1UCH51j2eKZCaEnco2A
-sFTJFQH1dx7z3vGBwbBGN40L2+E/9Muy4OhktTq5S8Q3FwSQKfL7gTsnGaEGVdAX
-Bd1GBBXmPSdDEoG4OD0uBrU9W4guqUsfhfKRAgMBAAGjZTBjMB0GA1UdDgQWBBTr
-BKReDs0/3v2lO20AjqHW/BvwRzBCBgNVHREEOzA5gg9pZHAtc2hpYi5zbHUuc2WG
-Jmh0dHBzOi8vaWRwLXNoaWIuc2x1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBgQBU9FjUNNd+j0zM0d5d8E7PaSBr2Ur6obOtRkK1OvgVXwzyVzLW
-F4Nt8wH1TnVoSYS7rkaaXfZyUxDdZidOX8vlY437C1VrJj1lhDfL+JyZWvP085v8
-37ayXrUbQZ0O8mI3y/JtvbnmvCaGACDHO1BdCNF0a7Grgnchx2LpFJBeeISiJDQA
-HQ/WWsWm55wBUKjOmSR1OwdpaqjhfEbSjz0EEwpvtpdhyOvhOmcRsUufyS1E1u3L
-i6MNP47jwhxYb5mSxS/ztV3bvVAESh6hzlgNUzvhfCkZqMvcYKbaOole6dNjK1mF
-Y3Dry6gqRyCsKHGJMm//vdtfLarTLv5y7H1ZHAGxRikyWS+Y/iziFPY2npJizkyI
-6HlPnaQZM1Vuy1Oreottr929cyUQqonWt6+b23G2WbAbOab9uKWPMLe4tOBiiDE7
-ujeic7u2uPDoyu8mYgS3r++bjQrfqRRo/wYI5VF/n3KSFkCXZPx3CxbkMJBG6JeA
-UgKStld+SURLHX8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKDCCApCgAwIBAgIVAJFX5qhjYlrtgOfgtb57wSa/EhuQMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTAeFw0yMDA5MTgxMjMyMTRa
-Fw00MDA5MTgxMjMyMTRaMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAI+DF3Vz6IlU5hxi+a3718iunTb7
-otIKbB4q5xWeFOKawlzQ1yLHe1BoNAb7tMc2X07804OxZblqh3SEjBexPv9Of/7f
-iltbRWyKGskjqVyskxzuk/H2sv3j9jKF+umWvTjb4t4RDpLjagYWti35hOvBXM5A
-bTSphHapUIcEowaQ1echecNQUOoduqntM4mZzEAMCEdtoNk/Tx9fOoo2avvkKwBs
-6ITxAAe4FVReVR93o5vMTwkV1nbPniwqHYURivRhudg8z5Y3Eq3gvA4ZvWWUV0By
-UKVhdQ+1QVCjMTfmIbO3BS/nASreTWWzINtaU1bw8x5qnePRFwnBAtykoet0hexx
-HDL/v8n8HrMP8iG+ymWII0gfKq5pNuDf2yTpnxNkzW07JcJRaMIORy2dfts3VvpG
-8SlAT71k4F6aPIyNEVQwyaGvtcYVB8Lnr0DhXszrSlUCmRATepYHOZib06ieSph9
-wTxKMlcjFUCH/EAvLD4C/qF+NKgcsuFt5QHMTQIDAQABo2UwYzAdBgNVHQ4EFgQU
-lPxFc2SumHftUVBWOKqt5OaNJb8wQgYDVR0RBDswOYIPaWRwLXNoaWIuc2x1LnNl
-hiZodHRwczovL2lkcC1zaGliLnNsdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAYEACKA9LILXqOIYgumpfeohy8ft3l+h33NPGPuXXlViwm1v8uWo
-ACRvrARooOllmFaDJNrilHGSi34bYnLIeSpqhYzLc8tauTP/jwmHdq68WEQdC0s7
-uhC6O2JBdhgpUGXMpjuPuuwH6DdXHQymYMjGNDl4NUwl7N3Hod8sJjl30HpJ7f4/
-UV10MuCAh54MWeBHo2ooxEsgYU06qvkT+hO5tAtgR1vDHLoPBqMgPhY/PjsxF5WG
-SWe/AdSARRe4hxWBNwHSo1HlrpG/Gobhh/yluvSVLMd8BNdjKWWFaSwNCe0tw91U
-dt5jXfcmrDtr6sRuHoEmrm27lk9q4cj82Do1f5q79v51jYMtITNOpGZlx5Dskmgk
-cJo78+sWNUwKDrCtXE6e6hs8W/RD7VDZtP7OIvCVZpjCodjoiPdz8zOirIFcahPf
-jHiyDn2ImKKJdsVU8n21d7aEShNxDviRnRhiZaILmaqVZHvslZq32XNbgZTPySWL
-ffEVzH+iKOe5hd6R
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shib.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shib.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">SLU</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SLU</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.slu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.slu.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 18 67 66 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-shibtest.slu.se-idp.xml b/swamid-2.0/idp-shibtest.slu.se-idp.xml
deleted file mode 100644
index e877439b..00000000
--- a/swamid-2.0/idp-shibtest.slu.se-idp.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-shibtest.slu.se/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-15T11:11:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp-shibtest.slu.se/idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SLU Shibboleth Idp Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SLU Shibboleth Idp Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test Shibboleth Identity Provider för SLU.</mdui:Description>
-        <mdui:Description xml:lang="en">Test Shibboleth Identity Provider for SLU.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://idp-shibtest.slu.se/info/om.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idp-shibtest.slu.se/info/about.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idp-shibtest.slu.se/info/integritet.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-shibtest.slu.se/info/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEOzCCAqOgAwIBAgIUMhPoEf2KNEEQzETZhaUha/CQmD8wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU3WhcNNDAwOTA3MDg1NzU3WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALv1eV6CikXVLXZb
-KHh4Q10LMg0l5AVA72lgdWVVqRH1j0VKzuqWIqLDqh5CRYG801uMhv5s2H7ewo36
-fRFIk9Omh53We4d0yB7BuntBRjF+O469vsGcLVlS2bsOK1kZZNGr5hYZQELc9qhJ
-fa7StElIYAnQxkXxIY1aWdnVToEs7gjDkJWdQ4MJDywW/+Kg+e/7kZktteeqoap5
-hFmsq9inZpm11fGtUWOI4fl9TXlZy6X13x5lbDxFNnvF6HRtjafQjRmYx4uLN5+g
-IsaFIuguPa/9YnQN8cj0pFRmIROsKAJ5dO45Pi4iY4AqrnT1v7/wnncud+xll26Q
-fpq8QDguWf+4KNkt51TWkb++rEJroeTJH9d1iMqAO7qoKthNF6xNVqxN50MApiuO
-Y3wEmrBiW9s3d2sTuWSFB0atj+y3KIZsAWmYJ0Gdl8y3YAERHLfZE1hWKrCgobWF
-c9QdjQkteld7DLXcb9o1fS+Z8rYmTG7Lw4C22g2Tkb75Qh/QSQIDAQABo28wbTAd
-BgNVHQ4EFgQUbWNBoMNHfn1aHUjcXRxZpefoPLYwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAEUQKnyHXUy3FiRsHi+QcJFJ
-+4j+wV7FjcAoqYnCZ2BGMJvqyaFOHcoAvWZaYANMW57wDpBCHeY8pC8nc0RkbJkx
-1mREdupEtsztvNxwAzdpkEf2Cs4w9m3N0ik2A3jGGcKYTqkmEfwz74ZKfOo3ctU8
-CdYsBNVA9CGxNQmvO7sgdC+rOjj4r05as/XczXHwKAwjnuQnOgTGoimNYAqvIM5q
-+uXtqeOzTB2KGW0ZnMuCtKXyVlXcBFFoSK9g7d6perZMZDueS1+/n5VxQyI9wh2n
-qX2ghl3ZLngKmPK+CZSBiLRYPqmzaBglFHEP+zTDWAkauajY3YFsVBUKmRdXOuEq
-6bBj5Cvi6v3GqEosbFsdoUqOZphdbyUuo78Irg+TijAXat+VM5YA/YWjoi9buexe
-rbmBK2bCILRtcGsMPk3uMUsq0Jn6LYrHLzCl1ZRgG6HHwGXrbBqdanHGHoJGACtC
-lPXa9r98Vs7bLrP/b11343DbP3bvznNhmpqeaXtU8g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEOzCCAqOgAwIBAgIUHBOJiF5eItVmpwaAbONnSJwedN0wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU0WhcNNDAwOTA3MDg1NzU0WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALKMy258/b8UEUfM
-HxDnWqQnH6hsnVOS2G53+fjiyasQicAYdc4ov0UzhoNPSpIb/pWLFZ07p+NjoILf
-Ksq+6/lzcYgLrBbpuqAdLl90slWZb3avSJZ1tkCo0JiC6zaNJw87idR8nTzgWOcQ
-RIlCeaXMvV+je1i8k3+LLUn0P63QLDT1wW5N6ZErtnSQEsenjnrH/a3lBtX0DSmU
-j/UO533iIvBxniPbNDIgVDWC8waQrDjk1hV9Omj6/xJwkKUNIVLR9XT+33232Fgn
-BGm8TbOFbEEv15GvaNLZdfXSTiOErGFYSKU58h9Nzdmr8oZURY4Cu6CENhOhZEYV
-O77RwkiuXB5vb+pgO6FFn8SFsF5JPtztGxVKMfI4y3DcaOhcmk3/UHakzzU2pmBW
-ac73M2q/JWwkMtvmoi8B65+Px7lMvBbkBVELyozBhBlu+QD6ArgIoH9AAbpaweR6
-LhDD5P1Q3FvUdtM+5QoYEgMRrpSfKa+8bp4EM5vtM4Yr5zOWhwIDAQABo28wbTAd
-BgNVHQ4EFgQUr4Sd2lM7XCQTyxNh9CFlfucGngYwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAEgDZ/DH8eavLtPIJLTsOiZK
-VXpJenizgbSHagPKeP/dQRv1MDpcVAB3hN8YmOO2tbzGyc5wcBPfC7qvMIUozlBR
-iiHTro+l/KZlE5S0nDxTsunVo3y3L1+C+KRhcFmMHNRwI5KArVVl+SiT2YEPE+oO
-lNVbqs1y3baFvZdCihDdgC9toS1idF8WxopxNhoFwzrly0d19NMlaOhsPUvjo2Qr
-O5AvgTSPdY8UzssqmE5add93yeMlkbDbLgDuLmOf/MT0Q0DQGOpVy18Fs9nD9iwz
-BtgLIW+NSUEKwSIbAquFIxcNJLwDlvdLkmreRxrcr1Q3TnUsT0dqyk0Be9wMukQm
-zwC6BS/r7dT3EKRlywxxmVr0V6TzeXbX2Ibspjndp7zQz3hb0not/IWUEMvZojgO
-50NDCxzWH5CWdUuN1hvAVcruGwJ2UKbgQMAf+3K6kgUeWwbSo+ENo52Mr4jsOdcj
-fMB48s6r6Avb5RBLRXFVossgJmxgi5Kp35LVkrkFGA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEOzCCAqOgAwIBAgIUVCdXGKcOA0mTcBW9/9WpMX8CNWQwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU2WhcNNDAwOTA3MDg1NzU2WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIoI0cm30Fp2N4Bv
-sieqDs69dulkqXkl5L7PlIyCAfZtCiO7Ozc24UgfqEbzEnc2C0Ld7lVdKiFOhbh3
-ot2vjyR6Di0qhlV16WNWol/nqCksNkwVjPmGym8oRAKo/CwrCXVF6t6JBRk5IzN7
-FdydSSBmgiw8YIpYQsPIqpghirVXfn8cCvxAnFX4Sax3hZdB667KLPN6gD5srBQI
-uapz/Y7Nr9P7hAdDWPRsGyY9TBGjtMmlWjzwEZQ1sBaUatOzgyEl5Y4C9Q3P8N36
-yTdTkHNy59EHma46dLSCRTe+qZsiIZ2uyRaPU9GdNHGUlKv8etiyUZD1AKOq3/Oh
-kLTELnv38910VtSp715nvcFFlwhcvo8fMh2cnp24HSn/YfBgE7edTpSfVQLdGd9g
-PMTB9JG9WgOnU98BVdisTJiZsDPbHkjiNEEkzhO2AgrhG+ZVrhKlcqrozjhI1sKE
-fBtJVrkceQ9KuDAc4iR5lZ5m6gQBqLvPLtbAIH+adCGaO8JBqQIDAQABo28wbTAd
-BgNVHQ4EFgQU0lRyUnJd8CMyaNpRiCgm+NY8p8AwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAG+9FCHtrtXrMLJCNVr3O1TH
-JbxNoEIt72PbN1pgnRgVm+ZWklKLM/1npnh3S4ZYuEUz/EjPlmved2GCPMNXq8o7
-Bc6Durlcvb1R0Zek8iQ6tZxKpHAOnEtbP+QC18m94wpgvD3HkPzRpvRYENLj5pK5
-ibTvQbf4ImFpV07qQ6Ur8DwPifYgy7gpoNNEfw92SmI0d4aDSJvWz7nwvb138nRm
-QRRt/b1drYL93EeD+pvGx3nUI/oyS4n9PLiIKtUx6Bm4hlc0ByW7y/hZp6dmPsk+
-hmdVa6a6eRuKkGnzGpr3FzbH723+BPfLqEz6Wy51X8ER7ngvjIvbJykRJHWS/E1A
-6ipNj79/PyC9nSwTuf49Djs1bY1Gky5Dj5n+aG/gPcPGbxmrf5CKUPxLnwTbx+tg
-jc1JNTh2kaMuVtUXytuU6+dTEHSi6u4BqT6Utn103E+nWQlAXsJSA6kWegWT16z8
-osqdhUK7LIXVz1hA0bgvU3Y+WlOlsIFD++67OzYPRg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shibtest.slu.se/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-    </md:Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEOzCCAqOgAwIBAgIUMhPoEf2KNEEQzETZhaUha/CQmD8wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU3WhcNNDAwOTA3MDg1NzU3WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALv1eV6CikXVLXZb
-KHh4Q10LMg0l5AVA72lgdWVVqRH1j0VKzuqWIqLDqh5CRYG801uMhv5s2H7ewo36
-fRFIk9Omh53We4d0yB7BuntBRjF+O469vsGcLVlS2bsOK1kZZNGr5hYZQELc9qhJ
-fa7StElIYAnQxkXxIY1aWdnVToEs7gjDkJWdQ4MJDywW/+Kg+e/7kZktteeqoap5
-hFmsq9inZpm11fGtUWOI4fl9TXlZy6X13x5lbDxFNnvF6HRtjafQjRmYx4uLN5+g
-IsaFIuguPa/9YnQN8cj0pFRmIROsKAJ5dO45Pi4iY4AqrnT1v7/wnncud+xll26Q
-fpq8QDguWf+4KNkt51TWkb++rEJroeTJH9d1iMqAO7qoKthNF6xNVqxN50MApiuO
-Y3wEmrBiW9s3d2sTuWSFB0atj+y3KIZsAWmYJ0Gdl8y3YAERHLfZE1hWKrCgobWF
-c9QdjQkteld7DLXcb9o1fS+Z8rYmTG7Lw4C22g2Tkb75Qh/QSQIDAQABo28wbTAd
-BgNVHQ4EFgQUbWNBoMNHfn1aHUjcXRxZpefoPLYwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAEUQKnyHXUy3FiRsHi+QcJFJ
-+4j+wV7FjcAoqYnCZ2BGMJvqyaFOHcoAvWZaYANMW57wDpBCHeY8pC8nc0RkbJkx
-1mREdupEtsztvNxwAzdpkEf2Cs4w9m3N0ik2A3jGGcKYTqkmEfwz74ZKfOo3ctU8
-CdYsBNVA9CGxNQmvO7sgdC+rOjj4r05as/XczXHwKAwjnuQnOgTGoimNYAqvIM5q
-+uXtqeOzTB2KGW0ZnMuCtKXyVlXcBFFoSK9g7d6perZMZDueS1+/n5VxQyI9wh2n
-qX2ghl3ZLngKmPK+CZSBiLRYPqmzaBglFHEP+zTDWAkauajY3YFsVBUKmRdXOuEq
-6bBj5Cvi6v3GqEosbFsdoUqOZphdbyUuo78Irg+TijAXat+VM5YA/YWjoi9buexe
-rbmBK2bCILRtcGsMPk3uMUsq0Jn6LYrHLzCl1ZRgG6HHwGXrbBqdanHGHoJGACtC
-lPXa9r98Vs7bLrP/b11343DbP3bvznNhmpqeaXtU8g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEOzCCAqOgAwIBAgIUHBOJiF5eItVmpwaAbONnSJwedN0wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU0WhcNNDAwOTA3MDg1NzU0WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALKMy258/b8UEUfM
-HxDnWqQnH6hsnVOS2G53+fjiyasQicAYdc4ov0UzhoNPSpIb/pWLFZ07p+NjoILf
-Ksq+6/lzcYgLrBbpuqAdLl90slWZb3avSJZ1tkCo0JiC6zaNJw87idR8nTzgWOcQ
-RIlCeaXMvV+je1i8k3+LLUn0P63QLDT1wW5N6ZErtnSQEsenjnrH/a3lBtX0DSmU
-j/UO533iIvBxniPbNDIgVDWC8waQrDjk1hV9Omj6/xJwkKUNIVLR9XT+33232Fgn
-BGm8TbOFbEEv15GvaNLZdfXSTiOErGFYSKU58h9Nzdmr8oZURY4Cu6CENhOhZEYV
-O77RwkiuXB5vb+pgO6FFn8SFsF5JPtztGxVKMfI4y3DcaOhcmk3/UHakzzU2pmBW
-ac73M2q/JWwkMtvmoi8B65+Px7lMvBbkBVELyozBhBlu+QD6ArgIoH9AAbpaweR6
-LhDD5P1Q3FvUdtM+5QoYEgMRrpSfKa+8bp4EM5vtM4Yr5zOWhwIDAQABo28wbTAd
-BgNVHQ4EFgQUr4Sd2lM7XCQTyxNh9CFlfucGngYwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAEgDZ/DH8eavLtPIJLTsOiZK
-VXpJenizgbSHagPKeP/dQRv1MDpcVAB3hN8YmOO2tbzGyc5wcBPfC7qvMIUozlBR
-iiHTro+l/KZlE5S0nDxTsunVo3y3L1+C+KRhcFmMHNRwI5KArVVl+SiT2YEPE+oO
-lNVbqs1y3baFvZdCihDdgC9toS1idF8WxopxNhoFwzrly0d19NMlaOhsPUvjo2Qr
-O5AvgTSPdY8UzssqmE5add93yeMlkbDbLgDuLmOf/MT0Q0DQGOpVy18Fs9nD9iwz
-BtgLIW+NSUEKwSIbAquFIxcNJLwDlvdLkmreRxrcr1Q3TnUsT0dqyk0Be9wMukQm
-zwC6BS/r7dT3EKRlywxxmVr0V6TzeXbX2Ibspjndp7zQz3hb0not/IWUEMvZojgO
-50NDCxzWH5CWdUuN1hvAVcruGwJ2UKbgQMAf+3K6kgUeWwbSo+ENo52Mr4jsOdcj
-fMB48s6r6Avb5RBLRXFVossgJmxgi5Kp35LVkrkFGA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEOzCCAqOgAwIBAgIUVCdXGKcOA0mTcBW9/9WpMX8CNWQwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU2WhcNNDAwOTA3MDg1NzU2WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIoI0cm30Fp2N4Bv
-sieqDs69dulkqXkl5L7PlIyCAfZtCiO7Ozc24UgfqEbzEnc2C0Ld7lVdKiFOhbh3
-ot2vjyR6Di0qhlV16WNWol/nqCksNkwVjPmGym8oRAKo/CwrCXVF6t6JBRk5IzN7
-FdydSSBmgiw8YIpYQsPIqpghirVXfn8cCvxAnFX4Sax3hZdB667KLPN6gD5srBQI
-uapz/Y7Nr9P7hAdDWPRsGyY9TBGjtMmlWjzwEZQ1sBaUatOzgyEl5Y4C9Q3P8N36
-yTdTkHNy59EHma46dLSCRTe+qZsiIZ2uyRaPU9GdNHGUlKv8etiyUZD1AKOq3/Oh
-kLTELnv38910VtSp715nvcFFlwhcvo8fMh2cnp24HSn/YfBgE7edTpSfVQLdGd9g
-PMTB9JG9WgOnU98BVdisTJiZsDPbHkjiNEEkzhO2AgrhG+ZVrhKlcqrozjhI1sKE
-fBtJVrkceQ9KuDAc4iR5lZ5m6gQBqLvPLtbAIH+adCGaO8JBqQIDAQABo28wbTAd
-BgNVHQ4EFgQU0lRyUnJd8CMyaNpRiCgm+NY8p8AwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAG+9FCHtrtXrMLJCNVr3O1TH
-JbxNoEIt72PbN1pgnRgVm+ZWklKLM/1npnh3S4ZYuEUz/EjPlmved2GCPMNXq8o7
-Bc6Durlcvb1R0Zek8iQ6tZxKpHAOnEtbP+QC18m94wpgvD3HkPzRpvRYENLj5pK5
-ibTvQbf4ImFpV07qQ6Ur8DwPifYgy7gpoNNEfw92SmI0d4aDSJvWz7nwvb138nRm
-QRRt/b1drYL93EeD+pvGx3nUI/oyS4n9PLiIKtUx6Bm4hlc0ByW7y/hZp6dmPsk+
-hmdVa6a6eRuKkGnzGpr3FzbH723+BPfLqEz6Wy51X8ER7ngvjIvbJykRJHWS/E1A
-6ipNj79/PyC9nSwTuf49Djs1bY1Gky5Dj5n+aG/gPcPGbxmrf5CKUPxLnwTbx+tg
-jc1JNTh2kaMuVtUXytuU6+dTEHSi6u4BqT6Utn103E+nWQlAXsJSA6kWegWT16z8
-osqdhUK7LIXVz1hA0bgvU3Y+WlOlsIFD++67OzYPRg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.slu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 18 67 66 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SLU säkerhet</md:GivenName>
-    <md:EmailAddress>mailto:sakerhet@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
deleted file mode 100644
index b96e19fd..00000000
--- a/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-test.it.su.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-05T07:55:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-test.it.su.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">su.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Stockholms universitet (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm University (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för medarbetare och studenter vid Stockholms universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Stockholm university Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.su.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.su.se/english/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="110" width="127">https://idp-test.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="110" width="127">https://idp-test.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/medarbetare/it/it-tj%C3%A4nster/universitetskonto/policy-f%C3%B6r-hantering-av-personuppgifter-inom-ramen-f%C3%B6r-identitetsutgivaren-identity-provider-idp-1.383506</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.su.se/english/staff/it/it-services/policy-for-the-management-of-personal-information-within-the-scope-of-the-identity-provider-idp-1.384218</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>su.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEBjCCAm6gAwIBAgIVAIoOB0+EQ2esNrfOR/DNO/LiLdhdMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC10ZXN0Lml0LnN1LnNlMB4XDTIwMTAxMjA3NTAz
-NVoXDTQwMTAxMjA3NTAzNVowHDEaMBgGA1UEAwwRaWRwLXRlc3QuaXQuc3Uuc2Uw
-ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCh/m0otLh1VEJhtCW/DMCb
-dOR1iqylNBJGN+hYFIb2hNFrv+NBkAs4jr/99pzAQUgkHLiEpp4WLYAVekS8Adsb
-siqNUPsxgQtygm0o4NbIwHN7ZLEMNjC4r2mlscR4RIcfP6OoRUo/RwSvKcQteWMw
-wlARk2dsCXJFWKfGpXvdonn762uWcmjSsiwIUZcCOhZ7Xc538FOPMgZ33lBApXwE
-rf7cKPsfBWa8asv1U0COcsFliirVC0EqDWuXzMkTXJKnCWBpcNLscOd9zz1bOAQ1
-pf6ZgO2HEGGqczIgqi0q7aafIaFjvOtMkvalQWYThN/4SinMYFeyrbP0IzweLIVO
-c3BInDrut81eier88Czwq8oq9/XcqxyJXyS3A75fmoER08JJlNOt1TFokmJLhf1C
-e2fETnPTDTmg51ddjQjFYC+VAaiu06Q8A82jIrcMIAgGMAk6Eyi9p3PaEyetwVOj
-VibRlOCElJwXqMjpe+JbdoCdj9Hhjz/QBCSL8kccoVsCAwEAAaM/MD0wHQYDVR0O
-BBYEFGpKewsKlwmpeXIhOaqQsjdj/kEKMBwGA1UdEQQVMBOCEWlkcC10ZXN0Lml0
-LnN1LnNlMA0GCSqGSIb3DQEBCwUAA4IBgQCDRrQDy7/TTeANIS+uRx1IXaJ9h0Pv
-eo/XBNmKEC/M61fYAmGGmZPlpGzDRCKpRS6MlYwhcXT3BgijM3Hy6SBztdpZ462s
-rmOaUuoBMR32pTGpoEGnYiM3TJY4kQt+7fJYPMORBBD/Xng3Z+xDHF/wroPikyhH
-i7A1XBp1U1fQnP/H9A1eXAFRucoLXaQtxHYm0skHf6EuWfC7wCKa4U87WVueu6YI
-9jp0lr3klE34ax+QJ8YOD8bIsd9dTMNvYG8zmXpCEOzitYhFOe4gH3JLPAXp+1gE
-7wOi6zFZP3+SC9hTaZOxPMTWbg5Ag7wmQxl39IYBEpRNGe4Jhlqx5QKa82AGU6C5
-aCNzPBXHlvYR4OVzQ7SP5IPVdTCq4bNDhgPtauRy9fwuiAxylkxD/cwI6h+Tpwt8
-U/Fhukwdfy1fB5uVRZniTRINfsdzsFH878eoJZ+RMCbl7P9EO7fYiSS+AZDz/1Ij
-i5Njb3NXTdej0Y7FgTe1F/IfGOS4KxKJEG0=
-                    </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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.it.su.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet (test)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm University (test)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:irt@su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
deleted file mode 100644
index 52f25b93..00000000
--- a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-test.nordu.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-12-01T14:56:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp-test.nordu.net/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">nordu.net</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">NORDUnet Test IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
-        <mdui:Logo xml:lang="en" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>nordu.net</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUK/CJDYciXdKCAM5YX+fbleBjTtwwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MB4XDTExMDExNzA5NDYx
-M1oXDTMxMDExNzA5NDYxM1owHTEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwuj833/oKEw/VDNC6c41
-6ul6sopfx1+TS1B+3vOdgJ/HzudPYiDYvglz5lvgOd0+92QOS6LnCbdyAoEvWiKf
-kEViH0XC2LkvhFu8BYmh7Rh9DssKZ7AbrXcJo5+urIKGMWYFfqzGdp7GKv3U+ITd
-fhrhZS/SjsvGdQ1yVKoUm9AFT9z3r6+niZNkeFQAMRvC+FwnZvK/tdcNLZV5F45F
-Y49oZwYMyxEGXc6cFP/d2KR541lzgTZdBmC45BFUkJCJveY4eLMPjvEW7qVR12Kv
-uZ4UnbeCrtx3tgWZ0FAxcDQVf3T6k1zZZ9kT3nv5PhUfU76KGyMvYUd+lj7b0hHZ
-2wIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAtdGVzdC5ub3JkdS5uZXSGKWh0dHBz
-Oi8vaWRwLXRlc3Qubm9yZHUubmV0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo
-DnKUiN8jojDRtVlU41cQ0oBgQjANBgkqhkiG9w0BAQUFAAOCAQEAavxQqlYcjCJ8
-5thupV6Uxs/drD6HGAskxdhivQESF0y2LlVxiItFnuxjEnzse7QQTQJJFw3xKfFP
-VEoxPMv+eBAU5ltYvLx6072BMdeqld9m0oE+k0lKrVkBQ2zgKv9kM7lwIk1psstC
-1C+2dthPu4r6KWB3DIjUJPL8LCA/3r98mCribA1RNI+al/c3sFp6y8gSyVZZ94da
-QUs8BBhDxIV4HEXDi8YroXhXIbBzoXik7UKvirNdLe7GF9b7e5MXHgcdgt/11LoQ
-tmPh/GpdDRh3fVZzUAP+ffiuAV/Oth1idIikf3zQUBfFiILu2EFUdE2pYlTr7cVG
-X627IsSkKg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.nordu.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.nordu.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.nordu.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.nordu.net/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">nordu.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUK/CJDYciXdKCAM5YX+fbleBjTtwwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MB4XDTExMDExNzA5NDYx
-M1oXDTMxMDExNzA5NDYxM1owHTEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwuj833/oKEw/VDNC6c41
-6ul6sopfx1+TS1B+3vOdgJ/HzudPYiDYvglz5lvgOd0+92QOS6LnCbdyAoEvWiKf
-kEViH0XC2LkvhFu8BYmh7Rh9DssKZ7AbrXcJo5+urIKGMWYFfqzGdp7GKv3U+ITd
-fhrhZS/SjsvGdQ1yVKoUm9AFT9z3r6+niZNkeFQAMRvC+FwnZvK/tdcNLZV5F45F
-Y49oZwYMyxEGXc6cFP/d2KR541lzgTZdBmC45BFUkJCJveY4eLMPjvEW7qVR12Kv
-uZ4UnbeCrtx3tgWZ0FAxcDQVf3T6k1zZZ9kT3nv5PhUfU76KGyMvYUd+lj7b0hHZ
-2wIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAtdGVzdC5ub3JkdS5uZXSGKWh0dHBz
-Oi8vaWRwLXRlc3Qubm9yZHUubmV0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo
-DnKUiN8jojDRtVlU41cQ0oBgQjANBgkqhkiG9w0BAQUFAAOCAQEAavxQqlYcjCJ8
-5thupV6Uxs/drD6HGAskxdhivQESF0y2LlVxiItFnuxjEnzse7QQTQJJFw3xKfFP
-VEoxPMv+eBAU5ltYvLx6072BMdeqld9m0oE+k0lKrVkBQ2zgKv9kM7lwIk1psstC
-1C+2dthPu4r6KWB3DIjUJPL8LCA/3r98mCribA1RNI+al/c3sFp6y8gSyVZZ94da
-QUs8BBhDxIV4HEXDi8YroXhXIbBzoXik7UKvirNdLe7GF9b7e5MXHgcdgt/11LoQ
-tmPh/GpdDRh3fVZzUAP+ffiuAV/Oth1idIikf3zQUBfFiILu2EFUdE2pYlTr7cVG
-X627IsSkKg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.nordu.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnetTEST</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">NORDUnet Test IdP</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet Test IdP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet NOC</md:Company>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 7260b357..00000000
--- a/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-test.nordu.net/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-test.nordu.net/simplesaml/saml2/idp/metadata.php">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID0DCCArigAwIBAgIJAIr7Fddfzg4nMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xDjAMBgNVBAoTBU5VTk9DMRswGQYDVQQDExJpZHAtdGVzdC5ub3JkdS5uZXQwHhcNMTIxMDI5MTgwNzQ1WhcNMjIxMDI3MTgwNzQ1WjBOMQswCQYDVQQGEwJTRTESMBAGA1UEBxMJU3RvY2tob2xtMQ4wDAYDVQQKEwVOVU5PQzEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3v3zhxKne0EmViKyxbsbe3qMjWQhWV2yVjrB5iGd9uoab16c25in8WxvRe0VvVCSsLgc0JU6JZHD30xEjNxrOu9kTeSyoG4uRX4T7fzJdWyadipV3QxsK9LCR+6ksw9mGu28mTDXtz7Wn/6H2vcEzgB0OOhqtfW4c+76oY83IrPARSrSZIeZbOJ2UJQYtqvK8H3hF3fNSoXRWk7+6FWkxS7lisQ3cT4cLeDnz2KkerTZzjz7pHBp0xCZ64fl74Q2BIVxPAczM2kU6n1sCC+Sd43jaPTdBbhEUAj9gwcdIM5O5UwO03C5qduu2ecJTa67Zd6PZkCqHiAeuoFBih1GwIDAQABo4GwMIGtMB0GA1UdDgQWBBTXJhD54J5C166ByFjM2AdH4A737zB+BgNVHSMEdzB1gBTXJhD54J5C166ByFjM2AdH4A7376FSpFAwTjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwGA1UEChMFTlVOT0MxGzAZBgNVBAMTEmlkcC10ZXN0Lm5vcmR1Lm5ldIIJAIr7Fddfzg4nMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEj9YOaW9U4QT2h1Byw/IzH0NoWFCOY1ixSkCILg5Obll8tu4pqYgUb93bZnlClBx6S1Cc9v3cwVJWM9XayWGorpaVV8fXE8sWS0pEjcj5wW5bmQjHCbtn19sz6C7Ef7U4ZZrQ3iJvhaGlrBxO6oJ+Rxh0MB1ZdpohUm7blEockJ7O1vK54SDbaOQ/vsEMM+h0qqKitvaOjpUnGfKsn4k8H2yI95CoQjZe8QffqrHmpuUSpjSMq3AR5EJO3YPN0R19nSeksRjo5cLmWRpXQUA8wFcsW/4pFHhEhaq7ItX0WAKn7oAWghOq6sk+o3unRnIX8qJE/MOgThp4+8qwlM6a0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID0DCCArigAwIBAgIJAIr7Fddfzg4nMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xDjAMBgNVBAoTBU5VTk9DMRswGQYDVQQDExJpZHAtdGVzdC5ub3JkdS5uZXQwHhcNMTIxMDI5MTgwNzQ1WhcNMjIxMDI3MTgwNzQ1WjBOMQswCQYDVQQGEwJTRTESMBAGA1UEBxMJU3RvY2tob2xtMQ4wDAYDVQQKEwVOVU5PQzEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3v3zhxKne0EmViKyxbsbe3qMjWQhWV2yVjrB5iGd9uoab16c25in8WxvRe0VvVCSsLgc0JU6JZHD30xEjNxrOu9kTeSyoG4uRX4T7fzJdWyadipV3QxsK9LCR+6ksw9mGu28mTDXtz7Wn/6H2vcEzgB0OOhqtfW4c+76oY83IrPARSrSZIeZbOJ2UJQYtqvK8H3hF3fNSoXRWk7+6FWkxS7lisQ3cT4cLeDnz2KkerTZzjz7pHBp0xCZ64fl74Q2BIVxPAczM2kU6n1sCC+Sd43jaPTdBbhEUAj9gwcdIM5O5UwO03C5qduu2ecJTa67Zd6PZkCqHiAeuoFBih1GwIDAQABo4GwMIGtMB0GA1UdDgQWBBTXJhD54J5C166ByFjM2AdH4A737zB+BgNVHSMEdzB1gBTXJhD54J5C166ByFjM2AdH4A7376FSpFAwTjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwGA1UEChMFTlVOT0MxGzAZBgNVBAMTEmlkcC10ZXN0Lm5vcmR1Lm5ldIIJAIr7Fddfzg4nMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEj9YOaW9U4QT2h1Byw/IzH0NoWFCOY1ixSkCILg5Obll8tu4pqYgUb93bZnlClBx6S1Cc9v3cwVJWM9XayWGorpaVV8fXE8sWS0pEjcj5wW5bmQjHCbtn19sz6C7Ef7U4ZZrQ3iJvhaGlrBxO6oJ+Rxh0MB1ZdpohUm7blEockJ7O1vK54SDbaOQ/vsEMM+h0qqKitvaOjpUnGfKsn4k8H2yI95CoQjZe8QffqrHmpuUSpjSMq3AR5EJO3YPN0R19nSeksRjo5cLmWRpXQUA8wFcsW/4pFHhEhaq7ItX0WAKn7oAWghOq6sk+o3unRnIX8qJE/MOgThp4+8qwlM6a0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.nordu.net/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.nordu.net/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
deleted file mode 100644
index 9c43c611..00000000
--- a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp-test.suni.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-04-21T13:14:48Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://idp-test.suni.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Södertörns högskola - test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Södertörn University - test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test-IDP för Södertörns högskola.(Endast för testverksamhet)</mdui:Description>
-        <mdui:Description xml:lang="en">Test-IDP for Södertörn University.(For Testing purposes only)</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sh.se/english/sodertorn-university</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="118" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="108" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sh.se/om-oss/strategier-och-ekonomi/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.sh.se/english/sodertorn-university/meet-sodertorn-university/strategies/personal-data-processing</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLTCCAxWgAwIBAgIQMd+/oVIasoFIXXKFlVUOKjANBgkqhkiG9w0BAQsFADAb
-MRkwFwYDVQQDDBBpZHAtdGVzdC5zdW5pLnNlMB4XDTIyMDkyMTEyMjQyOFoXDTI3
-MDkyMTEyMzQyN1owGzEZMBcGA1UEAwwQaWRwLXRlc3Quc3VuaS5zZTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAM40M7yKD+2dJTgpfwxHawn4vUxr/4CO
-uEh+GJcqEdpOsjYgYt1Aatscm/A7EJCaKpkVrJ4+NYf9xvYnXx4nTcMSJFaLsOp4
-Fs6ZDmlymM2TF4yRLG+vcDWcb65GXzEerbiMmit3srb5YmXLGV1+3gRU6E8LBfFT
-QXJbRSWG9e/Lxbd3Mkc8lMyc7kRRaUE+B2Su6/9VgiyFNbAHozqDTffIgw4gLehm
-YJE4PRbRdoFX8URHvNmL0BajFgKPZRasMSUNxdo05htq3g/K47KuabZueA+e5agu
-xZ9iPqH7rmjzVM1O3NWgYEQQffJseuubYufhDKZnaNDQmypotpv9mlViHXYU+Ni7
-Kn5WzaklBBrgdMhaCh+m2BKIX8kXo5vZrvVjCk0emjPbPMxYN6ZmDucNnUA04ljx
-/nI7zzjvOf4g1LPFP6/1IPgfq4DSbLUbIh1evWu/Jw6qjNJl6JsDGA2NExwCK46/
-buof+ZyHk2HObslz6jVzAuMy2IL80eKbP1Y8cLj28Mh5NUytCA2GE9OwsdAuEW2c
-7iGyToTDjj7BL8z4/Po1l/ujRDCEtkrwMWEfFogkC3ZjzgsCTR5jUolHo9Mv863v
-0cGoyHiXATe62vtFS69fQMMWYBHu8njg25FkmagT/1nRDPRuxPAZZtUSnWa938vq
-kgwN+BT2ZXt1AgMBAAGjbTBrMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwGwYDVR0RBBQwEoIQaWRwLXRlc3Quc3VuaS5zZTAd
-BgNVHQ4EFgQUyYjKdU9a4at+bWVcjL9fClBJ+dwwDQYJKoZIhvcNAQELBQADggIB
-AMpaw0oh9x6EX5MQ3zd2BQ61LGYjfKAAQYcu3DW7DyuJkl7C8+lZofsvYqu0osmv
-h0ul0AxWXRML9MRBEGHhCb/ecCjPeDzPGZvKVhkPOkthCc0FvfYDCHUj8dmEl5cY
-KRGPmaPyH4wxSC/aZBLaipamR7WpXuHS+RDCnZfRcwlfmnsoKMKtiEdddbNvzY39
-NT4Q79FBFSJu2kR4Zb9dKfKQYHfw+inEExzs6epIaKUqoOSrQHSEM+JcI1VdGKnY
-4KeaWe2gT3+Fjhqpkw9roU604bzsutRqkAk8shkzJ7lY+oJ3mTqCZqR0KCZ7TqNW
-JDw2G7pBIU8efocE1tPWj/IxgmjFiekLjUkE19kSMIyfQhqyXWlcYwMdvXjImanu
-NMm4USD+gquWk0OtlQzFwSemhYb6nHzGbWpBla4Zh73r3ov5XangVD9pn0FlZrtJ
-hsTg3r9CHiII8FkNq3+qZCnAOSuNjr8ScQ6nTAb9bh8Ke1+Qn8QyLTvFq7QABvab
-lgv5ve2lkH5TUfKHetfo31NIysJLf0ZItFdACrQbpu9g5cgacBxfpOUX10lrMATA
-seQZuFiSS51oQ7fty7CcY6DQ5/6LSBV26589+wk8VBKV63giwjyyAlknrMR0moQk
-VrFRnL6s6WXvC4dWzAggSoEp53xrRU2NaFzuHsRXD8Gj</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLTCCAxWgAwIBAgIQMd+/oVIasoFIXXKFlVUOKjANBgkqhkiG9w0BAQsFADAb
-MRkwFwYDVQQDDBBpZHAtdGVzdC5zdW5pLnNlMB4XDTIyMDkyMTEyMjQyOFoXDTI3
-MDkyMTEyMzQyN1owGzEZMBcGA1UEAwwQaWRwLXRlc3Quc3VuaS5zZTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAM40M7yKD+2dJTgpfwxHawn4vUxr/4CO
-uEh+GJcqEdpOsjYgYt1Aatscm/A7EJCaKpkVrJ4+NYf9xvYnXx4nTcMSJFaLsOp4
-Fs6ZDmlymM2TF4yRLG+vcDWcb65GXzEerbiMmit3srb5YmXLGV1+3gRU6E8LBfFT
-QXJbRSWG9e/Lxbd3Mkc8lMyc7kRRaUE+B2Su6/9VgiyFNbAHozqDTffIgw4gLehm
-YJE4PRbRdoFX8URHvNmL0BajFgKPZRasMSUNxdo05htq3g/K47KuabZueA+e5agu
-xZ9iPqH7rmjzVM1O3NWgYEQQffJseuubYufhDKZnaNDQmypotpv9mlViHXYU+Ni7
-Kn5WzaklBBrgdMhaCh+m2BKIX8kXo5vZrvVjCk0emjPbPMxYN6ZmDucNnUA04ljx
-/nI7zzjvOf4g1LPFP6/1IPgfq4DSbLUbIh1evWu/Jw6qjNJl6JsDGA2NExwCK46/
-buof+ZyHk2HObslz6jVzAuMy2IL80eKbP1Y8cLj28Mh5NUytCA2GE9OwsdAuEW2c
-7iGyToTDjj7BL8z4/Po1l/ujRDCEtkrwMWEfFogkC3ZjzgsCTR5jUolHo9Mv863v
-0cGoyHiXATe62vtFS69fQMMWYBHu8njg25FkmagT/1nRDPRuxPAZZtUSnWa938vq
-kgwN+BT2ZXt1AgMBAAGjbTBrMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwGwYDVR0RBBQwEoIQaWRwLXRlc3Quc3VuaS5zZTAd
-BgNVHQ4EFgQUyYjKdU9a4at+bWVcjL9fClBJ+dwwDQYJKoZIhvcNAQELBQADggIB
-AMpaw0oh9x6EX5MQ3zd2BQ61LGYjfKAAQYcu3DW7DyuJkl7C8+lZofsvYqu0osmv
-h0ul0AxWXRML9MRBEGHhCb/ecCjPeDzPGZvKVhkPOkthCc0FvfYDCHUj8dmEl5cY
-KRGPmaPyH4wxSC/aZBLaipamR7WpXuHS+RDCnZfRcwlfmnsoKMKtiEdddbNvzY39
-NT4Q79FBFSJu2kR4Zb9dKfKQYHfw+inEExzs6epIaKUqoOSrQHSEM+JcI1VdGKnY
-4KeaWe2gT3+Fjhqpkw9roU604bzsutRqkAk8shkzJ7lY+oJ3mTqCZqR0KCZ7TqNW
-JDw2G7pBIU8efocE1tPWj/IxgmjFiekLjUkE19kSMIyfQhqyXWlcYwMdvXjImanu
-NMm4USD+gquWk0OtlQzFwSemhYb6nHzGbWpBla4Zh73r3ov5XangVD9pn0FlZrtJ
-hsTg3r9CHiII8FkNq3+qZCnAOSuNjr8ScQ6nTAb9bh8Ke1+Qn8QyLTvFq7QABvab
-lgv5ve2lkH5TUfKHetfo31NIysJLf0ZItFdACrQbpu9g5cgacBxfpOUX10lrMATA
-seQZuFiSS51oQ7fty7CcY6DQ5/6LSBV26589+wk8VBKV63giwjyyAlknrMR0moQk
-VrFRnL6s6WXvC4dWzAggSoEp53xrRU2NaFzuHsRXD8Gj</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.suni.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Södertörn Universsity</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Södertörn Universsity</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.sh.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sh.se/english/sodertorn-university</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Legat</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Södertörns högskola</md:Company>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Legat</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Södertörns högskola</md:Company>
-    <md:GivenName>Alvaro</md:GivenName>
-    <md:SurName>Acevedo</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
deleted file mode 100644
index 5ebdc487..00000000
--- a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-v2.konstfack.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-01T14:29:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-v2.konstfack.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">konstfack.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">student.konstfack.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">University of Arts, Crafts and Design</mdui:Description>
-        <mdui:Description xml:lang="sv">University of Arts, Crafts and Design</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Konstfack</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Konstfack</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="75" width="335">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="75" width="335">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack/About-the-website</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack/Om-webbplatsen</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>konstfack.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.2996777,17.9908419</mdui:GeolocationHint>
-        <mdui:IPHint>130.242.16.0/24</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFVzCCAz+gAwIBAgIQGeuloX5XlYtEeauEw5II7TANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDDB5lbmNyeXB0aW9uLmlkcC12Mi5rb25zdGZhY2suc2UwHhcNMjIwOTA2MTEyMzQwWhcNMzIwOTA2MTEzMzM5WjApMScwJQYDVQQDDB5lbmNyeXB0aW9uLmlkcC12Mi5rb25zdGZhY2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDWS/RaRQyNdTjvNpW/ffyrDuvJQHOs5DVYIaWGn+MPrUNkY2a2sGbhahrQrNgSQv318hKKGQriOgOJ1Hu8f9cO8YDE1XrrrNOSqPzXJpwQl0rSBI5EK54sx9SexE4XXMgUTlhdnutKdooeTH/89C6ikXh+13IpFnQX4EIUICnPKTFSEGUhlwVwZQfzObISU2DmD/PPaESByv8ZY/+ml5Rv08fMDDUh6snY0njuS+OwpGVvnIOaIktgSqv7uWnypcLV6xom+QMV0DrI5pRDSwyX0Fnbj3fRDF5SdQnpjdIsf60zLVmuA9tTSKfxFA1zX8CTfNXQniyyeK5yh6JmQe+jVaNUwFEHyrJiWhUKeX0OtwMzSnaw6m2SnhauYCe9AP2YhS3po+Eb5Fr40YZ9vCgGrHuSGhwEPerlWdqQLKE4/373dwHwGCQHUbgJOhI1cWGhpHTFLHR4Pw1NviCh6NXu5MJMzu1ezDSVcwAOYY8xNWAwF9vUwm8CCA0WpueI2IMgsLgYO8o/xIeZyq2ZYpZCW6U779YGJ1F31tWR/SqKqU81o2anDbKAYFbcGLOD10LukAxgoCOeqnYJIBTrnBkerm/SNXfqn1AkzVzD1dwjW5QHA4pm9uIwjX1EAEkZJ02PgF5LSrW2fKjqe3mRxhdGSKqDEM2ezcSLiUnBkEkF0QIDAQABo3sweTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMCkGA1UdEQQiMCCCHmVuY3J5cHRpb24uaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQURsQ4qI2syGHCAYPOuTeJsC8NbQMwDQYJKoZIhvcNAQELBQADggIBACSWshqwQLK/fiFTHA5lJImMYGxevf4jku1dcgemF6AAc+zGXzt0G0AEp8AKsWgF4oBlcNfmlrvYuKVMHxeWM5ePcLiH2YcM3hrAajzEBVOEgqrR4VgZ/OkmIqCcodhgwxwahgzMN03yJxyl642w8Abgo2eCE8CdPi0p10lSqAHN80gjf7kmBQEWVUALevOMfXkt1mC8DL9XgN+3Oj61/zK/uWEjnnwwonghY/GWuhw1NrJ8+dlYDDgKox0fk9K+fNKn3Nko9bdI2lkL7K4XQLUFv3ZY9H9a9/aesZLkkmUCz89WAQVgyU7Jan6vhRmE8USWO1XasBFzXSLT+DwoUf7dbmWbRyAshzEDlJiAZltWcxBMhYp9I5AEoDnGL28KK48kNLTvpSjZez5JJUeO+4Rywq2yxsroxQ6p6F2HjbfIcNJj51W4ZYZLhaHSw2ibI41vQ8NAZXBcI/jxgMIaCcDd+0qqcLXJwvsKBLYyk1RJi7zlQpl2dN0Xu7Z7P3uLW2OEKDGE3oWpWzd1sZrwQfcqADFZK92JdVl/O38ETbV9f3vIZwfov1IERRCiJmkgFmMT3LCWLpQgQcRAof8+UAgk51ydxe9r1hQnzQeE07RD5MXBvoYEL3mtspPdHnCaX+pxMHaIwIEUMVdeuyHbkA+mc04NEAF3UTYp3ULmcL6/</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFTjCCAzagAwIBAgIQJch/ZhI9pY1NxYcXveYlcjANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtzaWduaW5nLmlkcC12Mi5rb25zdGZhY2suc2UwHhcNMjIwOTA2MTEyMzQxWhcNMzIwOTA2MTEzMzQwWjAmMSQwIgYDVQQDDBtzaWduaW5nLmlkcC12Mi5rb25zdGZhY2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCfDhFkELtCYNZzlhrNBV7i+j7tqC59aHa4eCMJmdK/Pj9H2aVNJawkBEaEPm9vXXPgn6mVSsSZwF/A/zdMWB/36T1TLty+x45Cv98ZkWpmGnRv76wz5Y8TD2bKb//DdnWeTh8Cu1aMdYv1zMgvLVKvLoTNwNl2hdxIrsX7E5tp9/T0IH+7AJdBPRIv3SsM6n1aitHfIO2xiF/neXt7yiduYsFPIhmMl8lO71mKds8D2wF17gOt4pZ9oo1bYsLpng9o6tE2jwkPdAE8Rf9fcd3VyOL4XsurTHV8Kz93NECTZ3MKyPT4nxtR+m4jSqdVdw7Gr1GPdU2LUMbhyMnk5ZuOoNxpmARwavDEGfNxoUPAqJxkzudHsgOeN1L8mmc46tpPImVBRw0AeCD4D+nS2x5ARrwC3RkM1dU3GMVrpF/uBgjhtlg32C/vy+uLF4fZSpwdGN9l9FE3y7D3p6IlmmiqjXknzMVQhCjNVCjyQcZXJDMqJItHX6hYgmw+v9YufsHI/VT1JwBgEx2tWmOtknlgAfUdWxFf0pE90rLnQUW1fDCJ9Ph3IGEn9Efm0FGkytwEjW7wTgxScSljYyxDfFba4Gk4Ic50Ezc60SsDFMuLc6H7JVN90NFHyPZUDnXOFaJDYJJLW7V0QongFarhZZt6bsIlWIFBsOARjLVnaUBMKQIDAQABo3gwdjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMCYGA1UdEQQfMB2CG3NpZ25pbmcuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUWcqKkFd75FyIN703VFV2jcsHwkowDQYJKoZIhvcNAQELBQADggIBAClcpYVeE09iGIgDDjqRd0C7eTaaCo5RusWbpgwjcvRli8d8sl8+dPIct3G4L9SHB2Fomh3QaPPgOstxyFqci3wwlwIX8RxrtMVwvcbMvZEk/TzqW6KDtr6FXj7soVWaEHd7WmHQfY9g9XSnAhA0ZQq8nQaovc2l8dziLFdEmTuf0490cjL+rP08qKZCcbJr7M7cnshZwPFpsFL1Ppvwi68iCe09TQROglfCxtPjF2RZwi2FQAs545EvNeeJ6m5XkYaadxGQ5/umALYhn9j5mqNdN2u8BdYYuJ5jkByVQrZGcZtYTIVKoXOcGOrAcQK68m7AmjwlZZRcxOZH1oz4M2d2YXYbfJHFkoDybbJg7mGX0jecGLks1WLe0ga/PksXiHkbpRu0FDD3xkRYxYpn9snKnxA0cN/Z7hy3QL7YRKAmCrLW3RryZKj+kLmBH6TxRsdGCxkdM5t5iqpfCPaX+yzkESF9W87JW0VYEgszRNFvkT6jI+xA95rxFLEWCDUUj5fpyXBLRU9l1EVwFW9JTKz3hy7k8+BzCYT1SdrzKUXh9UEH5v0LXPhiLyUHenjZskbcdc1ovqXt2rrvUVmVdv+On7VmBEM1ZFvodgyoZfoZWMOgdyHyu9Ul1gKuPY6cs5CRpQETbuWjjx6c2gCA+pKsE0c20cr15m760Xe5Zr5S</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.konstfack.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Konstfack</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Konstfack</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Konstfack</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Konstfack</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.konstfack.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.konstfack.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IT Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IT Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IT Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
deleted file mode 100644
index fc503020..00000000
--- a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-v2.suni.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-22T08:06:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-v2.suni.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Identity Provider for Södertörn University</mdui:Description>
-        <mdui:Description xml:lang="sv">Identity Provider för Södertörns högskola</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Södertörn University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Södertörns högskola</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.sh.se/english/sodertorn-university</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="118" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="118" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.sh.se/english/sodertorn-university</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sh.se/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLDCCAxSgAwIBAgIQee1t7SOaTr9OMpwIKBDZqjANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDDCBBREZTIEVuY3J5cHRpb24gLSBpZHAtdjIuc3VuaS5zZTAeFw0yMjEwMDcwOTE0NTBaFw0zMjEwMDcwOTI0NDlaMCsxKTAnBgNVBAMMIEFERlMgRW5jcnlwdGlvbiAtIGlkcC12Mi5zdW5pLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA30JzoNDJ59tZQ1EYiS3CiQXvdnGEX/9izwVyxohinq8yJZZi88iMKWr+lDstEyr6+Yv+Wwin6AVst0i5z6/QRXo7CMmKxyUso889+DTVXqRc11J3CgPNA3NXywScxmn9wtpqZnrUlVvt25ni6TJRSQ0A07nQOeFiwLKE9YzwGFmpolmCDtzP5Qs/SOZiXliJkoM1szoNqRD2I+75bVdbih2kyvqdz3yFpEK4V6ugSyXWFTvFSQ7do5B3UWPXyz2aNvgAgNeBWiQKkHBnaRgCM3UnpsveWcHJQ30JG4CzI7BuNYY+CDf77L8xPF/2k2KkiSXtzK7n5X8sv8wbPDSUFRpZwJ3ETGTH4YsgfeOn7o21dtmpQZ1Bp3lsN62DTnuoXxJn4d52yyisdCLzFCSu+iVf8rIpgQaaoCzOPPwgyTQdt6JhAptv2fAOHcHmtSGIYwhyTktVkPab/2T6jWzTGP4MaOdws5TiC/gNCvRzJDkytSMPPU9/j8P2rxhNTB7Hf6KuJ5QIru7t8yYPCgRWLqcPmbKHGb+LVEdnqnwRjmrgWOoGBbJ4Y7mJKYC8hneakVSLzEfEwLtPRtbUHMO9fBKq4bTAqBixpyREa0E4aFMIBCLC7OyQwJgGjS3tvrVCqacvcm7CwXgMpmqXGUmXxISm/Bq589m0KNaSiV5lKL0CAwEAAaNMMEowDgYDVR0PAQH/BAQDAgWgMBkGA1UdEQQSMBCCDmlkcC12Mi5zdW5pLnNlMB0GA1UdDgQWBBSzmykJFiylMot5ukddVq3b9iSnLDANBgkqhkiG9w0BAQsFAAOCAgEA0topMjULA9bz9w89XcLTWtzT+9XvOi8B2pMO7xX255AIU0aTGvt5BpA6wAa1RLBgNmhDwko8mv0HymVFMNC3ibA47Mys0JgaSupPeJNO4clvWTPLn+g+54p1zFtenRFDgJlhsuFHHwHQ26IWt29zfFNors74SA+Bf/MTO2oQj3HjFKnoM25DNXGalpKNrhudvt6gVHoQZfq1YOfZmyyU1b4g6no11/ymS5hwoQYktl3aiJnV+8d6mzC9Uf0ByoL99B6nghtzrBfiA7y3g+z9jDHMJ0o9tbQ8lff2r/TtclKyx8LZ8U4U67h+BZdmjCAyN2BdjFm/ToLr8+r/J6ZVDExGZSufkQFOdNcxiK7c2t7hDPueGUJcwLuBxVltGPjhp7dDE62QBdlRNVMACA/ApeXgs+9fm358xxF5iRzjFOtNi+BPvUDI+/EoiidzGwLe/FCiy0ZsFdjjcN+R95o8ewx0laU644fkbCBg/N2k84aZmO687g5+HGZxqRLLGLupTUIcWwdWn9xYLCriYP4Kxs0ozvVG28AOYiQwILStgxSG+906J+AdoaZN+i+ALaPfU5xS9lVKpvzOOHT/dMPkKqwTtN0MZ7t/nN5NwDaiUmAXh0qDx0jZBzdOPR/Ff6Fpbak22ezlmT20hAO3E5KD7ra6VY92IANcnbxIIpUqcP0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFJjCCAw6gAwIBAgIQUUXuefnktadNfa0IUttldjANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1BREZTIFNpZ25pbmcgLSBpZHAtdjIuc3VuaS5zZTAeFw0yMjEwMDcwOTE1MTJaFw0zMjEwMDcwOTI1MTJaMCgxJjAkBgNVBAMMHUFERlMgU2lnbmluZyAtIGlkcC12Mi5zdW5pLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArm6IgvxtMFUJmgfL8QxY7oiy8EnbFPm9wosYvToTB7F5N3Vl8NUQY1f+gGDmXQOs+Bi43I/KbdKm5YyHdAardlrxM2JhYheL3Us8/917qGsMAuKhPfRsUpbg+wTQApRXOyk4/7sIYYUntmsHDK75sJ7ZrwXgCpyPlLw3P9W8C8f5U6KsxKFTBojgxPdjxoihHyJIE5CutVdB1dvPGtNoj6yyccdW3fKkwycCeImMRAzR/6wUMEHoQZKRkYmlbeXcgPRPNm5wfpXKVVtO7ViXiSYTdHg8/+o0PjD2wcKDRTJMei6h/J7I1F6+8l4xia6MQlHpkE0X0NB/TKiX0ibofHfpZBie1GY11+qfGh5YrElVdp9asNavrH/jD5f1z/2rOYE+z2/u9T2gK4iwkfj0HmDkWiPT44HF97mbOOiHrCofgrPGrRUcUuga7hFR+C9PTntM2BZSEAULZ0Sd+49hzBfNA0rTF3XKyceewOQPWWDozAh7OZ8F9OJpsdxdPKaEXVqKfQvjFrk4fqgNuUWB20Iz0LeVq4DunoUKrWFFCPRjzFr5wI5ZnzJ9IvSDxYb1oeHPq0vHnPaEsmIcL58aTIH0FGve4973pbY+hwexoYBaCgaoHFhzCFxRW16p8lA4oBMOYMnzodQiIXPYXyA9qQQgYxQ56r6DUmwT4iew2lkCAwEAAaNMMEowDgYDVR0PAQH/BAQDAgWgMBkGA1UdEQQSMBCCDmlkcC12Mi5zdW5pLnNlMB0GA1UdDgQWBBQJPnTTXlchD+zhTtnU2A4In9olajANBgkqhkiG9w0BAQsFAAOCAgEAGjPn+rajgsVnc2+biPE0oplQ2T6evv8nD6G27s6hoxg9ClcTFvAS5p/9F/JaV+kYvWlZ7ZcqNlW1nOvhe17dikcVDqUGg/2AbFpvZSqgE1gglOMCD+RuHnaJqU0z76+tavwrGoG/jWrVEUBM93ZUwDsc3SlXzGgeqdwP7ItDOzPKcp6Ufb8Qsn50WLaCfTxwPYS2kiW9uhbg1wfAcKqqqAz4E4MpMTRCMy9qYpuMbggp93z/WR+p/cjQy0OJL5XHeMb/bP1huNga6LOJnCy7YJ9xBLEOx1k1EWFBT8A+49s9LXWAcpS5aYg+Z3QaLg1u9JUbVpxYq7/xbbwiBtVcE779l9P262yTfsBdUiO7IoepeQ6iY8kBgdjkZM1QTp6UI/VJ6+KDJhPqTHiXDAHlxIVu4aIJJoVyCzrR1JGuF+d77piISosXp7gXwuVSrOtwHmXGI6FRaNU5fzjbq+OlRdd+kSKoRRrgJTW3sZ7pA/TFy9J/kJAWJEGzHyKhe781eG39CVPt5W/zJs8rdbwlHgb1ltVO7FBhgxKWYV5Hs6OKFSxbcRDJPi7babNsGz6iJXhc05KfSJedfbPHkoNxaS+PdUeHYSyaeH2d/9qMOhYa+fNZJQFkxASYE/FxDpI4gu6GYV5YtLBb0O+XjS3wQCqm19ajAGHZRmho/NuoyBk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.suni.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Södertörn University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Södertörn University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sh.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.sh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Legat</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)8-6084000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Legat</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)8-6084000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Info</md:GivenName>
-    <md:SurName>Center</md:SurName>
-    <md:EmailAddress>mailto:info@sh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)8-6084000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Alvaro</md:GivenName>
-    <md:SurName>Acevedo</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
deleted file mode 100644
index 16f00c0f..00000000
--- a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp.chalmers.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-01-21T11:10:17Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://idp.chalmers.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">chalmers.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Chalmers</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Chalmers</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Chalmers</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Chalmers</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.chalmers.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.chalmers.se/en/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="81" width="625">https://www.chalmers.se/SiteCollectionImages/Logotyper/Chalmers%20logotyp/Chalmers_black.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="81" width="625">https://www.chalmers.se/SiteCollectionImages/Logotyper/Chalmers%20logotyp/Chalmers_black.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>chalmers.se</mdui:DomainHint>
-        <mdui:IPHint>129.16.0.0/16</mdui:IPHint>
-        <mdui:GeolocationHint>geo:57.6899722,11.9774444</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDqTCCApGgAwIBAgIUJvJG3zA1H52oNzOAXoQe57Mk9AwwDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCU0UxDDAKBgNVBAgMA1ZHUjEMMAoGA1UEBwwDR0JHMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMRgwFgYDVQQDDA9pZHAuY2hhbG1lcnMuc2UwHhcNMjAwNzIwMTIzNTI4WhcNNDYwMzExMTIzNTI4WjBkMQswCQYDVQQGEwJTRTEMMAoGA1UECAwDVkdSMQwwCgYDVQQHDANHQkcxETAPBgNVBAoMCENoYWxtZXJzMQwwCgYDVQQLDANJVEExGDAWBgNVBAMMD2lkcC5jaGFsbWVycy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPuaynUvXy5n8He3Jefpxz2ELpaXM9mzhiLlF6NK41XJeLo7OsLD0l3kQH2AXQMXvkKV0hoh/dwxlUImj/jCCpBpdF8z4LmYtz4/+FNYq+fMSCf/TkhB2AbLJbPD+AT+yrrlPr3R7Smjd0emtgPWM20NcbBflTM9Uh2jZMeQLHSJu3dIoRW4cdZOKgwonVMTaocccDxxEMQUqE6k/mYCFmCVEYIGLBnkDPSixNIDtzY+WY70bN12HLwLhPhxCz8wS3C/NhXF5gNoChXcfUB3Fxw4lY4GuH49D5cwyvtVNNJR1uCVJFlSbj+xe9bjqjkKwal78iPcxSTLD1SBxPeia1kCAwEAAaNTMFEwHQYDVR0OBBYEFLHkg8AuJUdGvsY0mwofGr9cHWGfMB8GA1UdIwQYMBaAFLHkg8AuJUdGvsY0mwofGr9cHWGfMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC2nyf2NAWnIpedq7cA4tJsodhxDFNSS6tPPav4MypL2rC46a0W/YL5QJn32qoFTMJNfLglu2NWUfUeSKD22XlH/PKV4z/BPFtC9EXNmNbp2aBXSnoC5rmNr1VL/RgTPHL9ebx7BkpM+y/zAbLOeyKtlfumzDt30PrZAImcIHOp7LqkZjmb4RQFHWZc62pzbNjrXhywbTK3ry6K0U7gk1SvWxjD6U/cWSASaYotqWJryWoo7pVcLTGUUYmfCNi+IGINW+KRhUuH4W7+1STwh104kedGkUcbhXaNGtEpqQPwhNFnEnKZFiKy74rN/Ks2Puvinr2CeoSlfk1mRQSkiGxk=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDqTCCApGgAwIBAgIUJvJG3zA1H52oNzOAXoQe57Mk9AwwDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCU0UxDDAKBgNVBAgMA1ZHUjEMMAoGA1UEBwwDR0JHMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMRgwFgYDVQQDDA9pZHAuY2hhbG1lcnMuc2UwHhcNMjAwNzIwMTIzNTI4WhcNNDYwMzExMTIzNTI4WjBkMQswCQYDVQQGEwJTRTEMMAoGA1UECAwDVkdSMQwwCgYDVQQHDANHQkcxETAPBgNVBAoMCENoYWxtZXJzMQwwCgYDVQQLDANJVEExGDAWBgNVBAMMD2lkcC5jaGFsbWVycy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPuaynUvXy5n8He3Jefpxz2ELpaXM9mzhiLlF6NK41XJeLo7OsLD0l3kQH2AXQMXvkKV0hoh/dwxlUImj/jCCpBpdF8z4LmYtz4/+FNYq+fMSCf/TkhB2AbLJbPD+AT+yrrlPr3R7Smjd0emtgPWM20NcbBflTM9Uh2jZMeQLHSJu3dIoRW4cdZOKgwonVMTaocccDxxEMQUqE6k/mYCFmCVEYIGLBnkDPSixNIDtzY+WY70bN12HLwLhPhxCz8wS3C/NhXF5gNoChXcfUB3Fxw4lY4GuH49D5cwyvtVNNJR1uCVJFlSbj+xe9bjqjkKwal78iPcxSTLD1SBxPeia1kCAwEAAaNTMFEwHQYDVR0OBBYEFLHkg8AuJUdGvsY0mwofGr9cHWGfMB8GA1UdIwQYMBaAFLHkg8AuJUdGvsY0mwofGr9cHWGfMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC2nyf2NAWnIpedq7cA4tJsodhxDFNSS6tPPav4MypL2rC46a0W/YL5QJn32qoFTMJNfLglu2NWUfUeSKD22XlH/PKV4z/BPFtC9EXNmNbp2aBXSnoC5rmNr1VL/RgTPHL9ebx7BkpM+y/zAbLOeyKtlfumzDt30PrZAImcIHOp7LqkZjmb4RQFHWZc62pzbNjrXhywbTK3ry6K0U7gk1SvWxjD6U/cWSASaYotqWJryWoo7pVcLTGUUYmfCNi+IGINW+KRhUuH4W7+1STwh104kedGkUcbhXaNGtEpqQPwhNFnEnKZFiKy74rN/Ks2Puvinr2CeoSlfk1mRQSkiGxk=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola Aktiebolag</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.chalmers.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.chalmers.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Niklas</md:GivenName>
-    <md:SurName>Rosenqvist</md:SurName>
-    <md:EmailAddress>mailto:nrq@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Sandell</md:SurName>
-    <md:EmailAddress>mailto:biorn@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Chalmers</md:Company>
-    <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 31 772 6000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Chalmers Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@chalmers.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 31 772 8450</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
deleted file mode 100644
index 98abd4c9..00000000
--- a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.dev.eduid.se/idp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-17T16:03:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://dev.eduid.se/errors?code=ERRORURL_CODE&amp;ts=ERRORURL_TS&amp;rp=ERRORURL_RP&amp;tid=ERRORURL_TID&amp;ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">eduid.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">dev.eduid.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
-RTEiMCAGA1UEAxMZZGV2LTIwMTMxMjE5LmlkcC5lZHVpZC5zZTAeFw0xMzEyMTkx
-MjA3MzJaFw0xNjEyMTgxMjA3NDRaMDExCzAJBgNVBAYTAlNFMSIwIAYDVQQDExlk
-ZXYtMjAxMzEyMTkuaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8A
-MIIBOgKCATEA1f/fv5GSVkRNkPj1xVshkDlVaVTSeofLjJeFK820uVMaZagUsn8T
-mML2YdH8CyLEAZgeU8V/oF2P1SFieG1Ex3lBflLGWw/7pQqe08tjfTkeJthntJJR
-W2gCa4I0v1bsJS02U7pVizDv4/3zIo1EpAHrmu7NOs9ybCHA0RnrdQk6aHppe6nz
-571Cz3F6zlp9sc4X3Dbf1sVtXHSArUjOh3bgjQnvOAAirJqSYzZgav54WwLzcsas
-JMEwLnRSiyRxXm0dnuqhsM7xlJM/G7X35zhBQFwxUKJ33b1xu9PPFfoqIH/NjoPU
-gj15jTxvXQam0DvkHMFQvn87bfrtdW187ENZ2lPBYw/yFfF2Mffh0xYKlemJ7LEs
-Y1FMJStI+7vKEq9DHGedUfufhFEZNtJW0wIDAQABo0AwPjAMBgNVHRMBAf8EAjAA
-MA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFPM+gGbOGyvozZ3L44342h8VTKCN
-MA0GCSqGSIb3DQEBCwUAA4IBMQBlBpfl/507hO/upCjKsmtKL7SMufq/kGXb1VB8
-gFiBHgH96woVz/AwHRAVfdrKsQxriXFnOAlgnSAgUtfOmrO8t2mDJ3nxVLW/eKfz
-ZfrQCTLxcZpQnzmYlNCyFepjbpb0E9I2wkUeY4DvdzzMlQFwxjSDWa2NPc5UiXAe
-EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
-g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
-xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
-hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
-RTEiMCAGA1UEAxMZZGV2LTIwMTMxMjE5LmlkcC5lZHVpZC5zZTAeFw0xMzEyMTkx
-MjA3MzJaFw0xNjEyMTgxMjA3NDRaMDExCzAJBgNVBAYTAlNFMSIwIAYDVQQDExlk
-ZXYtMjAxMzEyMTkuaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8A
-MIIBOgKCATEA1f/fv5GSVkRNkPj1xVshkDlVaVTSeofLjJeFK820uVMaZagUsn8T
-mML2YdH8CyLEAZgeU8V/oF2P1SFieG1Ex3lBflLGWw/7pQqe08tjfTkeJthntJJR
-W2gCa4I0v1bsJS02U7pVizDv4/3zIo1EpAHrmu7NOs9ybCHA0RnrdQk6aHppe6nz
-571Cz3F6zlp9sc4X3Dbf1sVtXHSArUjOh3bgjQnvOAAirJqSYzZgav54WwLzcsas
-JMEwLnRSiyRxXm0dnuqhsM7xlJM/G7X35zhBQFwxUKJ33b1xu9PPFfoqIH/NjoPU
-gj15jTxvXQam0DvkHMFQvn87bfrtdW187ENZ2lPBYw/yFfF2Mffh0xYKlemJ7LEs
-Y1FMJStI+7vKEq9DHGedUfufhFEZNtJW0wIDAQABo0AwPjAMBgNVHRMBAf8EAjAA
-MA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFPM+gGbOGyvozZ3L44342h8VTKCN
-MA0GCSqGSIb3DQEBCwUAA4IBMQBlBpfl/507hO/upCjKsmtKL7SMufq/kGXb1VB8
-gFiBHgH96woVz/AwHRAVfdrKsQxriXFnOAlgnSAgUtfOmrO8t2mDJ3nxVLW/eKfz
-ZfrQCTLxcZpQnzmYlNCyFepjbpb0E9I2wkUeY4DvdzzMlQFwxjSDWa2NPc5UiXAe
-EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
-g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
-xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
-hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dev.eduid.se/slo/soap"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/slo/post"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/slo/redirect"/>
-    <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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/sso/redirect"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/sso/post"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dev.eduid.se/sso/art"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">eduID DEV TEST</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">eduID DEV TEST</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eduid.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduID</md:GivenName>
-    <md:SurName>developers</md:SurName>
-    <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:feedback+swamidtesting@eduid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
deleted file mode 100644
index 01723001..00000000
--- a/swamid-2.0/idp.esh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.esh.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-08-07T15:20:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.esh.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">esh.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">mchs.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Marie Cederschiöld högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Marie Cederschiöld University College</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Marie Cederschiöld högskola</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Marie Cederschiöld University College</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="144" width="144">https://idp.esh.se/idp/images/mchs.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="144" width="144">https://idp.esh.se/idp/images/mchs.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://www.mchs.se/engelska/marie-cederschiold-university/about-us.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.mchs.se/om-hogskolan.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.mchs.se/ovrigt/integritetspolicy-gdpr.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.mchs.se/engelska/marie-cederschiold-university/archive/integritetspolicy-gdpr.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVALaN98IcoLX3UQ+fKlQVmqP23WvBMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5lc2guc2UwHhcNMTMwODA3MDkwOTU4WhcNMzMw
-ODA3MDkwOTU4WjAVMRMwEQYDVQQDEwppZHAuZXNoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAn2ZQb1kuPTXtueUtR79lZa5hCV2fMlOlfFJFMyC3
-+6qQR6CGGZ7GvntHtIKpbfFqIeCsWNGXLttNDmGroG6koge0CEKv6z6JVD5tHert
-UVRA7GpDZpZLR7qRYcrbZp1tLrk9gKL3/PaudZhwAKuWiMz5HNyqk9Ojh3YRWJUD
-1O3RX6l2tvc8MjT8JYE2D+TpqqiT5k1WgV7zgCv3QVnazfuANKZ2qjxiKVi3bh1w
-V/3VDJiN9DYhN1NvU412QBZR1AU1XJL36qkKmeTOi8qhhlxh6abl2oEpgyjR0lxn
-o1HwkDipkIJJiN/h7CKlUnEHpPidI5tMy/PezW78h2znfwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuZXNoLnNlhiFodHRwczovL2lkcC5lc2guc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFDGWVB2qNc/D6uRZt2wqI4/SM3Y6MA0GCSqGSIb3DQEB
-BQUAA4IBAQCMaKhHwEwcXTM7/HO6RbavAsisMab0TsCmuYsrCtYFccdrFNEUs+R5
-qGwHre8J+0cMi0WgSIHXLnbhvjG3JPmBeLkZdSw/rOGtF6w6VSVpT2iGvfjNbsBq
-wFGkaEnsDKzhiBaIOcJyAJoh97PJygz7yriziwxDZrB7b0xnBHVs6u4HNuQjd/NA
-geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
-+PUaqX2b8yCDIeHr7NkqtYf1nqphQ71OvdKe1R6Pzw9N19ny10FJcZypisRt/ghv
-9SqhISRU1eEjg6GtcLZCkvdVGag/E4qO
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.esh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">esh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVALaN98IcoLX3UQ+fKlQVmqP23WvBMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5lc2guc2UwHhcNMTMwODA3MDkwOTU4WhcNMzMw
-ODA3MDkwOTU4WjAVMRMwEQYDVQQDEwppZHAuZXNoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAn2ZQb1kuPTXtueUtR79lZa5hCV2fMlOlfFJFMyC3
-+6qQR6CGGZ7GvntHtIKpbfFqIeCsWNGXLttNDmGroG6koge0CEKv6z6JVD5tHert
-UVRA7GpDZpZLR7qRYcrbZp1tLrk9gKL3/PaudZhwAKuWiMz5HNyqk9Ojh3YRWJUD
-1O3RX6l2tvc8MjT8JYE2D+TpqqiT5k1WgV7zgCv3QVnazfuANKZ2qjxiKVi3bh1w
-V/3VDJiN9DYhN1NvU412QBZR1AU1XJL36qkKmeTOi8qhhlxh6abl2oEpgyjR0lxn
-o1HwkDipkIJJiN/h7CKlUnEHpPidI5tMy/PezW78h2znfwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuZXNoLnNlhiFodHRwczovL2lkcC5lc2guc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFDGWVB2qNc/D6uRZt2wqI4/SM3Y6MA0GCSqGSIb3DQEB
-BQUAA4IBAQCMaKhHwEwcXTM7/HO6RbavAsisMab0TsCmuYsrCtYFccdrFNEUs+R5
-qGwHre8J+0cMi0WgSIHXLnbhvjG3JPmBeLkZdSw/rOGtF6w6VSVpT2iGvfjNbsBq
-wFGkaEnsDKzhiBaIOcJyAJoh97PJygz7yriziwxDZrB7b0xnBHVs6u4HNuQjd/NA
-geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
-+PUaqX2b8yCDIeHr7NkqtYf1nqphQ71OvdKe1R6Pzw9N19ny10FJcZypisRt/ghv
-9SqhISRU1eEjg6GtcLZCkvdVGag/E4qO
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Marie Cederschiöld högskola</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Marie Cederschiöld University College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Marie Cederschiöld högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Marie Cederschiöld University College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.mchs.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.mchs.se/engelska/marie-cederschiold-university/about-us.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:it-support@mchs.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:it-support@mchs.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hb.se-idp-shibboleth.xml b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
deleted file mode 100644
index 204c3d03..00000000
--- a/swamid-2.0/idp.hb.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.hb.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-21T10:28:32Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.hb.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Gemensam inloggning för anställda och studenter vid Högskolan i Borås.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.hb.se/en/shortcuts/about-the-site/privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hb.se/genvagar/om-webbplatsen/integritetspolicy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>hb.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.171.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.172.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.173.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.174.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.175.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.245.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.246.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.247.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.64.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.65.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.66.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.67.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.68.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.69.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.70.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAL3f/r7Mi6ciVm/e8OZgSG++lXcfMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTAeFw0xNzA0MTgxMzM5NTJaFw0zNzA0
-MTgxMzM5NTJaMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAIlnFQ8xbSk6q1YveAbIIA2fI+iMS4xvt2Tz1dGC9JH6
-k+q7hmhkun9AKf83qvC21/OceHVL39HWUqulxzYT9lWh6eNvSry4l+LEv8ZZfKbc
-Ca/xnywBJxX+CP3JLZ0rYy7bG6DSdV28VwEAqVxv9TOHtRTgqLRNt9GXeG6n/rQ1
-pjMFK9cdryxr1p4aA8peNLTf67+jkyswdWDWCmQKhCeyjp2Auq2x0oKGs4s2kC3J
-FxlXUIkUPEfQHSBJNupADf2o6Q+S91RrTF5L32/s8EskzF6ki1L/G5Nj2tRybGIN
-ckMcDzBZCgYFbrewQEg1Kg/Ycfz7jqKRlrYWWZM5sD8CAwEAAaNZMFcwHQYDVR0O
-BBYEFIKj4aNRIKMbqtB9sIxGMyv2bY0jMDYGA1UdEQQvMC2CCWlkcC5oYi5zZYYg
-aHR0cHM6Ly9pZHAuaGIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAD7JbYiFV/ZjB0gprmtjxOYssKyR4jteZzRJphRTWgW110kzVa/lGxZ2G/P5
-VCIxNOok2yGKV4mePp9rMFADqylJH2APlHBFI7jbuybDbbkRAHn19m5LkQh2LlwK
-IDov0WmXDjw+ynVw4t078qDLMYBP4dmt2Ilf4NOdBmuAMnO6FZb/nH3ZvGQ3jjXz
-uuCgtueIEsQsGDmnuQMvZNU7T9QJtLtflzEHeoXg/UdnzvqCfe7mv+PiLCaaNvIC
-aNzNVJS43oE8N/RPT9WEW3649pid7xIH08GlKoSWS9h7nQ3mmpqN/5GSCU3mSkFB
-5jjPqQlCtd4Mea3oQxxMb/5gb28=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAODVB2ypU//Q3LwiHFiFzHcpvnT3MA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTAeFw0xNzA0MTgxMzM5NTFaFw0zNzA0
-MTgxMzM5NTFaMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKEmsrmH7s9sDFsqZo/h0CXMFGhLBbOa7vSUpGZK81CS
-vBHwPqoL4yT2PYz6d1Qh0brsVxu3sZaycHualiEwkOIJA7WuFzL3jn+Az9xN288k
-JOAkfBisG8HFkcpttA3aVCk2d5WN/niwu9t+ifQpP0gC1jWSJuqDlXoobVE9Iiop
-cN0RVJqIrhWBs46kci6lVukOJxr6NIelitJ35b6D5dyfy6Dwd/ArcYLzmlaNUuME
-bOk69dwDFxSSVrlshXBw6sRj/lMBjv6bSMBpQ7DtwQ7NWeVm4m5MzjdLD+bTYt1w
-h+jHqJP6fGdfuHswvmVmxk9WhKYmp5gLSMb/MboTvk8CAwEAAaNZMFcwHQYDVR0O
-BBYEFJOvXFs32c4Ma5iKhwNYn8UhHxzaMDYGA1UdEQQvMC2CCWlkcC5oYi5zZYYg
-aHR0cHM6Ly9pZHAuaGIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAJIF3I+RNX4Vex5OYMOtS5tH+DqpZMadaCPSLBilkZDjjy/OkXU3sHVDhWbH
-W/K1rz1EZMH8Ylrmb53xtKYuCoa5UiKGg/y0h+2qQx6Jmo5v0RRAAJ9o15V4Ip5e
-dq3Nj34A/iaHB/n4b8lje4VnFfnxWDZpK9dyx61yohij/lVJbKSIo9zOivT2qyuC
-D4yAPhVFuaWijZN3fVO2O8Mm8kuiZ1SVz+At+8P+Qyzs8pWXeIsUcOQoarMNNzV0
-+mWCdZeUsrrI34XBTNKUWl5IIJcaitlI+XSyO7ly9j9+M+cgqvyWZwcvYYfRX9Yc
-tYvY9KtsWRS4ptxG7wPFhpTS16I=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUPOSCysS2ht2Gyi/OII/QmaW79bAwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmhiLnNlMB4XDTE3MDQxODEzMzk1MVoXDTM3MDQx
-ODEzMzk1MVowFDESMBAGA1UEAwwJaWRwLmhiLnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAjnasPZWPUmv9oShtxGS6CEBxP2s3mCLq5Q2W08UG6wFi
-FmGc8+/xiCGUF8nvza9hhR9VlaQBXSkDSGuNnOqMdGWcocSyQapA0FM5YBIOmY5n
-UP/wZw8BuRKxBUKmuRxtP4RrRB2/uzkIn/JOCCdkz/kPVA4CVdoSfp80IG55bSPR
-hpeVL2y/15pLksllnng+s6TS+mdrNISDLhb6wV6yGCSHMLU3sWjk7e6NNtJAc7wF
-fKM7m73ZCHaNNTFH8m+JELF1smT9ivMhDWYtYOP7+lgvlkeqBqS0DNOrjoquvPi1
-PntylpIaDVNNNjTbK5+93wpx4qhVHwplz36uU1o3XwIDAQABo1kwVzAdBgNVHQ4E
-FgQUW7h4te8wKIRcUCEp2JKcRMMhTDgwNgYDVR0RBC8wLYIJaWRwLmhiLnNlhiBo
-dHRwczovL2lkcC5oYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAQzU4/hcrO0IQyohlCMeVrLMA9TxMMF98Yv8nlE1rofmGvMcWQDu4P2dKPg8j
-pYtNQtT8qHS5ddi/udoPW/Pyh+FnEivGATYr+ZMSGVbiIYeVqgR+OVEYG4q74eGB
-BFlF6bn4Mknnkc61U6VzBH9agG4Bd1Ymj7zd/thj8mfuGaOFc6H+2JrpUCs87F4t
-1MEye5yabSatabJIeH2CUaHjunQh0hyUjra++4+lq8NwfGWabXVTJpex5k+2rNVI
-8tmsmA3ePTyREkpG/Yjb2eYxO2gz4ESe5zudu1p+ohSXyDuuuMk9T/bPNTqVeisj
-hdayeb3tw8qRMHjEVgFSXDHRlA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hb.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hb.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hb.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hb.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hb.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hb.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAL3f/r7Mi6ciVm/e8OZgSG++lXcfMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTAeFw0xNzA0MTgxMzM5NTJaFw0zNzA0
-MTgxMzM5NTJaMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAIlnFQ8xbSk6q1YveAbIIA2fI+iMS4xvt2Tz1dGC9JH6
-k+q7hmhkun9AKf83qvC21/OceHVL39HWUqulxzYT9lWh6eNvSry4l+LEv8ZZfKbc
-Ca/xnywBJxX+CP3JLZ0rYy7bG6DSdV28VwEAqVxv9TOHtRTgqLRNt9GXeG6n/rQ1
-pjMFK9cdryxr1p4aA8peNLTf67+jkyswdWDWCmQKhCeyjp2Auq2x0oKGs4s2kC3J
-FxlXUIkUPEfQHSBJNupADf2o6Q+S91RrTF5L32/s8EskzF6ki1L/G5Nj2tRybGIN
-ckMcDzBZCgYFbrewQEg1Kg/Ycfz7jqKRlrYWWZM5sD8CAwEAAaNZMFcwHQYDVR0O
-BBYEFIKj4aNRIKMbqtB9sIxGMyv2bY0jMDYGA1UdEQQvMC2CCWlkcC5oYi5zZYYg
-aHR0cHM6Ly9pZHAuaGIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAD7JbYiFV/ZjB0gprmtjxOYssKyR4jteZzRJphRTWgW110kzVa/lGxZ2G/P5
-VCIxNOok2yGKV4mePp9rMFADqylJH2APlHBFI7jbuybDbbkRAHn19m5LkQh2LlwK
-IDov0WmXDjw+ynVw4t078qDLMYBP4dmt2Ilf4NOdBmuAMnO6FZb/nH3ZvGQ3jjXz
-uuCgtueIEsQsGDmnuQMvZNU7T9QJtLtflzEHeoXg/UdnzvqCfe7mv+PiLCaaNvIC
-aNzNVJS43oE8N/RPT9WEW3649pid7xIH08GlKoSWS9h7nQ3mmpqN/5GSCU3mSkFB
-5jjPqQlCtd4Mea3oQxxMb/5gb28=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAODVB2ypU//Q3LwiHFiFzHcpvnT3MA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTAeFw0xNzA0MTgxMzM5NTFaFw0zNzA0
-MTgxMzM5NTFaMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKEmsrmH7s9sDFsqZo/h0CXMFGhLBbOa7vSUpGZK81CS
-vBHwPqoL4yT2PYz6d1Qh0brsVxu3sZaycHualiEwkOIJA7WuFzL3jn+Az9xN288k
-JOAkfBisG8HFkcpttA3aVCk2d5WN/niwu9t+ifQpP0gC1jWSJuqDlXoobVE9Iiop
-cN0RVJqIrhWBs46kci6lVukOJxr6NIelitJ35b6D5dyfy6Dwd/ArcYLzmlaNUuME
-bOk69dwDFxSSVrlshXBw6sRj/lMBjv6bSMBpQ7DtwQ7NWeVm4m5MzjdLD+bTYt1w
-h+jHqJP6fGdfuHswvmVmxk9WhKYmp5gLSMb/MboTvk8CAwEAAaNZMFcwHQYDVR0O
-BBYEFJOvXFs32c4Ma5iKhwNYn8UhHxzaMDYGA1UdEQQvMC2CCWlkcC5oYi5zZYYg
-aHR0cHM6Ly9pZHAuaGIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAJIF3I+RNX4Vex5OYMOtS5tH+DqpZMadaCPSLBilkZDjjy/OkXU3sHVDhWbH
-W/K1rz1EZMH8Ylrmb53xtKYuCoa5UiKGg/y0h+2qQx6Jmo5v0RRAAJ9o15V4Ip5e
-dq3Nj34A/iaHB/n4b8lje4VnFfnxWDZpK9dyx61yohij/lVJbKSIo9zOivT2qyuC
-D4yAPhVFuaWijZN3fVO2O8Mm8kuiZ1SVz+At+8P+Qyzs8pWXeIsUcOQoarMNNzV0
-+mWCdZeUsrrI34XBTNKUWl5IIJcaitlI+XSyO7ly9j9+M+cgqvyWZwcvYYfRX9Yc
-tYvY9KtsWRS4ptxG7wPFhpTS16I=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUPOSCysS2ht2Gyi/OII/QmaW79bAwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmhiLnNlMB4XDTE3MDQxODEzMzk1MVoXDTM3MDQx
-ODEzMzk1MVowFDESMBAGA1UEAwwJaWRwLmhiLnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAjnasPZWPUmv9oShtxGS6CEBxP2s3mCLq5Q2W08UG6wFi
-FmGc8+/xiCGUF8nvza9hhR9VlaQBXSkDSGuNnOqMdGWcocSyQapA0FM5YBIOmY5n
-UP/wZw8BuRKxBUKmuRxtP4RrRB2/uzkIn/JOCCdkz/kPVA4CVdoSfp80IG55bSPR
-hpeVL2y/15pLksllnng+s6TS+mdrNISDLhb6wV6yGCSHMLU3sWjk7e6NNtJAc7wF
-fKM7m73ZCHaNNTFH8m+JELF1smT9ivMhDWYtYOP7+lgvlkeqBqS0DNOrjoquvPi1
-PntylpIaDVNNNjTbK5+93wpx4qhVHwplz36uU1o3XwIDAQABo1kwVzAdBgNVHQ4E
-FgQUW7h4te8wKIRcUCEp2JKcRMMhTDgwNgYDVR0RBC8wLYIJaWRwLmhiLnNlhiBo
-dHRwczovL2lkcC5oYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAQzU4/hcrO0IQyohlCMeVrLMA9TxMMF98Yv8nlE1rofmGvMcWQDu4P2dKPg8j
-pYtNQtT8qHS5ddi/udoPW/Pyh+FnEivGATYr+ZMSGVbiIYeVqgR+OVEYG4q74eGB
-BFlF6bn4Mknnkc61U6VzBH9agG4Bd1Ymj7zd/thj8mfuGaOFc6H+2JrpUCs87F4t
-1MEye5yabSatabJIeH2CUaHjunQh0hyUjra++4+lq8NwfGWabXVTJpex5k+2rNVI
-8tmsmA3ePTyREkpG/Yjb2eYxO2gz4ESe5zudu1p+ohSXyDuuuMk9T/bPNTqVeisj
-hdayeb3tw8qRMHjEVgFSXDHRlA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>University of Borås</md:Company>
-    <md:GivenName>IRT HB</md:GivenName>
-    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hh.se-idp-shibboleth.xml b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
deleted file mode 100644
index 6472cb87..00000000
--- a/swamid-2.0/idp.hh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.hh.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:06:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.hh.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Halmstad University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://dokumentarkiv.hh.se/api/showDocument/216B05EA-08C4-40A0-83CA-1BD8290D7D1F</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://dokumentarkiv.hh.se/api/showDocument/216B05EA-08C4-40A0-83CA-1BD8290D7D1F</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
-        <mdui:Logo xml:lang="sv" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-sv-350x116.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-en-350x116.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://dokumentarkiv.hh.se/api/showDocument/803494D3-9874-4FA4-958E-B4D8ECE75BE2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://dokumentarkiv.hh.se/api/showDocument/803494D3-9874-4FA4-958E-B4D8ECE75BE2</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>hh.se</mdui:DomainHint>
-        <mdui:IPHint>194.47.0.0/20</mdui:IPHint>
-        <mdui:GeolocationHint>geo:56.6647,12.8779</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAJsBkOckapNcBBI8b7dWvImrhvIGMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTAeFw0xNjAzMTQxMDIxMTVaFw0zNjAz
-MTQxMDIxMTVaMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKQZPY4ffk0ILD/HkgK1m3/A0brL1F5hYyNZwFZ+Yjzc
-5hslf1wkKD5eolCwXXioP6e8eK7wKjCTBJEvzvJCszlZQebw0cIXVu9EiwABgkCY
-EYOH00GSdQ2qM/fc+LQmOBydBJedueySkWN2A+IVPSLkRScQ2/uPGC0O/DmmMgHQ
-FkvGeqUE9xJ7s1XoNFKXs040nm99lhEzTNgLNx8G1otG7UUxOcexF/cAlsZsEjLJ
-ZEmwmdD9ECzZY2QA+9q3t1qi80k3+a7O6zr+WBH9FQfWa+k0rEeIriOkwfAg9tlq
-DEnEB+eAUmZ28AgwnaYDbzsZtI2YSH4QMPgtRmDyU+8CAwEAAaNZMFcwHQYDVR0O
-BBYEFAJTEdrIrB9bf0eOmm3A1+UjoawuMDYGA1UdEQQvMC2CCWlkcC5oaC5zZYYg
-aHR0cHM6Ly9pZHAuaGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBADREnV4Q0/naj76myeKUipMsN2VZLYx+K/Zi1aPIzGEieD9nBWB3HpsLarNI
-B5IInXqfeXSQQKMlTkc5lDPzFMPLFN89lXqpaIUXQTSNAYRwffnIWBodPl7okRtd
-oH074EEVvBi4ng8vx1UdGsQ3H44jqF/pHwG4cVH6pVi9eVYRo/OyjoV5QskgAv+R
-CPXQ5nPK2P2QzEkxQaVmZlyTGsLxQmFMFKkCxA2akT8kBwc3q2YHklkabvMWu6ZV
-+a0KsOLFqva5pDxPAzfLGzWOvFdOh52dMkTg1FHPVl9S9Fgphj4fDw21rNcCoU7B
-Wj/p8G0pPieiOJ6Mgh4niOFi9oo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUMNLqLN3AFMdnKkcUCavqKY5Z1rUwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmhoLnNlMB4XDTE2MDMxNDEwMjExNFoXDTM2MDMx
-NDEwMjExNFowFDESMBAGA1UEAwwJaWRwLmhoLnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAi55P1kE9G13DcJi+Ax78CXKgbZ6+q94plXIo3/vT92RI
-i/UTH7Hl05EnrQRp9N9bmgCes2lG45aJHgyPUhK58nFChFubhKN0pe8G9tEaztPY
-XcoCnaKIzexEdwfQoLUz1YrUYcbddfrwH1ZodIDYq5HsKMfNW1bd5hHXuXCnCRYv
-byXfbjYzASZy0swUs2vhI9pgdjRTbiqDp8q7xa4SIk7thb2SvX3hBOB0BqhQ1Jn/
-7tCb930KvnhFyXoU5JPRheAVVoGx6/EJBltm+peFyN0uZ5vu9kHr+BWPhIeTF9bp
-NNTeTU6UqPvZSj2WGAHGqCyONNjxGHY0ABnX6V7ETQIDAQABo1kwVzAdBgNVHQ4E
-FgQUneSufQDUeoAhtTA9tc7eb1yG1WUwNgYDVR0RBC8wLYIJaWRwLmhoLnNlhiBo
-dHRwczovL2lkcC5oaC5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAWEeKH4iKPD1bCt88NLQVSfYC2iqKqzyDVx1g01J2pNXlN1KNCVdVHPv1azSD
-+UFDybpPC70pD3pCM9ahmKIfyhrTNew3M4YqLJmYluCW7zoqOD8VCEVKYAYGMtbF
-UZ+W4afoHQu/pwi2tRUO4r2Eb9WPY3q9jrH2snZ15sPWYb68FmQfBEnCmOJ19zi7
-BssPc57//UxkmPvVLUm34B+9mg/XeBp4WTofKBbcnQv0urSGKxZkQBUv1fzPpPXJ
-JtV+lqSk+kYDb84rW0BSqP0OL5z7Bp7rrCCwC1KeLpebKulJMozAxWqIPPS10ABB
-RgAusEoMo1w4CrwOMBfFqoCZ6g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAITxucLq7luivXgcQ3B89B7PSw8ZMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTAeFw0xNjAzMTQxMDIxMTVaFw0zNjAz
-MTQxMDIxMTVaMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAN+2P9ydGsvYJ8EGP5tYFOMG2bm3jNe5X4Bp4WhpW/Wp
-Ljjy1G0hk5N6jGDI+wYnKv98k4sbq9lDnJjogeOkb48BAuLMJpRTxtBAkaymEe1v
-cKbogIyweBr1uCcpjo5YESiSM143JCBJDFqgvWy0KF/nwcUcBNQdhHksAm9W73Nh
-5BwcUUFs5ZPeksh6ZwjJiUNN0Q4JjLCy+C0Mj/lYdoR0OFPvYTIob7At/eFdJaFE
-674at26mQpNMYNF5OhzgxjS4sKdz30fyqxpCAd0YXHxvQmEuV2cuPC3hRngAan5q
-1V0JTntvkWfw5eDNUQbGYtbfgi+JZ4diqB0pamVfdUsCAwEAAaNZMFcwHQYDVR0O
-BBYEFMVOc9dqf73Mw2AibdRxxwwMsV5IMDYGA1UdEQQvMC2CCWlkcC5oaC5zZYYg
-aHR0cHM6Ly9pZHAuaGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAJ/wd24lDHPNp9HFjTM/MQUKaXF7hRHVFmbS2y861uKJNDoXyTsYvw34Yp+c
-KkB7pyc0HSEuIV1h2SuYJFngDrTPjmrcINEifJEWjAAqfSbamRBUxfErrSST6kjQ
-jZnK4OYn3wwLvUdN6Oei50JoOctm+2ozRoEvxJzXCHzbgXhg5QT0AvuXDwazrpFf
-Jm9frku2giBQQfFJ6/2gIdl4GjTQbynSuOoN5JiWfcM5vFhSTC1v/QG/GBmQ2qzy
-9qyt59TmyF+x55Que3hWuTVL/KqR1uGgUdExVpSPZX7d35mh1KAI/ZFTZFfzqgye
-YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAJsBkOckapNcBBI8b7dWvImrhvIGMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTAeFw0xNjAzMTQxMDIxMTVaFw0zNjAz
-MTQxMDIxMTVaMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKQZPY4ffk0ILD/HkgK1m3/A0brL1F5hYyNZwFZ+Yjzc
-5hslf1wkKD5eolCwXXioP6e8eK7wKjCTBJEvzvJCszlZQebw0cIXVu9EiwABgkCY
-EYOH00GSdQ2qM/fc+LQmOBydBJedueySkWN2A+IVPSLkRScQ2/uPGC0O/DmmMgHQ
-FkvGeqUE9xJ7s1XoNFKXs040nm99lhEzTNgLNx8G1otG7UUxOcexF/cAlsZsEjLJ
-ZEmwmdD9ECzZY2QA+9q3t1qi80k3+a7O6zr+WBH9FQfWa+k0rEeIriOkwfAg9tlq
-DEnEB+eAUmZ28AgwnaYDbzsZtI2YSH4QMPgtRmDyU+8CAwEAAaNZMFcwHQYDVR0O
-BBYEFAJTEdrIrB9bf0eOmm3A1+UjoawuMDYGA1UdEQQvMC2CCWlkcC5oaC5zZYYg
-aHR0cHM6Ly9pZHAuaGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBADREnV4Q0/naj76myeKUipMsN2VZLYx+K/Zi1aPIzGEieD9nBWB3HpsLarNI
-B5IInXqfeXSQQKMlTkc5lDPzFMPLFN89lXqpaIUXQTSNAYRwffnIWBodPl7okRtd
-oH074EEVvBi4ng8vx1UdGsQ3H44jqF/pHwG4cVH6pVi9eVYRo/OyjoV5QskgAv+R
-CPXQ5nPK2P2QzEkxQaVmZlyTGsLxQmFMFKkCxA2akT8kBwc3q2YHklkabvMWu6ZV
-+a0KsOLFqva5pDxPAzfLGzWOvFdOh52dMkTg1FHPVl9S9Fgphj4fDw21rNcCoU7B
-Wj/p8G0pPieiOJ6Mgh4niOFi9oo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUMNLqLN3AFMdnKkcUCavqKY5Z1rUwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmhoLnNlMB4XDTE2MDMxNDEwMjExNFoXDTM2MDMx
-NDEwMjExNFowFDESMBAGA1UEAwwJaWRwLmhoLnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAi55P1kE9G13DcJi+Ax78CXKgbZ6+q94plXIo3/vT92RI
-i/UTH7Hl05EnrQRp9N9bmgCes2lG45aJHgyPUhK58nFChFubhKN0pe8G9tEaztPY
-XcoCnaKIzexEdwfQoLUz1YrUYcbddfrwH1ZodIDYq5HsKMfNW1bd5hHXuXCnCRYv
-byXfbjYzASZy0swUs2vhI9pgdjRTbiqDp8q7xa4SIk7thb2SvX3hBOB0BqhQ1Jn/
-7tCb930KvnhFyXoU5JPRheAVVoGx6/EJBltm+peFyN0uZ5vu9kHr+BWPhIeTF9bp
-NNTeTU6UqPvZSj2WGAHGqCyONNjxGHY0ABnX6V7ETQIDAQABo1kwVzAdBgNVHQ4E
-FgQUneSufQDUeoAhtTA9tc7eb1yG1WUwNgYDVR0RBC8wLYIJaWRwLmhoLnNlhiBo
-dHRwczovL2lkcC5oaC5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAWEeKH4iKPD1bCt88NLQVSfYC2iqKqzyDVx1g01J2pNXlN1KNCVdVHPv1azSD
-+UFDybpPC70pD3pCM9ahmKIfyhrTNew3M4YqLJmYluCW7zoqOD8VCEVKYAYGMtbF
-UZ+W4afoHQu/pwi2tRUO4r2Eb9WPY3q9jrH2snZ15sPWYb68FmQfBEnCmOJ19zi7
-BssPc57//UxkmPvVLUm34B+9mg/XeBp4WTofKBbcnQv0urSGKxZkQBUv1fzPpPXJ
-JtV+lqSk+kYDb84rW0BSqP0OL5z7Bp7rrCCwC1KeLpebKulJMozAxWqIPPS10ABB
-RgAusEoMo1w4CrwOMBfFqoCZ6g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAITxucLq7luivXgcQ3B89B7PSw8ZMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTAeFw0xNjAzMTQxMDIxMTVaFw0zNjAz
-MTQxMDIxMTVaMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAN+2P9ydGsvYJ8EGP5tYFOMG2bm3jNe5X4Bp4WhpW/Wp
-Ljjy1G0hk5N6jGDI+wYnKv98k4sbq9lDnJjogeOkb48BAuLMJpRTxtBAkaymEe1v
-cKbogIyweBr1uCcpjo5YESiSM143JCBJDFqgvWy0KF/nwcUcBNQdhHksAm9W73Nh
-5BwcUUFs5ZPeksh6ZwjJiUNN0Q4JjLCy+C0Mj/lYdoR0OFPvYTIob7At/eFdJaFE
-674at26mQpNMYNF5OhzgxjS4sKdz30fyqxpCAd0YXHxvQmEuV2cuPC3hRngAan5q
-1V0JTntvkWfw5eDNUQbGYtbfgi+JZ4diqB0pamVfdUsCAwEAAaNZMFcwHQYDVR0O
-BBYEFMVOc9dqf73Mw2AibdRxxwwMsV5IMDYGA1UdEQQvMC2CCWlkcC5oaC5zZYYg
-aHR0cHM6Ly9pZHAuaGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAJ/wd24lDHPNp9HFjTM/MQUKaXF7hRHVFmbS2y861uKJNDoXyTsYvw34Yp+c
-KkB7pyc0HSEuIV1h2SuYJFngDrTPjmrcINEifJEWjAAqfSbamRBUxfErrSST6kjQ
-jZnK4OYn3wwLvUdN6Oei50JoOctm+2ozRoEvxJzXCHzbgXhg5QT0AvuXDwazrpFf
-Jm9frku2giBQQfFJ6/2gIdl4GjTQbynSuOoN5JiWfcM5vFhSTC1v/QG/GBmQ2qzy
-9qyt59TmyF+x55Que3hWuTVL/KqR1uGgUdExVpSPZX7d35mh1KAI/ZFTZFfzqgye
-YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Halmstad University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan i Halmstad</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hh.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Halmstad University</md:Company>
-    <md:SurName>Magnus Morén</md:SurName>
-    <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Halmstad University</md:Company>
-    <md:SurName>Magnus Morén</md:SurName>
-    <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Halmstad University</md:Company>
-    <md:SurName>Helpdesk Högskloan i Halmstad</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
-    <md:TelephoneNumber>+35 167800</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
deleted file mode 100644
index 4b76121b..00000000
--- a/swamid-2.0/idp.his.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.his.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-12T13:50:46Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.his.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">his.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Skövde</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Skövde</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for University of Skövde</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.his.se/mot-hogskolan/sa-har-fungerar-hogskolan/styrdokument/generell-beskrivning-av-saml2-websso/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.his.se/en/about-us/facts-and-figures/governing-documents/general-description-of-saml2-websso/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="196" width="206">https://idp.his.se/idp/images/ny_his_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="196" width="206">https://idp.his.se/idp/images/ny_his_logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">skövde his</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">skövde his</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.his.se/mot-hogskolan/sa-har-fungerar-hogskolan/styrdokument/policy-hantering-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.his.se/en/about-us/facts-and-figures/governing-documents/policy-management-personal-information/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>his.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.176.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.184.0/23</mdui:IPHint>
-        <mdui:IPHint>193.11.96.0/22</mdui:IPHint>
-        <mdui:IPHint>212.25.128.0/23</mdui:IPHint>
-        <mdui:IPHint>212.25.134.0/23</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.39,13.85</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:58.39412,13.85542</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFFDCCAvygAwIBAgIVALwi1H+BLbsBo4cZ5U3MIvXjmpklMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5oaXMuc2UwHhcNMjExMTExMTMzOTE3WhcNNDEx
-MTExMTMzOTE3WjAVMRMwEQYDVQQDDAppZHAuaGlzLnNlMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAgGMmGX4n0p30xWDCBSuJ/hT0zsszJ3zr/RR1ffA3
-AULhzg9//KLDU+qXmWhRfoS1rcHihOUv8iOusrcJs9cDyiQSrubXq1CkVdXeuUdg
-Ka6q4SJXb7xpicqHSOaWBP1wudQ5R7V9ZbpQp9ND31uHPYuknafhTj6Zm2CHBd12
-NlkLvDHnIGZXCvNttIyF9j2qFlqei66ZPFbEiM8h7UIgurvN0fpYGiENQK2rt4Hj
-8/Xyq+GWkpQ1PgFQEAqWJxT2INu2hc+XJdX8Jpw05UKwvdCnCOWxQUFRemo750dN
-s1dBgweLB/EBnUaIprO/ebmN8i3JlWkeNrxvCGzbxRxYTdd1s67W4vGopWAWCWfm
-46mi/H/h7WJMYtdLQayYVy0+L9lboczrC/lzPmJjG5QlXCQ6fk4ReLw0j/OMRZlP
-GO4A5ocoBPSrbEPmZPSPPQ27xGbo19QrGrWoemX74Rr2nPlqc0hQe20DL3jnJcW7
-w/8UA4ytVmMOXeJiZTn1L3O1DTMrNZYRBlcSIWEYt4Vt0B5KgNsB6hxKnKZHn45O
-GfE+FUldUzcmcvcdDbkrVTsugr3Dqp17mgZOBqi55gLWWVF9fBdmlKHI9TPwBBUN
-K4uqagObbHhPCLnSXpY/sp4EWtXfbg6BDwFTz8Ix4cZimspLKRSAOacx0MvPuDwe
-Z30CAwEAAaNbMFkwHQYDVR0OBBYEFEqoUQBrShfNETUyANZdXnT+tbeWMDgGA1Ud
-EQQxMC+CCmlkcC5oaXMuc2WGIWh0dHBzOi8vaWRwLmhpcy5zZS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAgEAfC488j5EY/CIOT/Ct03iPKic0vySXcWQ
-4g9obiUKn+qDLvLwIxqi7gcZ7fh5ZXazoqpq9q/ZAf1NDb/qPYEOQiVLpgwqbF/e
-spGUONcRLQ1y0Ebp1bkRTYg2Xq6ioPFKEUiCWse14tQE6OOMOSQzG+6W8ruLZJAK
-7c9WPUfObUtJD+ApjYbQ1Qx62eIayLP2MnxPRANb2X0CbnwtPmPyppetvrhx9F7p
-C2rN9sk/HkTDVu3C2iapLUWBaEkaxUbL0dQFtUO/ybzisMvhPCwXayugFjwhHyjp
-qWZNPrdPBYA0EgX8j8lt+sdEsCCEj0SV7/p8r7ICCs3lP1V09GMdpF0ELPuchtvZ
-7z6E9+2mrMQ3WnOHoyc2PdsJaqpgeiuP6V+3dAZ1e3oC/Ap73zzMkgv3JmaY6cNR
-Vw3cCIzdAGrvf03gxxCYwTS6pNlMqraSa6MRRBFqYT8GKTz3+eZx08DrqcMYTb6t
-r0gFZmO2q6KwqC7XYqi7nznbhg/EqJY+8WjbGx0M0qBPOAy68NbM6EE9J6BmyySC
-n3PflyA1fNnxPsvo/0HcC+J8rO29QAvfOugZM69zHXAGM8X1XFAOAnX/f9Iv7BQs
-DpIK4YRNEspb2FURNjXQAF9FNL6V5vlyn+v0Xzqg/ZbOg5gpN+inDJOpzw2qBfyk
-zd/8UxmFiKo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFEzCCAvugAwIBAgIUEFwJoMHCpORaZBP7wDLi8em/px4wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmhpcy5zZTAeFw0yMTExMTExMzM3MjZaFw00MTEx
-MTExMzM3MjZaMBUxEzARBgNVBAMMCmlkcC5oaXMuc2UwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCVW6+7BNJBQGoUo1rtNzYzin1NgVWwDpNk/2Y8Czd/
-WNpCRKlS78cBGmXSlnn695k6Zhqpo44nc/yBf1dnHGEwM5e4z81YanCezeXN6Nya
-JRMzxuODUXdblDLdm8hri9mhQPDu1TGOpSjqlk94p3G6gdLXeI6plmSyvqMBuCAo
-tPFOpPqCdXjD1rw4flMmuL4LEP0WhBYVTISPeO2NwIQGu7gLJb1bXagbLdRB8MmE
-yrkzE7VC3CHIBUqcfSMYyHeVSERlwPp59oaeJLEz++hYnF1pf1YSxG445unRqyP4
-6TOR1Ie0VfBRAJNLIX4+Gv4MAHvmmFY4sjrIHPBInZFb3PLlT3hBDN1buP74H9mI
-o/sSciW9CcoHsLhfMuxy+EgUDJR19OkEfzMkG7RRfZTziSEVA53+Ae2+Z0LtQ/NC
-BmusEX1VnzedXMIgBDKkwv+yyM8vf+xwg7XhygLBp2+CMII/sM178V9x2IEcY/kz
-XfkLzcQWcToxNrEgUG6/JcGkTXODWvJmDjDK7kbSeRfcrGdGVRYFiMWm/HLapVw0
-i3Hc56FKT7BB/e1IPgo7Rl5KX1jnzrJfhUxTwAVZbPye2jBEPJGy3O3EwC3xdpy3
-Hulg5FjFakZCipN3aF+i2ilHTxISVct9RnUbA6dYaAy0Zm9axSJA7QfEyqJuxuFz
-bQIDAQABo1swWTAdBgNVHQ4EFgQUrY8UnWcOBb7aFQqHwYSTl0/PQycwOAYDVR0R
-BDEwL4IKaWRwLmhpcy5zZYYhaHR0cHM6Ly9pZHAuaGlzLnNlL2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4ICAQCFUgQ/keEczGrc3n6OZ3M6jermCb9ecTS7
-Pi56ZAefEwmm8dnGia4bbO8oXwHgeS4ruszN9y1Y/ZV4er30xOpvpW3elWWP1u2h
-7pJUnJQ9+00Qlbcht9xCd+IOkaut37CjV5krs6lK0Hl3R+d7yxkjJ4pBs0wrfuIw
-Sq8fRvKu065+tT7EldMIbDrieaOtK43ct+s8Yj3l/djoFk4ivo6/7KZvWHngHS6+
-uxeZuuFQKqikMdMSIHPeYuzKu0kHx8SO/VZCC8bBhlLG48NF+ImZTThPmyoZB2pi
-5KwJBhh7XVinetQDT/AOJulxIXZMyfQN0h9O/wF7lYryo18zDhQt8jv5a9MlGiwe
-PlwcKxgKPFXavkaGfpV8+3wBfgtYFapntw5xShUiVavDj5LgPvFUe9LaH87jZoXL
-H3TgJjQms+MQlNyEIzCW5g/MzycZNjQKktuI3YO3umZs+2vGtyEgUiNR4u0f68n4
-YdUB2sinuovdDYxDsW40GBnYfE4V6o1Km6wxnGxxU+24I5D8hRhjIa2FyRkb9MP/
-nFpgPMnhwDRTVqGkUurWFrzE+Ipntp4wrW6FGsdmkM8YYsQOJfL6Q2pLFWE+PreB
-6qR2T89xJHCKDO/Oscfb0F2nd5ccTamiObmBWDfmXz1bNs2lTyQ698ErdOb3igR2
-LhX8iNAQPA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFFDCCAvygAwIBAgIVAIFPHUELPJcBCsdWHjuKSOWZ7+wJMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5oaXMuc2UwHhcNMjExMTExMTMzNzI4WhcNNDEx
-MTExMTMzNzI4WjAVMRMwEQYDVQQDDAppZHAuaGlzLnNlMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAk8IyCtuc/v1M/5dpwMJxIvCbsp5LSGV1Yms4DjPv
-1VbC7auGQkxvR+XOFqvrref+8IJQH9x7nqKkUurN57BpZ1zbD6KwUB+0+t0iEK97
-cft540Hsn2jtLgmQcOu3ecb9xUErVBuCKGOi66078TQweZxU1TuDwYGhROhsLuh8
-UT+TE59F5g4vNpDVLyWUZxWGtuf08lI32lWekReTg0upsehR27eMIHMJKFgc2zWs
-GkYBJU/WnhN+Zeh/g27zKe07NujZma5zuqpUZNIeYwz5bFuJN5ZCR3yLRzPsNRNI
-fr00CjLFYgO3uIcFs9+Kpr89nEyLfdqrW3ReLQirXreZBKeb7IHA3eL/inSxrTjs
-ehOFOPCQotsYGFkocu5ivEF0vuDLrHlFfQ9xzIAvBidnQyTX6o1Y2faSBS+WJ5Au
-G000QRFFv+kRoWJ55s0KgohpFC1R07/fTovpDZyW9FX91MjDtLUW80D3qYDYnPJd
-kbSE009umdfqRCXzb0R65ucaYSIP6reffr3zNxU84wTB9xFLcRAPBleSixmug0nv
-LwY+Ze1nP1x6zRjsPmlxNyIg4228gZ0lvvjJAthxREt+rM8auisRXh4GsEvfmWcD
-xFXOD9v5fcVsQVjeCk0CIY7R/vvmpOkuGn7+gcy1416lu4YKwJXxC3MvBQpRSikl
-4oECAwEAAaNbMFkwHQYDVR0OBBYEFDo0xAj0o0BBHsQeuz+I7FBfd7iYMDgGA1Ud
-EQQxMC+CCmlkcC5oaXMuc2WGIWh0dHBzOi8vaWRwLmhpcy5zZS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAgEAd0KB2J1O6LtU9gPGBBduo8E/7EkvSUG/
-bcltY9/TwMCAHi7Cd4NEMIw2O2pvIGQBTaFIn+EatTh3lBPSP2xykYZzujvtBo4P
-IkEgSdgOQcVWy0L49SxlI6h99FEi8rMAv7JLOs1gnEej27inCx6k5IladbSWXkc+
-vjK+xv4UApqBWZ4BfjZh0CSOHPJnZahT9Go2zOk6e2kUXryyp+chY8bE02fR/Rcq
-z5cb18rXZOSaZREEyx6TKIK0pur7pTvUXJvyoNOsLowz4RPf5WjnCtrwfMIbiFPP
-Pu5zV4ZeXcNowkgYeLAS2zT71hSEy7iapGsTNzRiInoRrgYagjnavLpVr9imXyjM
-FNEx1HWD+rvgcU8hEdbzcaEpgccboR5MDPEp152XZqTusrfxakXTXgBSRmmvgT9v
-QuVGYYJdQOfS+8LKXDx4UwRWz+4o79MHUKhPMe7VI+KhqUrPTC++PWgzHGWp4vOn
-8uWjEtlAUuFwDL4X//Yt0Ni9ZnFs+dgVyk9FjVwL9pF8Tuzs2jAoyIqy2HYcKRR4
-J+z7HtTLsXY3si2pKZSsIqTI5Gx1NlrTyG68xfefhawYSmE5VRKzre2tnYN8TKzY
-ubscnnES8lXMq+LVSEFTvTjEF/+8J4FWzssPpYyjdO/w63/SHAXE+zsPmK01l2+w
-zGqLyGPg/8g=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" ns1:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.his.se/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Skövde</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan i Skövde</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Skövde</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.his.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.his.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Skövde</md:Company>
-    <md:SurName>HiS Netadmin</md:SurName>
-    <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Skövde</md:Company>
-    <md:SurName>HiS Netadmin</md:SurName>
-    <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Skövde</md:Company>
-    <md:SurName>IT Helpdesk Högskolan i Skövde</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@his.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
deleted file mode 100644
index b4104f7a..00000000
--- a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.hkr.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-09-14T10:06:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.hkr.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan Kristianstad</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Kristianstad University Sweden</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inloggning i webbtjänster för anställda och studenter vid Högskolan Kristianstad.</mdui:Description>
-        <mdui:Description xml:lang="en">The Kristianstad University Login Service is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.hkr.se/utbildningar/student-pa-hkr/it--och-mediastod/inloggningsuppgifter/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hkr.se/en/study-at-hkr/service-and-support/it-support-for-students/user-name-and-password/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.hkr.se/swamid-en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hkr.se/swamid-sv</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="144" width="144">https://www.hkr.se/Static/gfx/jpegs/hkr-144x144.jpeg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="144" width="144">https://www.hkr.se/Static/gfx/jpegs/hkr-144x144.jpeg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>hkr.se</mdui:DomainHint>
-        <mdui:IPHint>194.47.24.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.32.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.40.0/21</mdui:IPHint>
-        <mdui:GeolocationHint>geo:56.04848,14.14416</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
-MjEwMTExMDM2WjAVMRMwEQYDVQQDEwppZHAuaGtyLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAmLMMJQyBS/1Caas2d1zoAj1jlxYs9axLJPDujiP0
-fJ8F3gjMxtl/A7Y+eVFqnRFzHNuaEKaqZ8S+XGnRi8kw3AdPbPJZB4g+LTRPI8WB
-xDo49uubfZbpyi8zZUqoqOSLeNxMKFqgkq9bd0Yeh4bI7r/bjuvcx4tioOP3UnT4
-CBfTL6uxyCWFW8mP9TbmnQ4lZN5O4elIKrea+8XiumRa2q5qpXVtdqF5h9YI+jYK
-6zj9pMzUlPPvIyOzGFLxLSN0KRM7EgV3FRD65y9hCnTzuQtFrqwktBOVs5fwavyr
-bKht5KrIaVrozMBscr8STgQ8SKEDMCDqxu/hS0IqoweTyQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGtyLnNlhiFodHRwczovL2lkcC5oa3Iuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFLIjYPKZGp/Bncfc+KnH8Pdf7FukMA0GCSqGSIb3DQEB
-BQUAA4IBAQCQ3m4eN6leAlXf9v8xcZjrzQhHCg4ceDnixMUINTsFfXktfYsSSonr
-Cdh/mhttMxnk/34Tu1XMfYn8ABPVxvvcaBZ9Brl21BBsvk3MOdbDNO6cB05GXdms
-exr3aJFvRwY6Vy0AWtUgDFXdYPiIVPUrpC7NA+X78fq3IVmPn0WFlQ9KpM8hXNz0
-HwlY06myFNjI7dvt8xjAqJy+ICilu06RTs7oCynE45nkrLaZjpploIn3xcYt0ceK
-qU1LY9aaqaEgKSsNHlPoCW9eH4oUP3f/X8h21pAtgGA8AIt2RegT6HfVqnZPAtUk
-kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hkr.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hkr.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hkr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hkr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
-MjEwMTExMDM2WjAVMRMwEQYDVQQDEwppZHAuaGtyLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAmLMMJQyBS/1Caas2d1zoAj1jlxYs9axLJPDujiP0
-fJ8F3gjMxtl/A7Y+eVFqnRFzHNuaEKaqZ8S+XGnRi8kw3AdPbPJZB4g+LTRPI8WB
-xDo49uubfZbpyi8zZUqoqOSLeNxMKFqgkq9bd0Yeh4bI7r/bjuvcx4tioOP3UnT4
-CBfTL6uxyCWFW8mP9TbmnQ4lZN5O4elIKrea+8XiumRa2q5qpXVtdqF5h9YI+jYK
-6zj9pMzUlPPvIyOzGFLxLSN0KRM7EgV3FRD65y9hCnTzuQtFrqwktBOVs5fwavyr
-bKht5KrIaVrozMBscr8STgQ8SKEDMCDqxu/hS0IqoweTyQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGtyLnNlhiFodHRwczovL2lkcC5oa3Iuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFLIjYPKZGp/Bncfc+KnH8Pdf7FukMA0GCSqGSIb3DQEB
-BQUAA4IBAQCQ3m4eN6leAlXf9v8xcZjrzQhHCg4ceDnixMUINTsFfXktfYsSSonr
-Cdh/mhttMxnk/34Tu1XMfYn8ABPVxvvcaBZ9Brl21BBsvk3MOdbDNO6cB05GXdms
-exr3aJFvRwY6Vy0AWtUgDFXdYPiIVPUrpC7NA+X78fq3IVmPn0WFlQ9KpM8hXNz0
-HwlY06myFNjI7dvt8xjAqJy+ICilu06RTs7oCynE45nkrLaZjpploIn3xcYt0ceK
-qU1LY9aaqaEgKSsNHlPoCW9eH4oUP3f/X8h21pAtgGA8AIt2RegT6HfVqnZPAtUk
-kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HKR</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HKR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.hkr.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hkr.se/en/english-start-page/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Högskolan Kristianstad</md:Company>
-    <md:SurName>Service desk 3030</md:SurName>
-    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Högskolan Kristianstad</md:Company>
-    <md:SurName>Service desk 3030</md:SurName>
-    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Högskolan Kristianstad</md:Company>
-    <md:SurName>Service desk 3030</md:SurName>
-    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Helpdesk Response Team</md:GivenName>
-    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
deleted file mode 100644
index 1e7009e6..00000000
--- a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.it.su.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-24T13:56:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.it.su.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">su.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Stockholms universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för medarbetare och studenter vid Stockholms universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Stockholm university Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.su.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.su.se/english/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/medarbetare/it/it-tj%C3%A4nster/universitetskonto/policy-f%C3%B6r-hantering-av-personuppgifter-inom-ramen-f%C3%B6r-identitetsutgivaren-identity-provider-idp-1.383506</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.su.se/english/staff/it/it-services/policy-for-the-management-of-personal-information-within-the-scope-of-the-identity-provider-idp-1.384218</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>su.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIID9zCCAl+gAwIBAgIVAKM4svIX/6tsrDcGeAmq/Nkr4crjMA0GCSqGSIb3DQEB
-            CwUAMBcxFTATBgNVBAMMDGlkcC5pdC5zdS5zZTAeFw0yMDEwMTIwNzU3MDJaFw00
-            MDEwMTIwNzU3MDJaMBcxFTATBgNVBAMMDGlkcC5pdC5zdS5zZTCCAaIwDQYJKoZI
-            hvcNAQEBBQADggGPADCCAYoCggGBAJpPutZsaDJ73u6GPGf5G0TDsd5M6GoVxgGf
-            6IpIZHieYlzahYevo2vSHSNTQpDx2ZYKmw27Ca+LQxydd0ma4CPUeneU0yEXi149
-            VC7pk/sX8aRvkDJJeiCpGE41rHlH3NSkiV8AtyRyfseXOhb2AK/590FW0aL/Gl9U
-            h9mUzBg9eTTxVDYV6snkRMa/SCvwq2hekWTIMNNgt2WgeRrk9xMrqpJte5go9Fxp
-            jCuSRzotFE+iwKqNguuad/iwKc8ZvNl+dvJdyQmyXmdyCP6wbSvdXTsJyYF76ghk
-            J3eDLh/HwIt8rcmVAtpYgA0UX3ciTM8PCbZurliFsO7mNtZgOeJ4gm9jZe5n6z1G
-            8hDo4TIvBVAFnr7n1OlxiGApLWxegRducZxpshj30LY7lOPK+4eCA+Hz4vpYUCT+
-            R+k7N9L/Cc/fcpNboUcAwYD7ke/cqDmAojv+EHHt5OU6tyYAJRF2JZT5aPb+UKzB
-            2jru4U+Iqiviggr3KFwvB+pClhW9twIDAQABozowODAdBgNVHQ4EFgQU3lJF+xEf
-            2/DFkKZnWjlRk9EceR8wFwYDVR0RBBAwDoIMaWRwLml0LnN1LnNlMA0GCSqGSIb3
-            DQEBCwUAA4IBgQAm7MM8AXIccG+SzqlffhU8GamA8wlPWl69MW4IMp+Zn7OJLcqb
-            27lmdUkvB5G34qhx6G6uZnVsTbRz3iwIRcgcxZiWR7qysA+TeLRig5lBC5dBpg3u
-            nJHyc0XQID0uUFfqzbZGh4RR9lPTSQUsY8iW8iFFZZgm6OjMEDe+Sagd6qYWzEfL
-            s8dHUZDFDANDaEO3r5RpemWao+HKfV2lGGOVuGOxbpYjPDMoGaqRtj602V+c9Nkn
-            zkmGE+pnixajYLUfdpCEvt3Dzu3W+bfCLuaFrTyJVdMOE8Yct+yVVa4XReXTc7mI
-            fgLoKtCpgIDrbVBzE5bQD9akyLK+tIQ9kQi/mztxgZNuqhbbM+MSLdC3wM8QVdST
-            gUSSJNbLAroudxag0BV1pQ65f/4Qc5M2/HEdXIE5Z3s4eLLTGtY3ZYg6O8m7SYHC
-            shXBFChTPUxfTKsYjO/DtlKirk/P6L8F01oVILeafbgCchpZJmYL4AxaJHcCkHvd
-            9eRXsPMTPDnMY7c=
-          </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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.su.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:irt@su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
deleted file mode 100644
index 76352811..00000000
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.kmh.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-06-02T12:04:31Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.kmh.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kmh.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Royal College of Music in Stockholm</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungliga Musikhögskolan</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Royal College of Music in Stockholm</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.kmh.se/download/18.2aa17d2517d7b88b034b987a/1639133993846/Riktlinjer%20fo%CC%88r%20elektroniska%20identiteter%20bilaga%203.pdf</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.kmh.se/download/18.2aa17d2517d7b88b034b987a/1639133993846/Riktlinjer%20fo%CC%88r%20elektroniska%20identiteter%20bilaga%203.pdf</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.kmh.se/download/18.2aa17d2517d7b88b034b97f8/1639133766333/Riktlinjer%20f%C3%B6r%20elektroniska%20identiteter%20bilaga%202.pdf</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kmh.se/download/18.2aa17d2517d7b88b034b97f8/1639133766333/Riktlinjer%20f%C3%B6r%20elektroniska%20identiteter%20bilaga%202.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kmh.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.62.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.34474,18.08126</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNTA1MjYxMzIwNTZaFw0zNTA1
-MjYxMzIwNTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC8Fndbl7VcQp77YvwrHZJw+P4jup3EJWLqXwTPBQAl
-pUfZXW1ZwlfZ/8Y+ng8GPn11ZS9gVEc9aW5+ZtvIX4rPgceB4Y5z3XFQpQfDrcBY
-g+dZc7xR24UZN5T1Er8i5xZWW7/Q2ariLfarK0X0oDoUEi5kaHcLc0ejvT2K3CVY
-uQ/LCw+4Wl7txbisiwh7AFjlqpgb2lNQxxzP/0xQwUBAMplxOZ/yxlK1RzKCHTOI
-sBHN6Sx3AW27HQduAzvKa3IDw7RV/WBi5ENER5U446LdSfWvObqSq4tNRSSpSszU
-6Vxldhar+0aACK/sBWw8FlLM5OM9K1SWeE7fk5PgTwQbAgMBAAGjWzBZMB0GA1Ud
-DgQWBBTdW08Nts1dNGIfcY8chlK5Yu0MlzA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
-BQADggEBAI20AdShxGWSxSVuiWzRnQKRpHQnalD84ev3BhaurMP93fzWJp4H1FzG
-+1+4K5tz5hbf1J1qaIZPn4+hEhYJLxQCiccH37Nqbs9zJFC6fQrCqKiMnh987f8X
-5X/BVsK9W2bNF8+e/a89O7X9u/4mFW7vdpHcsf/kO2QN1fkkukoCLSEWU4oWnWTr
-D0C4p8pAxxuCh86fN/plT6bfLbne17O9qmyT5miEhmfSG4uHoIgwMtbhOljOarH2
-cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
-SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kmh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kmh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kmh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNTA1MjYxMzIwNTZaFw0zNTA1
-MjYxMzIwNTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC8Fndbl7VcQp77YvwrHZJw+P4jup3EJWLqXwTPBQAl
-pUfZXW1ZwlfZ/8Y+ng8GPn11ZS9gVEc9aW5+ZtvIX4rPgceB4Y5z3XFQpQfDrcBY
-g+dZc7xR24UZN5T1Er8i5xZWW7/Q2ariLfarK0X0oDoUEi5kaHcLc0ejvT2K3CVY
-uQ/LCw+4Wl7txbisiwh7AFjlqpgb2lNQxxzP/0xQwUBAMplxOZ/yxlK1RzKCHTOI
-sBHN6Sx3AW27HQduAzvKa3IDw7RV/WBi5ENER5U446LdSfWvObqSq4tNRSSpSszU
-6Vxldhar+0aACK/sBWw8FlLM5OM9K1SWeE7fk5PgTwQbAgMBAAGjWzBZMB0GA1Ud
-DgQWBBTdW08Nts1dNGIfcY8chlK5Yu0MlzA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
-BQADggEBAI20AdShxGWSxSVuiWzRnQKRpHQnalD84ev3BhaurMP93fzWJp4H1FzG
-+1+4K5tz5hbf1J1qaIZPn4+hEhYJLxQCiccH37Nqbs9zJFC6fQrCqKiMnh987f8X
-5X/BVsK9W2bNF8+e/a89O7X9u/4mFW7vdpHcsf/kO2QN1fkkukoCLSEWU4oWnWTr
-D0C4p8pAxxuCh86fN/plT6bfLbne17O9qmyT5miEhmfSG4uHoIgwMtbhOljOarH2
-cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
-SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Royal College of Music in Stockholm</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Royal College of Music in Stockholm</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kmh.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.kmh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Royal College of Music</md:Company>
-    <md:SurName>KMH IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Royal College of Music</md:Company>
-    <md:SurName>KMH IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Royal College of Music</md:Company>
-    <md:SurName>KMH IT HelpDesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@kmh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 161939</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
deleted file mode 100644
index 733a3a47..00000000
--- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.kva.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-06-18T08:53:20Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.kva.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kva.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungliga Vetenskapsakademien</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Royal Swedish Academy of Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungliga Vetenskapsakademien</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Royal Swedish Academy of Sciences</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="78" width="179">https://idp.kva.se/idp/images/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="78" width="179">https://idp.kva.se/idp/images/logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://www.kva.se/app/uploads/2022/06/Tjanstedefinitionfederativinloggning1117.pdf</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.kva.se/app/uploads/2022/06/Tjanstedefinitionfederativinloggning1117.pdf</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kva.se/personuppgiftsbehandling/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.kva.se/en/personal-data-protection/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kva.se</mdui:DomainHint>
-        <mdui:IPHint>130.242.20.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.36542,18.05204</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAIEMcH8g/qilWjlQSS0EYqY8O3hnMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5rdmEuc2UwHhcNMTMwNjExMTIwMzU2WhcNMzMw
-NjExMTIwMzU2WjAVMRMwEQYDVQQDEwppZHAua3ZhLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAhbLQb03KVvHFPZlmohpzwmr6tY7dZCKSRTdfoSpu
-fT6BykDryqo0vg8pSBWghkiFZQr1V36qdK0XUFNAtFEGTtlXyI+PDvtGLTzg2Swb
-9nxpwsXAxRUD1v/2SNUTxQW7O0t4jdZKxGcOEIDO8YHOpV0imw2v+tqzyr8MgwfE
-SSBV3ESUtHmDFvhanEp/TNsT6K8Y1IFqQzHCvNKV1WGW2vEKCjnwmMNd5N55cQrO
-foWCeC7BJhm7dKrzk0WzSZLrX1PtitHB7Ms705x7XRWw1Inbp5jd56ONJ7sZXqpi
-4eb9wVovrZMqcBc/h4GPZN9WTACvfHUKvQ0N0lfzhUuKdQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAua3ZhLnNlhiFodHRwczovL2lkcC5rdmEuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFKpM1lN1+VbR8w+sZ1O3g4Lc0SIxMA0GCSqGSIb3DQEB
-BQUAA4IBAQB+22vGRTKJyRGh5lHVyk0NXWjc8aRAdntepCR+Yy17HB1P4lBSlewS
-bHuDhu7hHp9ItJWJryhkO4F1c+RjELnGf++WvM3Fv05AIV3x0lh/Kxs9X2f4KYBI
-Sa4XUUgl3lbrTI9H0Mse59OK4jz5LRF35OWihdoCNiRaKVjrRmMTZKrxBTJ5gSvf
-ULOTA8+dCegP7Q4xnGmN2M8PfO6Lp6BQh2LaaBt4qDGUytMnclKUhDXpasr/oUfB
-bS0T9qUjP0Djkv1HcffkxHJd9mbHMv4MiQjScE4Gwy4+6PPOO5a/3Q7JoGSbdVfm
-y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kva.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kva.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kva.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kva.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kva.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAIEMcH8g/qilWjlQSS0EYqY8O3hnMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5rdmEuc2UwHhcNMTMwNjExMTIwMzU2WhcNMzMw
-NjExMTIwMzU2WjAVMRMwEQYDVQQDEwppZHAua3ZhLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAhbLQb03KVvHFPZlmohpzwmr6tY7dZCKSRTdfoSpu
-fT6BykDryqo0vg8pSBWghkiFZQr1V36qdK0XUFNAtFEGTtlXyI+PDvtGLTzg2Swb
-9nxpwsXAxRUD1v/2SNUTxQW7O0t4jdZKxGcOEIDO8YHOpV0imw2v+tqzyr8MgwfE
-SSBV3ESUtHmDFvhanEp/TNsT6K8Y1IFqQzHCvNKV1WGW2vEKCjnwmMNd5N55cQrO
-foWCeC7BJhm7dKrzk0WzSZLrX1PtitHB7Ms705x7XRWw1Inbp5jd56ONJ7sZXqpi
-4eb9wVovrZMqcBc/h4GPZN9WTACvfHUKvQ0N0lfzhUuKdQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAua3ZhLnNlhiFodHRwczovL2lkcC5rdmEuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFKpM1lN1+VbR8w+sZ1O3g4Lc0SIxMA0GCSqGSIb3DQEB
-BQUAA4IBAQB+22vGRTKJyRGh5lHVyk0NXWjc8aRAdntepCR+Yy17HB1P4lBSlewS
-bHuDhu7hHp9ItJWJryhkO4F1c+RjELnGf++WvM3Fv05AIV3x0lh/Kxs9X2f4KYBI
-Sa4XUUgl3lbrTI9H0Mse59OK4jz5LRF35OWihdoCNiRaKVjrRmMTZKrxBTJ5gSvf
-ULOTA8+dCegP7Q4xnGmN2M8PfO6Lp6BQh2LaaBt4qDGUytMnclKUhDXpasr/oUfB
-bS0T9qUjP0Djkv1HcffkxHJd9mbHMv4MiQjScE4Gwy4+6PPOO5a/3Q7JoGSbdVfm
-y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Royal Swedish Academy of Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Kungliga Vetenskapsakademien</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademien</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kva.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.kva.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
-    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
-    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
-    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
deleted file mode 100644
index ddcd4c40..00000000
--- a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.lnu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-21T08:39:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.lnu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">lnu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Linnéuniversitetet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linnaeus University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Linnéuniversitetet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Linnaeus University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://lnu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://lnu.se/en</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">lnu linné linnæus linne linnaeus linneuniversitetet linnéuniversitetet linnaeus+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lnu linné linnæus linne linnaeus linneuniversitetet linnéuniversitetet linnaeus+university</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://lnu.se/mot-linneuniversitetet/kontakta-och-besoka/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://lnu.se/en/meet-linnaeus-university/contact-and-visit-us/personal-data/</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="57" width="350">https://idp.lnu.se/logo_swamid_en.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="53" width="350">https://idp.lnu.se/logo_swamid.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>lnu.se</mdui:DomainHint>
-        <mdui:IPHint>194.47.64.0/18</mdui:IPHint>
-        <mdui:IPHint>194.47.160.0/19</mdui:IPHint>
-        <mdui:IPHint>194.47.192.0/20</mdui:IPHint>
-        <mdui:GeolocationHint>geo:56.6661,16.3484</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:56.8546,14.8304</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEzCCAfugAwIBAgIUPyRiBxYXDJxcWSxls8FwS7Y60b8wDQYJKoZIhvcNAQEL
-						BQAwFTETMBEGA1UEAwwKaWRwLmxudS5zZTAeFw0xNjA1MTcwODQ0MTdaFw0zNjA1
-						MTcwODQ0MTdaMBUxEzARBgNVBAMMCmlkcC5sbnUuc2UwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCr3zNT4mSKsxAUxFgSEcUS+EWnItyKj+PZ9xr+Rgju
-						UPbr+B4Fal4tjY1d6tGpCiE838TkF4wNd9FafRYgIyfNHbdVieDw9jUgBBkQJHt8
-						a/57sdEAF8fQ60PWQ1MJIbeh5vN/NZbEqLNt2UDnAv47wFQI07tOaW76OV14pmZc
-						JzdLCLcSaCreFnJwskZUmTHqf9lzm/rvB3LHyK9uwljdEDz8FFvPpDTbKvBq76t0
-						nMzF9fQQ/SS/P2ZiP9m0PzhNu+Thb1kjWH6g86eX8qQMLyEOXrJtdCXYsyq+Y6bU
-						BtVFdUHJ2HBlIWl9jFwK03Nh2vGezrN0eYHiPEMxwmfFAgMBAAGjWzBZMB0GA1Ud
-						DgQWBBTEHMKpTdUijjgkKa0w49SeqB7nzDA4BgNVHREEMTAvggppZHAubG51LnNl
-						hiFodHRwczovL2lkcC5sbnUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-						BQADggEBAHP3dOOl/fq06A+llRic1LAz8ha5g5z2Me9B0VVfRkEToPilas4Wx/jC
-						cbddICIZDaQfKTeUgmqK5p7M8SE2wZ31AUH3TOXGGkic7K/9ZCGJ81Dna8kdKCVM
-						RhJOpvcknw2vU+DhGA+/Dwo0oS2b9lTy8Q4VfMCYfIuQR6DHEqLfFOTGXb4t1zLP
-						fn5Nc9bRLUOsN/YmL2AjvrpTD1bmcALplE8J2mkeUdPbhd5tKT09yFMQCDuD4qCk
-						frSh63D1pqPEY32zwWj3WdE0RWH1PZ2KFvZBri26KXH2LE3D0gZUa3TaFczRHQbc
-						iQDES2ptc24O88TxSDQnHG1WzY+REMo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lnu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lnu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lnu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lnu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">lnu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEzCCAfugAwIBAgIUPyRiBxYXDJxcWSxls8FwS7Y60b8wDQYJKoZIhvcNAQEL
-						BQAwFTETMBEGA1UEAwwKaWRwLmxudS5zZTAeFw0xNjA1MTcwODQ0MTdaFw0zNjA1
-						MTcwODQ0MTdaMBUxEzARBgNVBAMMCmlkcC5sbnUuc2UwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCr3zNT4mSKsxAUxFgSEcUS+EWnItyKj+PZ9xr+Rgju
-						UPbr+B4Fal4tjY1d6tGpCiE838TkF4wNd9FafRYgIyfNHbdVieDw9jUgBBkQJHt8
-						a/57sdEAF8fQ60PWQ1MJIbeh5vN/NZbEqLNt2UDnAv47wFQI07tOaW76OV14pmZc
-						JzdLCLcSaCreFnJwskZUmTHqf9lzm/rvB3LHyK9uwljdEDz8FFvPpDTbKvBq76t0
-						nMzF9fQQ/SS/P2ZiP9m0PzhNu+Thb1kjWH6g86eX8qQMLyEOXrJtdCXYsyq+Y6bU
-						BtVFdUHJ2HBlIWl9jFwK03Nh2vGezrN0eYHiPEMxwmfFAgMBAAGjWzBZMB0GA1Ud
-						DgQWBBTEHMKpTdUijjgkKa0w49SeqB7nzDA4BgNVHREEMTAvggppZHAubG51LnNl
-						hiFodHRwczovL2lkcC5sbnUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-						BQADggEBAHP3dOOl/fq06A+llRic1LAz8ha5g5z2Me9B0VVfRkEToPilas4Wx/jC
-						cbddICIZDaQfKTeUgmqK5p7M8SE2wZ31AUH3TOXGGkic7K/9ZCGJ81Dna8kdKCVM
-						RhJOpvcknw2vU+DhGA+/Dwo0oS2b9lTy8Q4VfMCYfIuQR6DHEqLfFOTGXb4t1zLP
-						fn5Nc9bRLUOsN/YmL2AjvrpTD1bmcALplE8J2mkeUdPbhd5tKT09yFMQCDuD4qCk
-						frSh63D1pqPEY32zwWj3WdE0RWH1PZ2KFvZBri26KXH2LE3D0gZUa3TaFczRHQbc
-						iQDES2ptc24O88TxSDQnHG1WzY+REMo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">LNU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">LNU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Linnaeus University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://lnu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://lnu.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Linnaeus University</md:Company>
-    <md:EmailAddress>mailto:it-idp@list.lnu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Linnaeus University</md:Company>
-    <md:EmailAddress>mailto:it-idp@list.lnu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Linnaeus University</md:Company>
-    <md:GivenName>IT Servicedesk</md:GivenName>
-    <md:EmailAddress>mailto:it-support@lnu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 480 44 67 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Linnaeus University Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:irt@lnu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
deleted file mode 100644
index dec28a76..00000000
--- a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.ltu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-12-19T13:30:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://www.ltu.se/ltu/it-support/loginerror-1.207338">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="130" width="250">https://www.ltu.se/image/LTU_logo-sve-smal.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="130" width="250">https://www.ltu.se/image/LTU_logo-eng-smal.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Din-anvandare/Policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-Identity-Provider-IdP-1.218207</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Din-anvandare/Policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-Identity-Provider-IdP-1.218207?l=en</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>ltu.se</mdui:DomainHint>
-        <mdui:IPHint>130.240.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUEF1BMNIKMVmOiuK2uUY7yMT/FZEwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmx0dS5zZTAeFw0xNjEwMDMxMDU0NDRaFw0zNjEw
-MDMxMDU0NDRaMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC77HPEN3ywPEqpkuv92tbanirV61gX3Eg9LFBPGhXM
-zy4x3RiYAVnBssXYFrL6OKKzOpilNVJnzTFWYzSE8uc6wHBI4YDn9K57cwyDeUWx
-jaG/vK36lu1Z33pCqJlE7f1Ucs+wDTzks7RnM0l5mdaeENG7PXullEgArBS6oRAb
-VnBnBJImh8ZaNpNuVMcBc+sC/sL7jsVr3OI7I6/Wya8YLKbADLdVw5R+nuI3wVsz
-EUccXz2j0/BpvlqzlX12wdHMY9+nKWXNQPRfPeHWFlvV6qZBk6DbUZgsUmZKus+w
-cnfShcWyOTUtfL6N4PDJEasO7KBVdbFrWwLNQey4q+CHAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQjfk7uz/iBRZnn4KuPLDzGROENzDA4BgNVHREEMTAvggppZHAubHR1LnNl
-hiFodHRwczovL2lkcC5sdHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAGJWdP5TL1b89e8ZPzB5EhZXTepmmMzORQ7RHy/Ud7xd7yrnqg3JRiwq
-wOWcty/UyZQpxHZucSXumj11iSeIY8FQ+hH0IusDg32esITifj67nNZaWsY7KPVg
-IPq41WLphw/6UPHBtv3KkG3dwhx7ZglIc1uf904zLZyl5W5t4KSSues7E9yWcURV
-QbftDOzCzlTCiqH4LAOrNzY5T03E/NzoDCynKGpML+KLHqH8yCFHzpPzXopprG+f
-1aH7y6eF6sFdeeD7xbvPNNqRF1dLIz2N997LrmEjLQGRUPhCeaXo0kNMDxzJMbAc
-Imrso4dObDk/xFdJSbWgmKWEnvUc2+o=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAOGyXLVRoSiwOvBslVqyO8H8MUpkMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwHhcNMTYxMDAzMTA1NDQzWhcNMzYx
-MDAzMTA1NDQzWjAVMRMwEQYDVQQDDAppZHAubHR1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAi1hFx0uyuGSOAI4syizgW1tHwR5mtSrzmeNDBFYM
-uWvpfY24eWypO2cmugbSt/M8wvzwYE8BhXQo8BztRTgCLsreR7pS3IT9ZAERrZnA
-b22cMKnJ6+b7IaGeHHBjuw5d74N/gtEhaRmj7aFcpSxk6g2SdGw7FpxRWOErZQMG
-zFmoSoR5vWl/k/eOc/N5iW5797CVJ6Ip5UB0IbFVZ4wWb2q2y3G0kBY//Hl3KKhp
-OnoOeXnSYSieT8BbCUv4249xOBFmI0Cg65q69Pz+c/8oEX4YUBA9jyhD2FiKKFyG
-ofo8BUv/f7Q6P5CgrXATbFaeOGI3Ps+JVB6mZ1NEUy+QAwIDAQABo1swWTAdBgNV
-HQ4EFgQUDhxowmARcpr57XwHEI4Y3UyVYmQwOAYDVR0RBDEwL4IKaWRwLmx0dS5z
-ZYYhaHR0cHM6Ly9pZHAubHR1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQADhDlm/9jU3jn49SjTtYbvBCvGj4pQXit0m0uRo6nFpYK3IZFTlUA6
-/CETpDGBJCnq6N6BHH+BrIb3mVXLywTsose0D+aDuI6EjaNWFQzOkH04Vm5VOLA0
-olQ/A1/53G6ibw7zQM7G9luRuE9NsIlUp40+XmSkZAb+ywaPG74OHJo2FzIbwC20
-+donlVlCl22RG0hRqoyKRjFaDr6wskvw5kXqqjcnCyEp81HiJHu9DefFiKSy7knQ
-ZVSpDwl0ijbRGFwWRPYwOf+M2H8b49UKq3D0nhXRhynPP+txW7xwFg4gIsqg4kgC
-X4dei9FUiIpNKgYziKf/tzbvJQqiV18l
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAJtIqlatDGFOju804cuPymREGdCnMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwHhcNMTYxMDAzMTA1NDQ0WhcNMzYx
-MDAzMTA1NDQ0WjAVMRMwEQYDVQQDDAppZHAubHR1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEApssNdGrdf68j/MkcesycaSHS09IOOJOfvKAMsTS3
-tqurFc5Jebxiu+uoHm5pDqXcrDxquJxFVvD7HJhPsR0yMm85/7bt9NkmQssqqMQ7
-GTX1WnrJa1STaZO/izcJcOw7vXJ89c3DevszGZqZGAiImzpiX2N5T9Xl1OtckOrG
-pX/2aXZg6TATC0Q/lAa9u/GBYvuCZ/hlUKfyjzIAkIXms/w8bZu7EAb2tIipGoVO
-dfvsW/3LtA7tnYDNrK0ZyhgCSDiu7L6bfGcLlMsJNCNmGbRsVkkx5L7Di9KI9WD2
-cfnmuPMQLu/C9F3lGcfRg05yZSFrA0TgZ9xFeB8cq/H5dwIDAQABo1swWTAdBgNV
-HQ4EFgQUAjMKyo3f4aK/PsMfBg4Z5ybxg1wwOAYDVR0RBDEwL4IKaWRwLmx0dS5z
-ZYYhaHR0cHM6Ly9pZHAubHR1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQAATNstFYSsUkvum8FSaX5ocJwTxuiH1kNM/ZHhEWeT6/iWHnLhu7Ny
-TmDtc3WkxSMtJ3sk6JXr+SHKCMdDoFhUH2R/djGEnjLURtMLhEeMIEIk3tY3v4cO
-7SoVlJMf+3olbpvWzd9DzkONU9U/CcY6si0FWXFnzWkkJOzCdJcvIpY2eQ5ToBvr
-uowwVDOkLMkwJEKleCa0iFm6oRGmGOGavnymCFZSG2BCikRllS5J0j0Pj3ZYwc5p
-MfScMYUVxXQNrKv/yODSBaeDgqvxmTzKjSyNUShynz+WXbFOxV/HlCKtaaZNh2Zv
-ZdLXjuEF1cFQB3AAK9PIEmkLc69IXjPQ
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ltu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ltu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUEF1BMNIKMVmOiuK2uUY7yMT/FZEwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmx0dS5zZTAeFw0xNjEwMDMxMDU0NDRaFw0zNjEw
-MDMxMDU0NDRaMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC77HPEN3ywPEqpkuv92tbanirV61gX3Eg9LFBPGhXM
-zy4x3RiYAVnBssXYFrL6OKKzOpilNVJnzTFWYzSE8uc6wHBI4YDn9K57cwyDeUWx
-jaG/vK36lu1Z33pCqJlE7f1Ucs+wDTzks7RnM0l5mdaeENG7PXullEgArBS6oRAb
-VnBnBJImh8ZaNpNuVMcBc+sC/sL7jsVr3OI7I6/Wya8YLKbADLdVw5R+nuI3wVsz
-EUccXz2j0/BpvlqzlX12wdHMY9+nKWXNQPRfPeHWFlvV6qZBk6DbUZgsUmZKus+w
-cnfShcWyOTUtfL6N4PDJEasO7KBVdbFrWwLNQey4q+CHAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQjfk7uz/iBRZnn4KuPLDzGROENzDA4BgNVHREEMTAvggppZHAubHR1LnNl
-hiFodHRwczovL2lkcC5sdHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAGJWdP5TL1b89e8ZPzB5EhZXTepmmMzORQ7RHy/Ud7xd7yrnqg3JRiwq
-wOWcty/UyZQpxHZucSXumj11iSeIY8FQ+hH0IusDg32esITifj67nNZaWsY7KPVg
-IPq41WLphw/6UPHBtv3KkG3dwhx7ZglIc1uf904zLZyl5W5t4KSSues7E9yWcURV
-QbftDOzCzlTCiqH4LAOrNzY5T03E/NzoDCynKGpML+KLHqH8yCFHzpPzXopprG+f
-1aH7y6eF6sFdeeD7xbvPNNqRF1dLIz2N997LrmEjLQGRUPhCeaXo0kNMDxzJMbAc
-Imrso4dObDk/xFdJSbWgmKWEnvUc2+o=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAOGyXLVRoSiwOvBslVqyO8H8MUpkMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwHhcNMTYxMDAzMTA1NDQzWhcNMzYx
-MDAzMTA1NDQzWjAVMRMwEQYDVQQDDAppZHAubHR1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAi1hFx0uyuGSOAI4syizgW1tHwR5mtSrzmeNDBFYM
-uWvpfY24eWypO2cmugbSt/M8wvzwYE8BhXQo8BztRTgCLsreR7pS3IT9ZAERrZnA
-b22cMKnJ6+b7IaGeHHBjuw5d74N/gtEhaRmj7aFcpSxk6g2SdGw7FpxRWOErZQMG
-zFmoSoR5vWl/k/eOc/N5iW5797CVJ6Ip5UB0IbFVZ4wWb2q2y3G0kBY//Hl3KKhp
-OnoOeXnSYSieT8BbCUv4249xOBFmI0Cg65q69Pz+c/8oEX4YUBA9jyhD2FiKKFyG
-ofo8BUv/f7Q6P5CgrXATbFaeOGI3Ps+JVB6mZ1NEUy+QAwIDAQABo1swWTAdBgNV
-HQ4EFgQUDhxowmARcpr57XwHEI4Y3UyVYmQwOAYDVR0RBDEwL4IKaWRwLmx0dS5z
-ZYYhaHR0cHM6Ly9pZHAubHR1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQADhDlm/9jU3jn49SjTtYbvBCvGj4pQXit0m0uRo6nFpYK3IZFTlUA6
-/CETpDGBJCnq6N6BHH+BrIb3mVXLywTsose0D+aDuI6EjaNWFQzOkH04Vm5VOLA0
-olQ/A1/53G6ibw7zQM7G9luRuE9NsIlUp40+XmSkZAb+ywaPG74OHJo2FzIbwC20
-+donlVlCl22RG0hRqoyKRjFaDr6wskvw5kXqqjcnCyEp81HiJHu9DefFiKSy7knQ
-ZVSpDwl0ijbRGFwWRPYwOf+M2H8b49UKq3D0nhXRhynPP+txW7xwFg4gIsqg4kgC
-X4dei9FUiIpNKgYziKf/tzbvJQqiV18l
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAJtIqlatDGFOju804cuPymREGdCnMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwHhcNMTYxMDAzMTA1NDQ0WhcNMzYx
-MDAzMTA1NDQ0WjAVMRMwEQYDVQQDDAppZHAubHR1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEApssNdGrdf68j/MkcesycaSHS09IOOJOfvKAMsTS3
-tqurFc5Jebxiu+uoHm5pDqXcrDxquJxFVvD7HJhPsR0yMm85/7bt9NkmQssqqMQ7
-GTX1WnrJa1STaZO/izcJcOw7vXJ89c3DevszGZqZGAiImzpiX2N5T9Xl1OtckOrG
-pX/2aXZg6TATC0Q/lAa9u/GBYvuCZ/hlUKfyjzIAkIXms/w8bZu7EAb2tIipGoVO
-dfvsW/3LtA7tnYDNrK0ZyhgCSDiu7L6bfGcLlMsJNCNmGbRsVkkx5L7Di9KI9WD2
-cfnmuPMQLu/C9F3lGcfRg05yZSFrA0TgZ9xFeB8cq/H5dwIDAQABo1swWTAdBgNV
-HQ4EFgQUAjMKyo3f4aK/PsMfBg4Z5ybxg1wwOAYDVR0RBDEwL4IKaWRwLmx0dS5z
-ZYYhaHR0cHM6Ly9pZHAubHR1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQAATNstFYSsUkvum8FSaX5ocJwTxuiH1kNM/ZHhEWeT6/iWHnLhu7Ny
-TmDtc3WkxSMtJ3sk6JXr+SHKCMdDoFhUH2R/djGEnjLURtMLhEeMIEIk3tY3v4cO
-7SoVlJMf+3olbpvWzd9DzkONU9U/CcY6si0FWXFnzWkkJOzCdJcvIpY2eQ5ToBvr
-uowwVDOkLMkwJEKleCa0iFm6oRGmGOGavnymCFZSG2BCikRllS5J0j0Pj3ZYwc5p
-MfScMYUVxXQNrKv/yODSBaeDgqvxmTzKjSyNUShynz+WXbFOxV/HlCKtaaZNh2Zv
-ZdLXjuEF1cFQB3AAK9PIEmkLc69IXjPQ
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lulea University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Luleå tekniska universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lulea University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ltu.se/?l=en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.ltu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Lulea University of Technology</md:Company>
-    <md:SurName>LTU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Lulea University of Technology</md:Company>
-    <md:SurName>LTU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Lulea University of Technology</md:Company>
-    <md:SurName>LTU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@ltu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
deleted file mode 100644
index d76c45c8..00000000
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.mah.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-04-07T14:03:19Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp.mah.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">mau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Malmö universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Malmö University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Malmö universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Malmö University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/sv_SE/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="163" width="56">https://cdn.mah.se/images/header/sv/mau-logo.svg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="163" width="56">https://cdn.mah.se/images/header/en/mau-logo.svg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>mah.se</mdui:DomainHint>
-        <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:55.6087954,12.9945611</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
-MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCCYTQPJO3eMFyM1s95c9+L6GqieSDW421ziu+LKsau
-HGw1bYbSN/QFV//WSFu7kVTXOlyHw7oCKOCPAsnAeZwO7ulFjL7XbmsXgUhC7Zce
-A7lHXakjMoLXGTbz07xPRjhjLs31TG6wfQBwec5aot+yfRmuy2ag+DOWCQDvVND5
-PDgdH7MNURiJD0POpaPv/w1PNm55hpqxxAQpXrn6KZuUdLtihWQKsK0UeEEf52Pi
-9dlrVnDArIredcnDA8uQz578Ve/JgmJYlRfhMa2XKGkz8IwGxHk6DWODqrgdbTIn
-/OHT/+TFUFQHU89YEZLfTb/MRSSKnhxcuOguH2KwL9aLAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQGmSCSgZIUbOMnq6TS2JniITm0DTA4BgNVHREEMTAvggppZHAubWFoLnNl
-hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAE6eWPoKTaZh/h1OufvNWObcvnJp9nmCsT6qHTQ3FRJ6VFKh/JSeqYlh
-a25i1dxjphMfNR/H9Bpj3eblaVKaKgywojh5X1jOevrvyrJui2Mdzoy/rTfSpe9/
-uScxEK65CIDkBj3xbzrILg/qV1uW1jUJivTvmAC97S3iEevYdDgWKXmhuYemoFfz
-JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
-LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
-jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
-MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCg9MH6aHw3FTJimmv0pYtzdcN4Z1y00cGlbuFykg+G
-2lZWhp1nPTHmcX10NBs6zMDhw8tU/aoP0w0HbFYb8ybvVwQIJ70o5bYSZvUlaxjs
-WPjeGev3atiS2po1YbB0l0cjmZGc4WTXljoi11u8KbJKRd5oNzS+/bP9H3BA9MGU
-Zrw+9+1j53IEjlWSYOEpDfpcWimiKxTBauVWV+rTduC5XJqPIzlcOm248jojOP+c
-oot/aD67tw3EkPtMXAwA6gF3QaDf24YkSTTzkqGTgyykOZBWpykmLDm6VswEvVwb
-1TjdI6GTOJftTiqceySv+fyjypE+i8z7c2puHa8w25FVAgMBAAGjWzBZMB0GA1Ud
-DgQWBBS0AHl1i/xnxDcIta2EkFeRqpWZ1DA4BgNVHREEMTAvggppZHAubWFoLnNl
-hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBACysMW88jYNzQNZK3BmPa2G3+U8wShjS6A4O9iVvFn20vKV0MZ2y13Lt
-PKbiLEK+Fp8ueRt6AHEdNRVMfq+YdzyuG9EDGqKKt1NEbfcG/JS2oWwTa/n9gzCc
-UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
-74tDsem3BPOxFrznliM4yO31HORttr+idQU40p1J5QAFQkZHqnvW328vftAs3zCl
-t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
-2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
-MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAmC0oViw/6krOFwoIf7M2PaGGvBmZnpNT4Jz8nI+f
-DyFGPC8cTUEnHPgLthCHS1aNzmkmlZ9jpK8eL2VBntEUbAYSK+6G9ual+jYjk/fH
-PpuR3e3J1a/JGEV+LgJziw+4j3O41aTcwt5l0ZBVtdON7pRTeTLfnEYJeoGlPJU7
-Gk9v/+BTo5peTtR2UZiOpgEs0OeNfiOt1RdaUndkQHbDc6aDdMgRwsbwQtLASvfr
-PDSWraERg1NFyK+BAUmIeEdq48um6KPIVkLMIPawgMV+uDYY9/E5GVm5V6+/CqiY
-ePkChMR6u5JaUQ70D0odk6i9SaGZUcwWJfoE9eTiwMo0yQIDAQABo1swWTAdBgNV
-HQ4EFgQUqqLsvn6tmlN7zYJ7Ea9h8psUF24wOAYDVR0RBDEwL4IKaWRwLm1haC5z
-ZYYhaHR0cHM6Ly9pZHAubWFoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA5rgvE5wFj20LbPOe7omwVROuTVUdpGbZ4XNWp6RDWx937xcJvJMFY
-mLBKhE3VtxyRDj+hwqnGgmeyEyYXBTPX7NNsibwOE0WcCcn4bshR6Gd5NvyQQ8w0
-Ybc+s9dLigZVWsOrMdednugV0mnqQ/qWwQYn7DBDHInReks2o+DtWyFhYeoSalch
-eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
-Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
-7UutZmHR05RiErkouLWVildFWPkfDUIO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mah.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mah.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mah.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">mau.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
-MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCCYTQPJO3eMFyM1s95c9+L6GqieSDW421ziu+LKsau
-HGw1bYbSN/QFV//WSFu7kVTXOlyHw7oCKOCPAsnAeZwO7ulFjL7XbmsXgUhC7Zce
-A7lHXakjMoLXGTbz07xPRjhjLs31TG6wfQBwec5aot+yfRmuy2ag+DOWCQDvVND5
-PDgdH7MNURiJD0POpaPv/w1PNm55hpqxxAQpXrn6KZuUdLtihWQKsK0UeEEf52Pi
-9dlrVnDArIredcnDA8uQz578Ve/JgmJYlRfhMa2XKGkz8IwGxHk6DWODqrgdbTIn
-/OHT/+TFUFQHU89YEZLfTb/MRSSKnhxcuOguH2KwL9aLAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQGmSCSgZIUbOMnq6TS2JniITm0DTA4BgNVHREEMTAvggppZHAubWFoLnNl
-hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAE6eWPoKTaZh/h1OufvNWObcvnJp9nmCsT6qHTQ3FRJ6VFKh/JSeqYlh
-a25i1dxjphMfNR/H9Bpj3eblaVKaKgywojh5X1jOevrvyrJui2Mdzoy/rTfSpe9/
-uScxEK65CIDkBj3xbzrILg/qV1uW1jUJivTvmAC97S3iEevYdDgWKXmhuYemoFfz
-JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
-LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
-jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
-MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCg9MH6aHw3FTJimmv0pYtzdcN4Z1y00cGlbuFykg+G
-2lZWhp1nPTHmcX10NBs6zMDhw8tU/aoP0w0HbFYb8ybvVwQIJ70o5bYSZvUlaxjs
-WPjeGev3atiS2po1YbB0l0cjmZGc4WTXljoi11u8KbJKRd5oNzS+/bP9H3BA9MGU
-Zrw+9+1j53IEjlWSYOEpDfpcWimiKxTBauVWV+rTduC5XJqPIzlcOm248jojOP+c
-oot/aD67tw3EkPtMXAwA6gF3QaDf24YkSTTzkqGTgyykOZBWpykmLDm6VswEvVwb
-1TjdI6GTOJftTiqceySv+fyjypE+i8z7c2puHa8w25FVAgMBAAGjWzBZMB0GA1Ud
-DgQWBBS0AHl1i/xnxDcIta2EkFeRqpWZ1DA4BgNVHREEMTAvggppZHAubWFoLnNl
-hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBACysMW88jYNzQNZK3BmPa2G3+U8wShjS6A4O9iVvFn20vKV0MZ2y13Lt
-PKbiLEK+Fp8ueRt6AHEdNRVMfq+YdzyuG9EDGqKKt1NEbfcG/JS2oWwTa/n9gzCc
-UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
-74tDsem3BPOxFrznliM4yO31HORttr+idQU40p1J5QAFQkZHqnvW328vftAs3zCl
-t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
-2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
-MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAmC0oViw/6krOFwoIf7M2PaGGvBmZnpNT4Jz8nI+f
-DyFGPC8cTUEnHPgLthCHS1aNzmkmlZ9jpK8eL2VBntEUbAYSK+6G9ual+jYjk/fH
-PpuR3e3J1a/JGEV+LgJziw+4j3O41aTcwt5l0ZBVtdON7pRTeTLfnEYJeoGlPJU7
-Gk9v/+BTo5peTtR2UZiOpgEs0OeNfiOt1RdaUndkQHbDc6aDdMgRwsbwQtLASvfr
-PDSWraERg1NFyK+BAUmIeEdq48um6KPIVkLMIPawgMV+uDYY9/E5GVm5V6+/CqiY
-ePkChMR6u5JaUQ70D0odk6i9SaGZUcwWJfoE9eTiwMo0yQIDAQABo1swWTAdBgNV
-HQ4EFgQUqqLsvn6tmlN7zYJ7Ea9h8psUF24wOAYDVR0RBDEwL4IKaWRwLm1haC5z
-ZYYhaHR0cHM6Ly9pZHAubWFoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA5rgvE5wFj20LbPOe7omwVROuTVUdpGbZ4XNWp6RDWx937xcJvJMFY
-mLBKhE3VtxyRDj+hwqnGgmeyEyYXBTPX7NNsibwOE0WcCcn4bshR6Gd5NvyQQ8w0
-Ybc+s9dLigZVWsOrMdednugV0mnqQ/qWwQYn7DBDHInReks2o+DtWyFhYeoSalch
-eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
-Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
-7UutZmHR05RiErkouLWVildFWPkfDUIO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Malmö University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Malmö universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Malmö universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Malmö University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.mau.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.mau.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Malmö University</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Malmö University</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Malmö University</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:support@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Malmö University</md:Company>
-    <md:GivenName>ITI</md:GivenName>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.mdh.se-idp-shibboleth.xml b/swamid-2.0/idp.mdh.se-idp-shibboleth.xml
deleted file mode 100644
index 3dec2f46..00000000
--- a/swamid-2.0/idp.mdh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.mdh.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:55:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp.mdh.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mdh.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.mdh.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.mdh.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-        <mdui:DisplayName xml:lang="sv">Mälardalens universitet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens universitet</mdui:Description>
-        <mdui:Logo xml:lang="en" height="117" width="216">https://idp.mdh.se/idp/images/mdulogo-en.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="117" width="216">https://idp.mdh.se/idp/images/mdulogo-sv.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.mdu.se/personuppgiftsbehandling-gdpr</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.mdu.se/en/malardalen-university/processing-of-personal-data?</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>mdh.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUHKkBSBUMCRhomEEXLxF2gi1Q8IkwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1kaC5zZTAeFw0xNjAzMTQwOTQ1MDNaFw0zNjAz
-MTQwOTQ1MDNaMBUxEzARBgNVBAMMCmlkcC5tZGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCOoxEAKR/RPiipVtv7MHUHcO8nfPn5Dk4L+W0rEzjl
-tNhUtzZF8ZLBv2M8DZkbzQiCiysOZOh8hlr2H+WhgtT/hjCo5hIqLbaZTeebUJdD
-pCFHcIgAc6YdKArmd2NbrAIxqgohrLcARlLsnmFx9o4QbWmTijvD21doq2njyIo0
-AZ+RE1v5MKa4pZjRXJzC3Of+Lxc8Sskqr5FINppLPWQniqctCNzOvmZy40cFT8Y5
-rx8O+6LtGkdMj/0VbXWevNkBTEU02nr3XTrxcJaTiVJKhiUvpMtwP/FcHPYfQY3+
-nbBurpp9jMlUPwkqcAyJMAGF3zz9lDptvDoYbRLYVQz1AgMBAAGjWzBZMB0GA1Ud
-DgQWBBRO71eH6zrLhdHcZf7ddW9IPqLUsDA4BgNVHREEMTAvggppZHAubWRoLnNl
-hiFodHRwczovL2lkcC5tZGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBACGDyvJqTqsX+P753uaZ0LYxJtJicUR0r1ak1JNWFZGNTkAQO2N4btCy
-Iq/pX0LhrdkYiHr0A2xR4H8fmXeEKVRA5lPwn1LZWY0WcB7pLHPnAMCzC5YXxjpK
-tVzKzT+CSyHyKypZNVYYnxt/y8WfRfTyF4iPP7k//+0eRGBhPTtMyK55jF+vdaKW
-nVeN57cjOhsSXOJxEzRFnhFroAyDHb0/nbpFyWDvuoE5/K0hbu7Lcih1RlF+UDt8
-+zbrnFLl4aTJW2PuzUqkIs1KbKMzq028tEbO9X4JNLwh3KNbtjrWXludptMFa1cQ
-ATLRsLnTFdxRjpwceRmhatq4Q8wG6Aw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUSg5NZF3A3SL9KYt5iuzvFtNBPQkwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1kaC5zZTAeFw0xNjAzMTQwOTQ1MDJaFw0zNjAz
-MTQwOTQ1MDJaMBUxEzARBgNVBAMMCmlkcC5tZGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCqKAbUPT4FhebJZ2tEcM53cTZjkGYLNqAXBmOrh++M
-XpgD2uhw+FXegWPs6yoLF79Rzm5sqX4IsuHLMkmqARLTHaJFpch0JSvYkhzQjTZk
-I5ou6OZCM37dqza5fM7x25Gmv735Q7Fkxzqp7+kRXGRU1vMEcCf0mdFNp+284Pnr
-KhB3lmDyRXbvPItlZSakA7iyQaXv06NUs9kxMqM/XzNZhNcewXs5NeT2TCy0Gx4Y
-95HiJHcHm51KUuZnlq0CJbnzonn3ArlxHN2B5RrX4/UJjUNKB+bBHWkzPr0z7Hon
-2ldazVXnrDeOxSW5EAsz7NAfVOTH3IR9BM7EXhTr0D/xAgMBAAGjWzBZMB0GA1Ud
-DgQWBBTfPEuJqqQ1qDIPSToEvEh55F4BHjA4BgNVHREEMTAvggppZHAubWRoLnNl
-hiFodHRwczovL2lkcC5tZGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAKHA6KAW6jtemE65gHlloOkEQPXnXI6OXKOUqJ3ZpD97XHmRJL64xPlS
-lrWq7p9+dwCckEYEy/wkDWO7N5Be6zETLWVJqnyFvxiIUNqEneTcxMVc9ZeJ66NZ
-oHWkPY6VgFbOXaIxLk6AJUsa/W7REc4CZmdb4B3OT+Hl8JcZncD3c0fgSg0EESM4
-jMZL785tKMEJifOKkPpfSC8q34tEHvfGgXyjIeBfnI5ZgyV3eagw7SS+4K6NxB4X
-linubOuuF8VhLsraT/yeth+xGuATMek4PgP2/QHbeg9HsX+AF+wal3PGJimQ+yJS
-gyukLNxra28MmFXVJyr62JJYbcGkvCw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUVlr13qq8jnGZsILzOc05A9ZmSnowDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1kaC5zZTAeFw0xNjAzMTQwOTQ1MDJaFw0zNjAz
-MTQwOTQ1MDJaMBUxEzARBgNVBAMMCmlkcC5tZGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC78BglulqEG8nISp5GykeWMEUlBlL0Pe6FH3ZiyFVr
-n2vpN0+m5+GFz84WU6VSoxycYZo4ocKbul24mM8FCXDt3AP9akYCNurOUT+Ahbw4
-1mrFKDpVVB6CbQsmZzMkjwQy+NDF76M1fwl/paWpJVFtWr61Q0CLS5Cqpp6BHAUo
-nZjmvIeBhOf0Yv6vtHkTydbzybmVGyR7zlXU1GtHiSdgWcK0VvlAWKzNwBNrNiCW
-vSr5VT2KSONyg1Ql3ri9wc6RTqWYkYfBzbXD7wtsqqBEDb/hdLrnYlzlt4YtfknB
-auBvAUXQBB1sGCn11z2Oe5zu3lG11xXrmWl0rOjUuVtJAgMBAAGjWzBZMB0GA1Ud
-DgQWBBRFsKwNr5k+V8TXxqojGYzuAuzzVzA4BgNVHREEMTAvggppZHAubWRoLnNl
-hiFodHRwczovL2lkcC5tZGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAFFH0k3bDrqva3DSg1JrB0rRZAtQX3inM61Punb39rLgbZa8W+kCDatS
-CuEy0JobOzJ37b5GTEaSZsiHPNVws2vVhVKv0b8yhOlnppHRMku8z/7ZOwxni8qL
-5kwX7IfdKwUHScQVbX97cnE3JorqUZJCT8v4TWLoiIiJKXfx8/S54XFNi0DvR5Cq
-qXXMnr30Z6g5yfbkQ1005mxdS0d1KIbjH7Dd9e5zke2GgnUbJwTLnj3XRGhhtV0d
-gJxaftdRQe7zWKOr0S7Lpm02pTSgD9bTPx1RVDuoyIYO0GGn+CF9ADzfOWR4dtJ9
-28W6JGgZQedaKSYWCnOL0rEbSwNm7aE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mdh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mdh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mdh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mdh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mdh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mdh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUHKkBSBUMCRhomEEXLxF2gi1Q8IkwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1kaC5zZTAeFw0xNjAzMTQwOTQ1MDNaFw0zNjAz
-MTQwOTQ1MDNaMBUxEzARBgNVBAMMCmlkcC5tZGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCOoxEAKR/RPiipVtv7MHUHcO8nfPn5Dk4L+W0rEzjl
-tNhUtzZF8ZLBv2M8DZkbzQiCiysOZOh8hlr2H+WhgtT/hjCo5hIqLbaZTeebUJdD
-pCFHcIgAc6YdKArmd2NbrAIxqgohrLcARlLsnmFx9o4QbWmTijvD21doq2njyIo0
-AZ+RE1v5MKa4pZjRXJzC3Of+Lxc8Sskqr5FINppLPWQniqctCNzOvmZy40cFT8Y5
-rx8O+6LtGkdMj/0VbXWevNkBTEU02nr3XTrxcJaTiVJKhiUvpMtwP/FcHPYfQY3+
-nbBurpp9jMlUPwkqcAyJMAGF3zz9lDptvDoYbRLYVQz1AgMBAAGjWzBZMB0GA1Ud
-DgQWBBRO71eH6zrLhdHcZf7ddW9IPqLUsDA4BgNVHREEMTAvggppZHAubWRoLnNl
-hiFodHRwczovL2lkcC5tZGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBACGDyvJqTqsX+P753uaZ0LYxJtJicUR0r1ak1JNWFZGNTkAQO2N4btCy
-Iq/pX0LhrdkYiHr0A2xR4H8fmXeEKVRA5lPwn1LZWY0WcB7pLHPnAMCzC5YXxjpK
-tVzKzT+CSyHyKypZNVYYnxt/y8WfRfTyF4iPP7k//+0eRGBhPTtMyK55jF+vdaKW
-nVeN57cjOhsSXOJxEzRFnhFroAyDHb0/nbpFyWDvuoE5/K0hbu7Lcih1RlF+UDt8
-+zbrnFLl4aTJW2PuzUqkIs1KbKMzq028tEbO9X4JNLwh3KNbtjrWXludptMFa1cQ
-ATLRsLnTFdxRjpwceRmhatq4Q8wG6Aw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUSg5NZF3A3SL9KYt5iuzvFtNBPQkwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1kaC5zZTAeFw0xNjAzMTQwOTQ1MDJaFw0zNjAz
-MTQwOTQ1MDJaMBUxEzARBgNVBAMMCmlkcC5tZGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCqKAbUPT4FhebJZ2tEcM53cTZjkGYLNqAXBmOrh++M
-XpgD2uhw+FXegWPs6yoLF79Rzm5sqX4IsuHLMkmqARLTHaJFpch0JSvYkhzQjTZk
-I5ou6OZCM37dqza5fM7x25Gmv735Q7Fkxzqp7+kRXGRU1vMEcCf0mdFNp+284Pnr
-KhB3lmDyRXbvPItlZSakA7iyQaXv06NUs9kxMqM/XzNZhNcewXs5NeT2TCy0Gx4Y
-95HiJHcHm51KUuZnlq0CJbnzonn3ArlxHN2B5RrX4/UJjUNKB+bBHWkzPr0z7Hon
-2ldazVXnrDeOxSW5EAsz7NAfVOTH3IR9BM7EXhTr0D/xAgMBAAGjWzBZMB0GA1Ud
-DgQWBBTfPEuJqqQ1qDIPSToEvEh55F4BHjA4BgNVHREEMTAvggppZHAubWRoLnNl
-hiFodHRwczovL2lkcC5tZGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAKHA6KAW6jtemE65gHlloOkEQPXnXI6OXKOUqJ3ZpD97XHmRJL64xPlS
-lrWq7p9+dwCckEYEy/wkDWO7N5Be6zETLWVJqnyFvxiIUNqEneTcxMVc9ZeJ66NZ
-oHWkPY6VgFbOXaIxLk6AJUsa/W7REc4CZmdb4B3OT+Hl8JcZncD3c0fgSg0EESM4
-jMZL785tKMEJifOKkPpfSC8q34tEHvfGgXyjIeBfnI5ZgyV3eagw7SS+4K6NxB4X
-linubOuuF8VhLsraT/yeth+xGuATMek4PgP2/QHbeg9HsX+AF+wal3PGJimQ+yJS
-gyukLNxra28MmFXVJyr62JJYbcGkvCw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUVlr13qq8jnGZsILzOc05A9ZmSnowDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1kaC5zZTAeFw0xNjAzMTQwOTQ1MDJaFw0zNjAz
-MTQwOTQ1MDJaMBUxEzARBgNVBAMMCmlkcC5tZGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC78BglulqEG8nISp5GykeWMEUlBlL0Pe6FH3ZiyFVr
-n2vpN0+m5+GFz84WU6VSoxycYZo4ocKbul24mM8FCXDt3AP9akYCNurOUT+Ahbw4
-1mrFKDpVVB6CbQsmZzMkjwQy+NDF76M1fwl/paWpJVFtWr61Q0CLS5Cqpp6BHAUo
-nZjmvIeBhOf0Yv6vtHkTydbzybmVGyR7zlXU1GtHiSdgWcK0VvlAWKzNwBNrNiCW
-vSr5VT2KSONyg1Ql3ri9wc6RTqWYkYfBzbXD7wtsqqBEDb/hdLrnYlzlt4YtfknB
-auBvAUXQBB1sGCn11z2Oe5zu3lG11xXrmWl0rOjUuVtJAgMBAAGjWzBZMB0GA1Ud
-DgQWBBRFsKwNr5k+V8TXxqojGYzuAuzzVzA4BgNVHREEMTAvggppZHAubWRoLnNl
-hiFodHRwczovL2lkcC5tZGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAFFH0k3bDrqva3DSg1JrB0rRZAtQX3inM61Punb39rLgbZa8W+kCDatS
-CuEy0JobOzJ37b5GTEaSZsiHPNVws2vVhVKv0b8yhOlnppHRMku8z/7ZOwxni8qL
-5kwX7IfdKwUHScQVbX97cnE3JorqUZJCT8v4TWLoiIiJKXfx8/S54XFNi0DvR5Cq
-qXXMnr30Z6g5yfbkQ1005mxdS0d1KIbjH7Dd9e5zke2GgnUbJwTLnj3XRGhhtV0d
-gJxaftdRQe7zWKOr0S7Lpm02pTSgD9bTPx1RVDuoyIYO0GGn+CF9ADzfOWR4dtJ9
-28W6JGgZQedaKSYWCnOL0rEbSwNm7aE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">MDU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">MDU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mälardalen University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Mälardalens universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.mdu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.mdu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mälardalen University</md:Company>
-    <md:SurName>Peter Falck</md:SurName>
-    <md:EmailAddress>mailto:peter.falck@mdh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mälardalen University</md:Company>
-    <md:SurName>MDH Drift</md:SurName>
-    <md:EmailAddress>mailto:drift.ita@mdh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mälardalen University</md:Company>
-    <md:SurName>Helpdesk MDH</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@mdh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 16 101550</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Mälardalen University</md:Company>
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Falck</md:SurName>
-    <md:EmailAddress>mailto:abuse@mdu.se</md:EmailAddress>
-    <md:TelephoneNumber>+4621101499</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
deleted file mode 100644
index 793b09b1..00000000
--- a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.nordu.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-17T15:32:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.nordu.net/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">nordu.net</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">NORDUnet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NORDUnet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">NORDUnet A/S Identitetsutfärdare används av anställda och gäster vid NORDUnet</mdui:Description>
-        <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://idp.nordu.net</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://idp.nordu.net</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>nordu.net</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
-OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
-RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
-Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
-CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
-M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
-ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
-DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
-bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
-nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
-Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
-aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
-JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nordu.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nordu.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nordu.net/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">nordu.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
-OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
-RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
-Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
-CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
-M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
-ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
-DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
-bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
-nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
-Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
-aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
-JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>NORDUnet</md:Company>
-    <md:SurName>noc@nordu.net</md:SurName>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet</md:Company>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>NORDUnet</md:Company>
-    <md:SurName>NUNOC</md:SurName>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>NORDUnet</md:Company>
-    <md:GivenName>NORDUnet CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.oru.se-idp-shibboleth.xml b/swamid-2.0/idp.oru.se-idp-shibboleth.xml
deleted file mode 100644
index 5d318823..00000000
--- a/swamid-2.0/idp.oru.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.oru.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-05-20T12:06:43Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.oru.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">idp.oru.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
-        <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.oru.se</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="65" width="90">https://shib-idp-2.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="65" width="90">https://shib-idp-2.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.oru.se/english/</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://www.oru.se/english/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.oru.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>oru.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.96.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDCzCCAfOgAwIBAgIUVA3oHFEZDVPBIzyhnqLguPcc7h0wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm9ydS5zZTAeFw0yMTA1MDMxMzI4MTRaFw0zMTA1
-MDExMzI4MTRaMBUxEzARBgNVBAMMCmlkcC5vcnUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDRC3DInSjmB7Y/hEvv9vOeCQp5V5lrlgWfqS9C4LBA
-GoJyUD+oxnfEUDYyaQnZrXVuBZuYI8Pap1XZ+4vYS3THo46zteKZpyMb0I7/5XSt
-EIMqM2gHb4ZgHCvtmslrS3Xjv1GTe+0R4OdAB5d/NxQYO222EvyKKDohcbOQgnTn
-aCTiENSJh+BcWEhyJiDiw7vVi/xZRIuxc7NIklJmWspXI2mLIsjVh2VFEtTvqxOp
-pR3gINeha5luTVJ6She9/KlhBojGZFoFuM9hkxDzXswkFf+atAgrKCbMi4LsmN2V
-C9e9wei2/btu+Myn2mzTYCfrIQOHqoNZ6pn2AymIFgVbAgMBAAGjUzBRMB0GA1Ud
-DgQWBBRSq/3J51mK3K+zQTqKzBdJJZh0djAfBgNVHSMEGDAWgBRSq/3J51mK3K+z
-QTqKzBdJJZh0djAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBh
-qg/nx2y2d+3vWNCejSFJFoTlu9GnhwR4vILr78MX84IN91jUqo/Ukoy0xdUFYbgU
-tAPQaQUHqVduC9gxvnoZSAlHv2l3ouGn2zGUKHOg9SJ8dX5yIdUhJeldFdO6Gmn+
-dQSueC/oIjK1k8PgwXd+u804XXB2YLfXb4LhLGazipYvFRFKgpMtGD95cnpeCNyH
-4x636zwYkHAIysm7t5WQgI55rGnIE/BaoWguN9Ysz83J9k0QWDSZDM2nRDDNxAcX
-Z+PdjawDyfZMtGQB0PMh6aujcMDxDUcckEijoRJ/K38IeWPQouOB+aslYLEGQP+F
-NPlPEBgbuu0qhyaDywQe
-
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDCzCCAfOgAwIBAgIUPHXezjUr3+4W44TnxKXur9VnGgIwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm9ydS5zZTAeFw0yMTA1MDMxMzI5MTdaFw0zMTA1
-MDExMzI5MTdaMBUxEzARBgNVBAMMCmlkcC5vcnUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC2fBIKJEXpFipg6oV0algbQtef0utW3iBwG1WitOYJ
-w1AhMexuE07HNyAkdjk84XWa1RcZ/1vGLD5gF+CFXnI4pZfwMofjTytqQaS/EUuk
-SVmofrHYv8OcPTE9ueiZnei+7ikdLkR8yHX3CCWqQnQwb9zq+BzJ3gddaQuW1voE
-1Meyxijoud3sKPCs/sjL0JKDABr/VYhtdELDEwbM2LqzQ2U15LOdGCSt97+hQEex
-++rqyIgh3/aKAUarZo/DtEtkWaC97tv8ZSevYKg4qhHA+RET0arEqpELREStLLV7
-tKFKJQKjkUTt+Z2v5H3LV3/8GkRmsYhf7j7inygqYWK/AgMBAAGjUzBRMB0GA1Ud
-DgQWBBR4ur0paRys06xcgGLNxP2A5LgRnDAfBgNVHSMEGDAWgBR4ur0paRys06xc
-gGLNxP2A5LgRnDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCH
-4tMnZ0OW2Xkowy0EMsnHUFUc0qHLhGzcpqK25mM/4Dq6/LqVLHg/rNmq9gg8y75u
-oR7hcSI5m0/jsrg9zZMcorcZKFVXX1K7hv44rUWpt5PVjsDKv+AdFu5VbU+vMOQh
-gR+o6GspGmzx8FhgSiocPEnDNWHTgE/18jQNQ+7jr+E8CtY1PxXN2pvA/pZ4WzA6
-vDuGLkkbBX1ZMYWH75ViIAOvgxzLmaZxiYI/BwsRk4KaLyl8Sw29cRVyH4bu3lOE
-XZkUKIJxa+/5TELUne9b8IQwbCAdT/LkwAZt/5c9vAJ2u7NBZCJKlZ+OhUKgYWUH
-wLKze2zbBKT2f9l2kEnb
-
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oru.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oru.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oru.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oru.se/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oru.se/idp/profile/SAML2/Unsolicited/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oru.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oru.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">idp.oru.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDajCCAlICCQDPtp194yuCkDANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJT
-RTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UECgwRT3JlYnJv
-IFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkqhkiG9w0BCQEW
-Cm5vY0BvcnUuc2UwHhcNMjAwNTEyMTIzODExWhcNMjEwNTEyMTIzODExWjB3MQsw
-CQYDVQQGEwJTRTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UE
-CgwRT3JlYnJvIFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkq
-hkiG9w0BCQEWCm5vY0BvcnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQD5X28gK3MZqbILw3CpDNtvQXXNLL+Yu4/RBTEGJPe52agsbFtOmTNTAX36
-E5mbJkl8dJA7JZEDbb+n5pqNX29S3ByBoxh5KYyU8bGqqdBS+gnktEMp2Ov5YTlV
-AJ3Oh+fbeC7XoZGfiRQAcQsevuJmYX1ciQnY+Z7Zw6nJX30gpPbQnCQ8WvxGpX0g
-p1fKph/5C8tUCiQQHW7sTPOWQoHSt+NEUYiyTIZUVnMfzpFmeVoFAdCo6xCaR17+
-tc46TCygoUqSWX3i6qtYmHojMk3AnIIszveJMc2EnT/m5cUa05T0nPDE2COefXt9
-5axrvykxYDWE76wid9tZsOrFdspFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABp9
-YIbANYrIRwg9a5gR5r8Mfkf3VwUCxo0wGp0X6VnJCvpwNcL+fRNf3AmQEE+6+vTk
-7t9LqlCNzSfRbk9VqZK5CSp0mUDRr0tIWZxxU8bYvGT8Mn60r+Ng93SzOCOJx6k2
-vjDDESiNR5pKJ7WisTVLVa7Ve2YIRcc7IPZPZGQRM26XlnBjOMJ4MZMNxwSlj+2b
-Ipb5f9y5AjrkI3FpHE0gHNl0gzFa6Hd2Cfn+rw+GGrWrcz5KscFu5Z6nhxN2KKlS
-Km7JSP1DHVWSbdtYwRFn1Lw2daDfLxUD9eWQpydycMRvNTaqwGOR90sJbzRvN0tb
-lG3tGJ938zt7FPeuL04=
-
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDCzCCAfOgAwIBAgIUVA3oHFEZDVPBIzyhnqLguPcc7h0wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm9ydS5zZTAeFw0yMTA1MDMxMzI4MTRaFw0zMTA1
-MDExMzI4MTRaMBUxEzARBgNVBAMMCmlkcC5vcnUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDRC3DInSjmB7Y/hEvv9vOeCQp5V5lrlgWfqS9C4LBA
-GoJyUD+oxnfEUDYyaQnZrXVuBZuYI8Pap1XZ+4vYS3THo46zteKZpyMb0I7/5XSt
-EIMqM2gHb4ZgHCvtmslrS3Xjv1GTe+0R4OdAB5d/NxQYO222EvyKKDohcbOQgnTn
-aCTiENSJh+BcWEhyJiDiw7vVi/xZRIuxc7NIklJmWspXI2mLIsjVh2VFEtTvqxOp
-pR3gINeha5luTVJ6She9/KlhBojGZFoFuM9hkxDzXswkFf+atAgrKCbMi4LsmN2V
-C9e9wei2/btu+Myn2mzTYCfrIQOHqoNZ6pn2AymIFgVbAgMBAAGjUzBRMB0GA1Ud
-DgQWBBRSq/3J51mK3K+zQTqKzBdJJZh0djAfBgNVHSMEGDAWgBRSq/3J51mK3K+z
-QTqKzBdJJZh0djAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBh
-qg/nx2y2d+3vWNCejSFJFoTlu9GnhwR4vILr78MX84IN91jUqo/Ukoy0xdUFYbgU
-tAPQaQUHqVduC9gxvnoZSAlHv2l3ouGn2zGUKHOg9SJ8dX5yIdUhJeldFdO6Gmn+
-dQSueC/oIjK1k8PgwXd+u804XXB2YLfXb4LhLGazipYvFRFKgpMtGD95cnpeCNyH
-4x636zwYkHAIysm7t5WQgI55rGnIE/BaoWguN9Ysz83J9k0QWDSZDM2nRDDNxAcX
-Z+PdjawDyfZMtGQB0PMh6aujcMDxDUcckEijoRJ/K38IeWPQouOB+aslYLEGQP+F
-NPlPEBgbuu0qhyaDywQe
-
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDajCCAlICCQDs5xxKpaMg9TANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJT
-RTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UECgwRT3JlYnJv
-IFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkqhkiG9w0BCQEW
-Cm5vY0BvcnUuc2UwHhcNMjAwNTEyMTIzODExWhcNMjEwNTEyMTIzODExWjB3MQsw
-CQYDVQQGEwJTRTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UE
-CgwRT3JlYnJvIFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkq
-hkiG9w0BCQEWCm5vY0BvcnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDjMaVhR0rA07ogCcVXpPgZGGjD8TGacWfuNhYq+Mxqfj0VRKCFBapZSjjP
-M8bXnPLm6gNSXINiPUFDMUOqfSa45obO8pZTSWPDJVoPpL1JsshH6aSDw+JRsnA6
-gYtzSL9JXFTJ031SykvSamVkdliSaDbl4GzpHcV6QWG3jn8jJcH/U+ZAMPsRh/hK
-A/l6uTjk+ITmaZQNfDYWSG+/iPWaH9kD+Eu86+2i2OHN+H4vaqjsKOfWRwYFoC1v
-xIBW1s44LcRvMl7i557p0OQHXZSrUGCtFvU/9h+f8O9vUBNJ8SGG0HwcTa86Mmf/
-IAX1thD55Msl5y00jEtKWEFohLJRAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADVk
-+DjCPdlGLGxvsoFd/v4Fjyqi+UM/XjopIY92uGfdIikDG0NgO1YKYtOUOnKQudmc
-tB8wrv+ircsgE0Ply4KpSAfEG5jmyIgBNimB177OAxDEldKOpimvBDEjijwVkgHR
-HvlLXkmQ658aCQ3CVbuVlckhhRU43Iv94glUf5htD+vokfadIX/Bdw7A4j3IKnhK
-IjNOUsJnKVdUIBGSipUxDzHiwz9kPJw0FxxxUpfR7NOhOChNvjSnPaErm6v9H/hl
-N53PYLrgu7fMgINxTgPwdv1unfU1kYZUJtFt1I/wYulHEDIU8FPq3G2fdCMexpr+
-qzdjBhUfdsHeXtWHnx4=
-
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDCzCCAfOgAwIBAgIUPHXezjUr3+4W44TnxKXur9VnGgIwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm9ydS5zZTAeFw0yMTA1MDMxMzI5MTdaFw0zMTA1
-MDExMzI5MTdaMBUxEzARBgNVBAMMCmlkcC5vcnUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC2fBIKJEXpFipg6oV0algbQtef0utW3iBwG1WitOYJ
-w1AhMexuE07HNyAkdjk84XWa1RcZ/1vGLD5gF+CFXnI4pZfwMofjTytqQaS/EUuk
-SVmofrHYv8OcPTE9ueiZnei+7ikdLkR8yHX3CCWqQnQwb9zq+BzJ3gddaQuW1voE
-1Meyxijoud3sKPCs/sjL0JKDABr/VYhtdELDEwbM2LqzQ2U15LOdGCSt97+hQEex
-++rqyIgh3/aKAUarZo/DtEtkWaC97tv8ZSevYKg4qhHA+RET0arEqpELREStLLV7
-tKFKJQKjkUTt+Z2v5H3LV3/8GkRmsYhf7j7inygqYWK/AgMBAAGjUzBRMB0GA1Ud
-DgQWBBR4ur0paRys06xcgGLNxP2A5LgRnDAfBgNVHSMEGDAWgBR4ur0paRys06xc
-gGLNxP2A5LgRnDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCH
-4tMnZ0OW2Xkowy0EMsnHUFUc0qHLhGzcpqK25mM/4Dq6/LqVLHg/rNmq9gg8y75u
-oR7hcSI5m0/jsrg9zZMcorcZKFVXX1K7hv44rUWpt5PVjsDKv+AdFu5VbU+vMOQh
-gR+o6GspGmzx8FhgSiocPEnDNWHTgE/18jQNQ+7jr+E8CtY1PxXN2pvA/pZ4WzA6
-vDuGLkkbBX1ZMYWH75ViIAOvgxzLmaZxiYI/BwsRk4KaLyl8Sw29cRVyH4bu3lOE
-XZkUKIJxa+/5TELUne9b8IQwbCAdT/LkwAZt/5c9vAJ2u7NBZCJKlZ+OhUKgYWUH
-wLKze2zbBKT2f9l2kEnb
-
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oru.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oru.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Orebro University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Örebro Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Orebro University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Örebro Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.oru.se/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.oru.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Örebro University</md:Company>
-    <md:SurName>IT Avdelningen</md:SurName>
-    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Örebro universitet</md:Company>
-    <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Örebro University</md:Company>
-    <md:SurName>IT Avdelningen Örebro universitet</md:SurName>
-    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IT-support</md:GivenName>
-    <md:EmailAddress>mailto:abuse@oru.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.sunet.se-idp.xml b/swamid-2.0/idp.sunet.se-idp.xml
deleted file mode 100644
index ba937a17..00000000
--- a/swamid-2.0/idp.sunet.se-idp.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.sunet.se/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-10T09:08:32Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <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-sha512"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.sunet.se/idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SUNET</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inloggning för anställda på SUNET</mdui:Description>
-        <mdui:Description xml:lang="en">Login for SUNET employees</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=sv_SE</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=en_GB</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>sunet.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIUPTMCZQiBk7rR6YUH16f3MPgEuLswDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMB4XDTIyMDYyOTEzMDY1MVoX
-DTMyMDYyNjEzMDY1MVowGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApRlz/4jJt0hk2YJuUW5oqbMJ4G7Y
-pOj/LUiCFpvc4kp43ohVJuOHJhnbfOh1p6R1Ssp2mnfjXmIeUpMtGklH/UpJMKYo
-rOppfq/6SE+hou3FpUF+Ez+JwRs6qxC+6ikI2pktwg2n90hRIPlNM19mK4+wuHny
-FUdAsZOGlqt5mJ+i5tbleOEoW7Ke9NApnv0HHceOlMgD0uQLzkUTdYb9IEcoa2ap
-Qqne/DTfY7WQ+SqxXJG7TNOahPVwPsnZS+VffRzlIC5xU69b0w5thZdyIEtNK12v
-nu/F3x0rVKcxdUYyTexAuU0tL+WbGrCT/Wn6V7xsxqVHx/zREOFOo/1CYEt1KPxW
-C5Z9FTlU+4NfYyxmasun4029xZpIFP3xWfAelhpU93nPUyExnCdWMxp3v7x7nFIf
-bTaTTrv0G3anH6EwPy4IswmCgBJcsvB4foCAWWa91+rKy+2cqhdEzJQk2p1UurzP
-1enmdRtcc+098xzz0u87PTdy939U9g8+SerQEHZlpinRXUz2WtcvwhduWJZXBTYL
-qHFcmDEFi5GN7c5GMDsMaFo8HLLZz2u6azd0BxqT4Whl3NCnLOfBpGuTpscTNNt/
-K59qK29J+iUjBteJuoytiq+xepw0dXQv2FoIs1CWEnNliw/Q6QsXpoPZ6xycF8pZ
-X7TfVFNm8N07NzMCAwEAAaNTMFEwHQYDVR0OBBYEFOkDVb3vv3/zXvjSB9uJUnSP
-1VhYMB8GA1UdIwQYMBaAFOkDVb3vv3/zXvjSB9uJUnSP1VhYMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggIBABEqXpMpFfU12RLE9Xci69qz2rRwcZyf
-K6gq884SBCEFG2yyqCfVd5195zInWtQ/VjPf0IicqtQQt4FqCyYmSExVdHlTYchm
-oJrY0f05D/dMVHPe+YaA1OcP3XneW8fsRm5xOEk9kLef5DiSFW8pNzmdjMJbjLVC
-prJkSGF5nG89MrfV8chaB1EyzmjntDrf7dPS+Lu6gMc3fvNHNNmQWnQEKIyxy2F4
-PpwtVhowOtSYxET6smRDNieI/yza1/KY/PyQ4VVS8BlDL5wYgs7xq0je7fT9V5c8
-8vK3yJ24ZhF+bAbXYsE+96a2226Bur49gYG1DPaMJ9Yb7XcQKRpl6fcplbuKKHPX
-VRjo4jRuKHs52d4mGI97vq14zsWKw16xSLz2MA7EFcIG7D41LAh4bhAPxaAUrWqK
-0hFShj/SPuJVhAaFCkrdg2EfpTdYJh60YzMjavCCT6J71cgei0ZyEuvSmi9xeoOC
-sAUslkarhRCXRznSfrY9xzkit+W8QAXEz6khposlTy06q+2tKZViyP/deWNjqyT9
-CEOXrB5pRIfgqlQp8x0qAmZ5ebdfTjIX4DZE0GrhfnI51vpO4WXMIf84LUaTb/nU
-6KZI3/GFq0MXGrJvA2U5J+q/JK1ztYJVNJ6NSUtexy5C63j8B4jbFFyzMuC+YFXm
-4rXGrKt5wgYR
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sunet.se/Saml2SP/sso/redirect"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sunet.se/Saml2SP/sso/post"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SUNET NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SUNET NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SUNET CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.test.antagning.se-aws-idp.xml b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
deleted file mode 100644
index 69c68b16..00000000
--- a/swamid-2.0/idp.test.antagning.se-aws-idp.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.test.antagning.se/aws-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-10T09:25:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.test.antagning.se/aws-idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Antagning.se - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universityadmissions.se - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för sökande med konto i NyA-systemet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Identity Provider for students with account in the NyA-system.</mdui:Description>
-        <mdui:Keywords xml:lang="sv">antagning.se universityadmissions.se</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">antagning.se universityadmissions.se</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://universityadmissions.se/en/about-this-website/swamid-service-definition/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/swamid-service-definition/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="52" width="205">https://www.test.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="52" width="195">https://www.test.antagning.se/images/logo/antagning_se.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://universityadmissions.se/en/about-this-website/swamid-service-provider-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/swamid-service-provider-privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFEDCCAvigAwIBAgIJAINH1nM/OMFgMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTAeFw0yMjA2MDgwOTQ5MzRaFw0zMjA2MDUwOTQ5MzRaMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMb11JbuqNZCVhpKMQf8LlGKEtiJuAU9+RNzkAvuQuwTb2XCgGeRvYcVhQM2NwOU2ogkf6FepUN+1nqyzMKWo5v81QR58f1NGTwLNMxo0C3GjzpvCHy1fYdpLP7PfR/QwDA7T7CdSe1L/91ru2OIHJRSyMrwEUvLvr5bloDTTq+ov1ZcUJ/4rv+vxefRviNGcEToRXBigY56SVK0ybjiMYsbw0O6i7IQp2D3TaQICe4cGsPGE18hBTNc2oFDIrwB6iIiT4uvamH/g6rc62Kcu8c/6lBqoda+nTLIDZw/l+hE2V/YHiq/OPRQOUh1HvSl1eSp49EVaG6SRnOTugcLF29Fg14NPjDVTGZHcPPtSdjNSV6aRrIvDyBQxcx7zICv1KTFv+uvVdJotW9Wyl7EQvObPI6yi1E1BGOeANQG7QJR7zqljfPGKs2og2729pXKTXyo+4+oldErh1vNPGPT4fxCyLUd9ZRGwingrAcRY0OB6vMCILyhaoKDCYJ5ovaiza69hQj1quhTT2GiuQL3jEmeQhHRuFjy4QUF8np/Q6f/DIHqwi+ZE/DLNCb40bpnh0NdgJkDm+PAU0yE+R+EQA4l7pMYtYqDg3KZYYA6zLy4+zvaa6bxwD3iK0WNEfUdqeXVzeoljP/2VeGICR4Y5z+/FpMm/tRJyCXyM+22+sNzAgMBAAGjTTBLMB0GA1UdDgQWBBS10u7lvxpbq8QoN8qeIZFcGWWPpTAfBgNVHSMEGDAWgBS10u7lvxpbq8QoN8qeIZFcGWWPpTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQAMVuQoX1mJFKGZNRJhS+ssQxd4N4m3dF1GE+JBx4Rs+n6C51YjyfCiI33bsqRAP3AP6Ntu0MctW0l3NDbcIHSBXFayxGPLrv5AnLNAUzJkthVF3m2svam1XxS1xiVEElkkzZhoP4ZU/vtsOucNzq8R0zVVfv7imc191GFKbPuxjRdckUHJlMQW+n6PCFCzLLIt/3qLn1kHTbfQ9fi50mGau7kBdgxmvl9NCscdHJEK4Uncu1IZe87suIYzaXavBLxr6cnm11vRPMnSsX6T6nP/Hu2eMNt0lccjIGlknCWIvoWcyLviaaKy/gEQH5V5uDHt6Oj7HznfnWY1Nvm0coz26Ne0uSTnV10o7rX0brn2nqd+mYAiFAevoM0GguIlX8YkiWRYOE1rSv2TLZIainjZnMQdniv0dZFtU+VHj6Fo+MjxigyWdgngiN95tl2rXxW/bPGyiQaOCahRcSixP/OMC53PpdJyYeyFxlyLTBB6xyZK5MSHqwOBPB1+5Oj+G3XgOt0Vrp+AlA5XieuJNrGpL98HbIrSMJpNLjGzsCS9m3Uhqw0r5/c04y4AB4gD2kCUNjZctXCbm0d4L5dTAEpYGCW6igYlGcaSzwPHHMGEXQWnt6JpepNLpqA5ICnkt7j+ZGqYEcR+XOqFV47+79TuxM1V8Y3jJRxbORpw1VKQ1w==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.test.antagning.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.antagning.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.test.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFEDCCAvigAwIBAgIJAINH1nM/OMFgMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTAeFw0yMjA2MDgwOTQ5MzRaFw0zMjA2MDUwOTQ5MzRaMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMb11JbuqNZCVhpKMQf8LlGKEtiJuAU9+RNzkAvuQuwTb2XCgGeRvYcVhQM2NwOU2ogkf6FepUN+1nqyzMKWo5v81QR58f1NGTwLNMxo0C3GjzpvCHy1fYdpLP7PfR/QwDA7T7CdSe1L/91ru2OIHJRSyMrwEUvLvr5bloDTTq+ov1ZcUJ/4rv+vxefRviNGcEToRXBigY56SVK0ybjiMYsbw0O6i7IQp2D3TaQICe4cGsPGE18hBTNc2oFDIrwB6iIiT4uvamH/g6rc62Kcu8c/6lBqoda+nTLIDZw/l+hE2V/YHiq/OPRQOUh1HvSl1eSp49EVaG6SRnOTugcLF29Fg14NPjDVTGZHcPPtSdjNSV6aRrIvDyBQxcx7zICv1KTFv+uvVdJotW9Wyl7EQvObPI6yi1E1BGOeANQG7QJR7zqljfPGKs2og2729pXKTXyo+4+oldErh1vNPGPT4fxCyLUd9ZRGwingrAcRY0OB6vMCILyhaoKDCYJ5ovaiza69hQj1quhTT2GiuQL3jEmeQhHRuFjy4QUF8np/Q6f/DIHqwi+ZE/DLNCb40bpnh0NdgJkDm+PAU0yE+R+EQA4l7pMYtYqDg3KZYYA6zLy4+zvaa6bxwD3iK0WNEfUdqeXVzeoljP/2VeGICR4Y5z+/FpMm/tRJyCXyM+22+sNzAgMBAAGjTTBLMB0GA1UdDgQWBBS10u7lvxpbq8QoN8qeIZFcGWWPpTAfBgNVHSMEGDAWgBS10u7lvxpbq8QoN8qeIZFcGWWPpTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQAMVuQoX1mJFKGZNRJhS+ssQxd4N4m3dF1GE+JBx4Rs+n6C51YjyfCiI33bsqRAP3AP6Ntu0MctW0l3NDbcIHSBXFayxGPLrv5AnLNAUzJkthVF3m2svam1XxS1xiVEElkkzZhoP4ZU/vtsOucNzq8R0zVVfv7imc191GFKbPuxjRdckUHJlMQW+n6PCFCzLLIt/3qLn1kHTbfQ9fi50mGau7kBdgxmvl9NCscdHJEK4Uncu1IZe87suIYzaXavBLxr6cnm11vRPMnSsX6T6nP/Hu2eMNt0lccjIGlknCWIvoWcyLviaaKy/gEQH5V5uDHt6Oj7HznfnWY1Nvm0coz26Ne0uSTnV10o7rX0brn2nqd+mYAiFAevoM0GguIlX8YkiWRYOE1rSv2TLZIainjZnMQdniv0dZFtU+VHj6Fo+MjxigyWdgngiN95tl2rXxW/bPGyiQaOCahRcSixP/OMC53PpdJyYeyFxlyLTBB6xyZK5MSHqwOBPB1+5Oj+G3XgOt0Vrp+AlA5XieuJNrGpL98HbIrSMJpNLjGzsCS9m3Uhqw0r5/c04y4AB4gD2kCUNjZctXCbm0d4L5dTAEpYGCW6igYlGcaSzwPHHMGEXQWnt6JpepNLpqA5ICnkt7j+ZGqYEcR+XOqFV47+79TuxM1V8Y3jJRxbORpw1VKQ1w==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Antagning.se - Test</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universityadmissions.se - Test</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:GivenName>UHR Systemdrift</md:GivenName>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.test.sunet.se-idp.xml b/swamid-2.0/idp.test.sunet.se-idp.xml
deleted file mode 100644
index 73b0b2bf..00000000
--- a/swamid-2.0/idp.test.sunet.se-idp.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.test.sunet.se/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-05-12T13:53:47Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <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-sha512"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.test.sunet.se/idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SUNET - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inloggning för anställda på SUNET - Test</mdui:Description>
-        <mdui:Description xml:lang="en">Login for SUNET employees - Test</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=sv_SE</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=en_GB</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>sunet.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIUYEql9KeORzO2MWunOhj+TpEjff8wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMB4XDTIwMDUwNTA5MDQwOVoX
-DTMwMDUwMzA5MDQwOVowGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuO4LF9D+pTsI21yr4j91KEHa8P/N
-5cDjpxziteWXYt/RZtj1wIg1TjvcJF64LJ0qvkeyxpEjHSH0EkN2iRhWplw+5otI
-rWWJfz7k7uoD6z9vGgfEx6c4chOYqTioHz9kO4Extet+8xfO4lK5jC8x3hqEtXc1
-k0FUhHLNvaSnF+n8/nAMXZFROrs11y836oOefXYcenzQmQINsD/N/yVQWExJTujG
-KbBAZuWlYixChxEcB5a8fiTJjqBG36IvD5vtUL00BbAxkrewbSQqTRYph5gNCiaL
-2u3a0NCvecyHLPlNj+St4MuRZPVcT2R6j1Mdi00Gu24kEDF8+0FwBhASOPMNeTme
-weaCcTfP/nLqfUzq/GoQZd0Z+mA0Q3avcOg6OEDp5XH+WdbNnYftUYJzVMJdEI3/
-KfQ+VoQY+mYhAAMmiz+05QvQhGE6WxvW1Yzzqkzro9+5+A21+VrWfvGURGas/p/o
-cuCojZSpsyBrD/7MbJYIbbNwP4TMzgGXjjfFnRdimsx4lS3q/GgmdRmLsMKotTu0
-ul3b9+/UzPrPAAjhRKbHcYiXh5TqfI/PEvCowiW4Uh0dqybIl56LUcFqi6ZY9hIE
-vdEaNB0M+tTKo+Oe0I8MhtTKJNZcVqU1tKjAuVgpCUGdfPiUbzbO8i5aM1Wv2daw
-xVHubi/2wFWaex0CAwEAAaNTMFEwHQYDVR0OBBYEFK4Thns8RC8LpZgpl8smURWo
-oRZUMB8GA1UdIwQYMBaAFK4Thns8RC8LpZgpl8smURWooRZUMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGfxgX2yfoD7Z45G4OSqRVSKPRBqmNPc
-W0+KR+o4a5DlbvRIMbELu2YWbxbrOV3i2OBxTCUqQxIbw67gEIlhyBYhgre5f+qh
-Mc/A5lZs+xhgIWgWb9ZuzyP9MDCUIhL6yx6FI0jKI4+lzRMPSWk2azmeWSFKE23M
-jZL/0xqOnsXsBS2AP76mHsedZzXot9L2P5MIQgWuilBs8IVjKIsNndddtzqNanH/
-PSMHNvSmN5Df5rw90qkI7qnPAM996Oblyn/0k32AqWExApMWa8ZD5uUjCNw61enX
-nSgDSMfFiltEQk9P+wESQN2JWqe8d7O9LqUhtHL4ljndbM1El+AQ8w9I3f6R/aUz
-awAwRJStuCRJvXL/9Civ/x0nKNfxrQOmAjLtK3fA9kJmuxQemenpT5CC1g5klutK
-04J0B5PyfHCoQuYs2NcvQ3NI9ozfssYmXplVAe0w4PwH2vvHH++4PpWDmTmiy86Q
-dlp8PDkRRctKbUu4ojK9mvYr7XfXY3UMVhLHorFfUEv7TEzN7OnAQC9AxFmAoQj0
-z22R0TQfg2nJKac4/rZ3Ri6IJtD9maIHeL3XikGrVe/9el8wXCVVOXsb6e+aJltj
-LVuQ6hWxdLht5ODuYILdfwPWFpdhTalVF4JgxqgpwMmAv7f4UHu6ukFQcq1jX+eI
-w1/klZ0omp5S
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.sunet.se/Saml2SP/sso/post"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.sunet.se/Saml2SP/sso/redirect"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SUNET NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.ths.se-idp-shibboleth.xml b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
deleted file mode 100644
index 16cb6dd8..00000000
--- a/swamid-2.0/idp.ths.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.ths.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-11-16T11:05:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp.ths.se/idp/error/ERRORURL_CODE.html">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ths.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">ehs.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Enskilda Högskolan Stockholm</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University College Stockholm</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Enskilda högskolan Stockholm</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for University College Stockholm</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="100" width="100">https://idp.ths.se/idp/images/ehs_100x100.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="100" width="100">https://idp.ths.se/idp/images/ehs_100x100.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ehs.se/om-hogskolan/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ehs.se/en/about-us/privacy/</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://ehs.se/en/about-us/ucs/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://ehs.se/om-hogskolan/om-ehs/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
-MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
-IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
-QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
-VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
-zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
-iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
-HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
-S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
-GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
-wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
-r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
-GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
-MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
-GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
-Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
-HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
-DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
-aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
-HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
-f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
-Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
-WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
-0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
-58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
-MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
-Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
-ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
-/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
-goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
-mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
-HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
-yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
-UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
-2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
-SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
-xAdB19mh1plahNrAaEfu6Ldetyz9iulY
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ths.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ths.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ths.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ths.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ths.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">ehs.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
-MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
-IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
-QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
-VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
-zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
-iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
-HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
-S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
-GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
-wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
-r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
-GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
-MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
-GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
-Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
-HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
-DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
-aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
-HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
-f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
-Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
-WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
-0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
-58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
-MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
-Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
-ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
-/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
-goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
-mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
-HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
-yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
-UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
-2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
-SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
-xAdB19mh1plahNrAaEfu6Ldetyz9iulY
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University College Stockholm</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Enskilda Högskolan Stockholm</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Enskilda Högskolan Stockholm</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University College Stockholm</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ehs.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ehs.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Anita</md:GivenName>
-    <md:SurName>Hansbo</md:SurName>
-    <md:EmailAddress>mailto:rektor@ehs.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:support@ehs.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Enskilda Högskolan</md:Company>
-    <md:EmailAddress>mailto:support@ehs.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.uhr.se-idp-shibboleth.xml b/swamid-2.0/idp.uhr.se-idp-shibboleth.xml
deleted file mode 100644
index 6e7b103f..00000000
--- a/swamid-2.0/idp.uhr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.uhr.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:55:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp.uhr.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">UHR's IDP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identityprovider for UHR</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQA1fEvobeB0k7/9iU1scJLuj8bgwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDhaFw0zNjAz
-MTMwNjEzNDhaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC5UJfJ8igHrENbdVYXCnU7yDb0hilzUW/iuZ9+8sj+
-GhtbREGNan0lCf5hEn+ZI7oNL6G9zhwdQxVrSuatcBDd63DHrk+pr7EX0b6x3qba
-4N3URVdmDcHz3ot+tdd3uxqofDGep/beUpureqW2AscRspLImvgy4lfEkqA7pKuB
-3NQvNDhPjiRIYo2gcQVmEI4uDTiJW9/YlXW8SYZO4Q5vHnJ2gItkD+5iGPRxul27
-uGaHeEjFov3e5b17NiqX4naZ7dYWPOK0KvBeHbY83pZqVzh/Dav3piXVkrJC+/MM
-1W/j1S0nO1J+vTKFYXD41u5b5+VhNCUKkT8Tb95l+5d9AgMBAAGjWzBZMB0GA1Ud
-DgQWBBSKLIlyhvxhCYq4b/P2OGh2Ad1YcjA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAKCFa0xcFkZZE+YXVGiRQ78Npu0fISmo3mJIQNfvX1f47kM3veRPX6c6
-kz+yCxdBmsFrzS6GZMASUS8HRApumTzbao/2EPXZIX1a6Fli/TRXhBjSKX3BQYv/
-qLXYfwDCHTXzxAXmSInEWrAeGsfWkznub7dJBL6gyVwocrgWIdf5NHujkuYCl6X+
-UxtRYjrGjs1FzAJS8b+mlaLELIKBmRMLdknZ/IhTExjiuvhIXnQdgcHRbcyKURQx
-fEHqr/LXLAx+9GIvQxcC84F2Wq8+iPCERg0b23gjzPT00sKlHkvEPaft5//b1jcd
-jh6Yq3qCCn2Yb+cFUDJT72VDJ7NoDRg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUK85xuzAU41ZIbKm/LJP7YzIXD/gwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDdaFw0zNjAz
-MTMwNjEzNDdaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCvNbZH0kfcp0xJ8uVIiBjuRTK2gAmcizSa36WHmsuL
-7c6wOx3XNjpMRxr5mA3k5u27sW6/lyGaqMdeQNY2CK6j6oL0hWcLAeRkZh8mRgNS
-H8+/FDLKn9+r/IQv4qUxHxvfJquLGotAbD9qcSzQmiqBeHtQTNE5k+5ajFH8IA6W
-74TEA1cwCH+g1EATRC36PGaDtLkvmXmKShPcKJ9Qg0Mvd252Y3Cm44I/LG0YgKvl
-8ubfC1KOHpEglrCZ+qxtO/rmhdlVpeKRoXIpYSbevDL3FwVE3o47dyM+sn2zhwsh
-XMuYD8EUlr+1T/gBLmeaHO9QlYXevGdbdDoEbWjHGsODAgMBAAGjWzBZMB0GA1Ud
-DgQWBBRXLdPEN0n4SiGCE9vPuD7ixTBQADA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAAgp4d1TvLdprgUKZj+S/YBwDyQ70Mr54TLrv8FrVCeHRXOw/piEkGAj
-Y/GfKbxP5yeQp3UvoYpEFwXEuXbqhX+ejdZRk9fUwQqlsVbUmd1IUauXSvD4qk4S
-qpzLqHNEpcwcGvHpv0c/PLMoYfgAB405kna7V+t9LjBgFgdL+QZTDK5SpG2NLnmq
-5J49BaZxgxHMcSoDRjeTbli1DlyPCf1QJWzmgJgbi79+SSou0y/1ncirmk7S2dVo
-g55hppBxE4Ch23T/kEHh6GraswLGpCOK/kyDyUA1YVrR8wELO7WBmJrxobTtAFWi
-jcs6eH7JlXc3P5b44189qTfCgUMntVg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUCRfcQ0FZIWx4ZsT6g19Z/LZ448MwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDhaFw0zNjAz
-MTMwNjEzNDhaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCZnBiK6quMGf57WTvpfoRWHpb5GSP6Xwh1QsXqf8Ws
-6uRqFFx7AXe09Vn2BU/yPtZO+Rw0Yb3+eNByUYbz7A5ZIG2vn0nSnryPo4Q8NQsp
-p+VKWXzatXefK+xhYzOgla+f/kIM+CcpqkypLHBzFX3jXPYM31i1HJHcLzXn4EWX
-GWKWYNVMVWM3h7aXOozWran5iGlZa2bB5Q/1Mfx2JWgdKKqmxv8HrnupdjcDjqQ1
-yA1ARH0Mp6MWGBNE9zm/nmNcTxCzHnZiXze2uHH7mH+qc6jWZbYxQ6PEll5FfgMT
-DXO4slIx2WYD7cSXLUYrWOfmzNJROOZz7M5p6G21tjzJAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQC6Bz+Gh8FN6WyPNNxumKKWHJJ6zA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAAc/D2iocq5hL7n585M10ola3lyuja91giPXv4vDRAqPN9TznKfPhd2v
-2uaWzcyyDVZRXfQbEoqwdm+65ijxSUjEXK8vcD/x4m4OMuBqkY7PAbap1za5dAJQ
-uKrjCR95Os2KWDdfuglPz5sh73kQwOKXNG/6fOb7LpW7cd2kBfDFuHLJegmK2H9u
-IpYvhjyBB62widywr2u8PXudGhkymB1ZArxaGEKKCbt4804ngM9ImYfop6xt4OwD
-ejud16QXqp7rWP7ba6tATI9k3Zngi4hP1bjkRJsmGcBIMQHODb4Xi3dft1uGWBdT
-slCO9tT9JJLe1hpBFObZDTDY6/rOkuc=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhr.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhr.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQA1fEvobeB0k7/9iU1scJLuj8bgwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDhaFw0zNjAz
-MTMwNjEzNDhaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC5UJfJ8igHrENbdVYXCnU7yDb0hilzUW/iuZ9+8sj+
-GhtbREGNan0lCf5hEn+ZI7oNL6G9zhwdQxVrSuatcBDd63DHrk+pr7EX0b6x3qba
-4N3URVdmDcHz3ot+tdd3uxqofDGep/beUpureqW2AscRspLImvgy4lfEkqA7pKuB
-3NQvNDhPjiRIYo2gcQVmEI4uDTiJW9/YlXW8SYZO4Q5vHnJ2gItkD+5iGPRxul27
-uGaHeEjFov3e5b17NiqX4naZ7dYWPOK0KvBeHbY83pZqVzh/Dav3piXVkrJC+/MM
-1W/j1S0nO1J+vTKFYXD41u5b5+VhNCUKkT8Tb95l+5d9AgMBAAGjWzBZMB0GA1Ud
-DgQWBBSKLIlyhvxhCYq4b/P2OGh2Ad1YcjA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAKCFa0xcFkZZE+YXVGiRQ78Npu0fISmo3mJIQNfvX1f47kM3veRPX6c6
-kz+yCxdBmsFrzS6GZMASUS8HRApumTzbao/2EPXZIX1a6Fli/TRXhBjSKX3BQYv/
-qLXYfwDCHTXzxAXmSInEWrAeGsfWkznub7dJBL6gyVwocrgWIdf5NHujkuYCl6X+
-UxtRYjrGjs1FzAJS8b+mlaLELIKBmRMLdknZ/IhTExjiuvhIXnQdgcHRbcyKURQx
-fEHqr/LXLAx+9GIvQxcC84F2Wq8+iPCERg0b23gjzPT00sKlHkvEPaft5//b1jcd
-jh6Yq3qCCn2Yb+cFUDJT72VDJ7NoDRg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUK85xuzAU41ZIbKm/LJP7YzIXD/gwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDdaFw0zNjAz
-MTMwNjEzNDdaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCvNbZH0kfcp0xJ8uVIiBjuRTK2gAmcizSa36WHmsuL
-7c6wOx3XNjpMRxr5mA3k5u27sW6/lyGaqMdeQNY2CK6j6oL0hWcLAeRkZh8mRgNS
-H8+/FDLKn9+r/IQv4qUxHxvfJquLGotAbD9qcSzQmiqBeHtQTNE5k+5ajFH8IA6W
-74TEA1cwCH+g1EATRC36PGaDtLkvmXmKShPcKJ9Qg0Mvd252Y3Cm44I/LG0YgKvl
-8ubfC1KOHpEglrCZ+qxtO/rmhdlVpeKRoXIpYSbevDL3FwVE3o47dyM+sn2zhwsh
-XMuYD8EUlr+1T/gBLmeaHO9QlYXevGdbdDoEbWjHGsODAgMBAAGjWzBZMB0GA1Ud
-DgQWBBRXLdPEN0n4SiGCE9vPuD7ixTBQADA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAAgp4d1TvLdprgUKZj+S/YBwDyQ70Mr54TLrv8FrVCeHRXOw/piEkGAj
-Y/GfKbxP5yeQp3UvoYpEFwXEuXbqhX+ejdZRk9fUwQqlsVbUmd1IUauXSvD4qk4S
-qpzLqHNEpcwcGvHpv0c/PLMoYfgAB405kna7V+t9LjBgFgdL+QZTDK5SpG2NLnmq
-5J49BaZxgxHMcSoDRjeTbli1DlyPCf1QJWzmgJgbi79+SSou0y/1ncirmk7S2dVo
-g55hppBxE4Ch23T/kEHh6GraswLGpCOK/kyDyUA1YVrR8wELO7WBmJrxobTtAFWi
-jcs6eH7JlXc3P5b44189qTfCgUMntVg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUCRfcQ0FZIWx4ZsT6g19Z/LZ448MwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDhaFw0zNjAz
-MTMwNjEzNDhaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCZnBiK6quMGf57WTvpfoRWHpb5GSP6Xwh1QsXqf8Ws
-6uRqFFx7AXe09Vn2BU/yPtZO+Rw0Yb3+eNByUYbz7A5ZIG2vn0nSnryPo4Q8NQsp
-p+VKWXzatXefK+xhYzOgla+f/kIM+CcpqkypLHBzFX3jXPYM31i1HJHcLzXn4EWX
-GWKWYNVMVWM3h7aXOozWran5iGlZa2bB5Q/1Mfx2JWgdKKqmxv8HrnupdjcDjqQ1
-yA1ARH0Mp6MWGBNE9zm/nmNcTxCzHnZiXze2uHH7mH+qc6jWZbYxQ6PEll5FfgMT
-DXO4slIx2WYD7cSXLUYrWOfmzNJROOZz7M5p6G21tjzJAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQC6Bz+Gh8FN6WyPNNxumKKWHJJ6zA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAAc/D2iocq5hL7n585M10ola3lyuja91giPXv4vDRAqPN9TznKfPhd2v
-2uaWzcyyDVZRXfQbEoqwdm+65ijxSUjEXK8vcD/x4m4OMuBqkY7PAbap1za5dAJQ
-uKrjCR95Os2KWDdfuglPz5sh73kQwOKXNG/6fOb7LpW7cd2kBfDFuHLJegmK2H9u
-IpYvhjyBB62widywr2u8PXudGhkymB1ZArxaGEKKCbt4804ngM9ImYfop6xt4OwD
-ejud16QXqp7rWP7ba6tATI9k3Zngi4hP1bjkRJsmGcBIMQHODb4Xi3dft1uGWBdT
-slCO9tT9JJLe1hpBFObZDTDY6/rOkuc=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.vr.se-adfs-services-trust.xml b/swamid-2.0/idp.vr.se-adfs-services-trust.xml
deleted file mode 100644
index c6a52909..00000000
--- a/swamid-2.0/idp.vr.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp.vr.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-04T15:09:48Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://idp.vr.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish Research Council</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
-        <mdui:Description xml:lang="en">IDP at Swedish Research Council</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.vr.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.vr.se/english/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">vr vetenskapsrådet vrpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">vr the+swedish+research+council vrpunktse</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.vr.se/behandling-av-personuppgifter.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.vr.se/english/information-on-processing-of-personal-data.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>vr.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1DCCAbygAwIBAgIQH9lfNQcH76JMIFpZZaXFlzANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBpZHAudnIuc2UwHhcNMjAxMDI4MTUzMzU2WhcNMzAxMDI2MTUzMzU2WjAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBpZHAudnIuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjy1xkzbzwM18lhuAqZrvKdB9wpryVw0O4h+MxrXU1WJfZd6i7/8kLthv9DAWOibecIW13TH5d4Bya+YxO1J4b0FssX8yeC34CtNtmGAMP8BtsfjX3myn0XIMaTc1UgcxlZn7YJwLEFiKFVQ54bPOH9rEa5sK/YjZRnamnm+Ouhy92/r1k88zs3XOZR3Z3kfL9uVayjiL6fB7j7zxpNKBbpsMQYFYptWaxXpDqT8a6CFjcMWdsL7U8RqYHoe2HY/m5KOSs3VIDEP5m42ciclgj90USOa6b2JTbkg1fvntV/vwlxbNv5zgdE8PMJyyWA/r5+E3+L4UmlD2r0f54i9GZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABTd8zgxGqPdSQU9/RxnIwjFMwB5NPyK69otl/Gq3zqRx+i/Uvd797Bo+OflKpuxuEbkI2+DVea6YIsdUuFGCrwgDo3Jy+xlEtcXdc1kCgbNmYYynPqvnRxZnByEhfoS40+oBHPHN84nc1zfatcQ2edxIfMxu4/m6Z3jlU0tK7Di8/C/SAduvQCPlI2sv4dwwuMBYG4M1iiesqCTjCIHKlN6VXUpygMHXHkRfbUyx7E5+Ywax8k0x1Dfjqf6rc7pF0b9NF0FGt+TdU3S9HHb3V36hRY8iA+imwXEukPMAWrLwNphdcEgBAyhHW8CW7gUeyOZp6tZXc0gWTXcYSxe7Tc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICzjCCAbagAwIBAgIQW2vRHAgJ67hIVKJOty1vyzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBpZHAudnIuc2UwHhcNMjAxMDI4MTUzNDAyWhcNMzAxMDI2MTUzNDAyWjAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBpZHAudnIuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+EAAdKo+ObbHZj1MC9QFyFFQiM10fL4sykVgmLmyhqiC0bbCn+bNG62SBqk+ETtrP+KPKDyGCRzax1X7N85v9H+WLQTazrnjvjF84QwklOzjcl0Eslap8MBs0xJH4RtkJ8v5UHktstoxASBIUr72J4elGk5WJ1ivb9YlQtqtjknYM+cLgHHeWICjqFqBT8PAOoEbzO3AAJEZ4OyN/vv0LVrpsUcZtIbaWgc97h28/8/Ntxbe6hj0eDsZPCIRBLUt91FinBXH3ZD0wq27OGjBb07rdaR2qmouVHwK4TsMANhrDmDBUBvGn2XxkF+fOtUsfrMi2nFyrQDiSTZdfS0NdAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADPVulta6eB8lOSXL0Tzuy/XFz3tor+E6EpjSwG5/HhtcSWQVUdSECToyI6lZPPskKYvGPXGjfOCJagvG+e6Y1+kKQ33KY7104wY4Jhq1QJTzMIvswxWBikdJ4AWv9x0R9y5sVXZoLWjFtKP58psXHc3aM2x2+igO45uO1YSqwWlWNkO2Q1i7IxcRlHcVh1vcUm771UNXOEL4xY4E2R9sUKPx5/V9kiDbGIQczFAZikZXnY09IyPNq4FjIQ2MYzz7NxxL2fmHdIQ2EUbohLXgd8ULfHZ2fD2zbeMUbPVdwWtSS6xPam1Dgh4df49XVGJwQZ+t2061i3aIu5g+SLTtCQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vr.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vr.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vr.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vr.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Research Council</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.vr.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.vr.se/english.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Vetenskapsrådet</md:Company>
-    <md:EmailAddress>mailto:swamidkontakt@vr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Iver AB</md:Company>
-    <md:EmailAddress>mailto:support@iver.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Iver AB</md:Company>
-    <md:GivenName>Henrik</md:GivenName>
-    <md:SurName>Valstedt</md:SurName>
-    <md:EmailAddress>mailto:henrik.valstedt@iver.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Vetenskapsrådet</md:Company>
-    <md:GivenName>Säk ansvarig</md:GivenName>
-    <md:EmailAddress>mailto:swamidkontakt@vr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
deleted file mode 100644
index 089161ac..00000000
--- a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp01.gih.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp01.gih.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitetsutgivare för Gymnastik- och Idrottshögskolan</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="80" width="80">https://idp01.gih.se/idp/images/gihlogo-mdui.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="80" width="80">https://idp01.gih.se/idp/images/gihlogo-mdui.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://www.gih.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.gih.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gih.se/OM-GIH/Styrdokument/Forvaltning-styrdokument/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gih.se/OM-GIH/Styrdokument/Forvaltning-styrdokument/</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>gih.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3467350,18.0811920</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAOAdN8mb8jSf9chQAMGdb0mkF+ACMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAxLmdpaC5zZTAeFw0xNjA0MjMxMjI4NDVaFw0z
-NjA0MjMxMjI4NDVaMBcxFTATBgNVBAMMDGlkcDAxLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALamhoGQylwmx6ShGrSq4s2YyzNN8AGIbfhc
-nQTOSKrhrFmmol1QSBDYrpOqE2KzRZVeDupl3PopizoHqtdpzDSOpfgjwTrA7+Dt
-ZiAhP9P23UaosDYQjrlO1I+1OrhzzyHZQx0QzlnPkD6izCHH37/x1ObhK3Nsf/qb
-UmJ7ZotD5hiBxPG4KZ58cOoHnjCmRaJv6Vch814x3qqqV+22ycf2awL9i5oXGgPS
-mXkB1LGCSr1EAiA7O4Bmo7Ht/LVwqQnzgH5/u6Oa765lc7sf2BhKWiy1cL4gWyxV
-k9AsLapt9DBA6pf/mtG5aVTciiqMBWx+LTBtL0PlcTcikEyvnbkCAwEAAaNfMF0w
-HQYDVR0OBBYEFGikshvstXvejKVhZeXaTIWfTvDUMDwGA1UdEQQ1MDOCDGlkcDAx
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMS5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAKNQEsBSuRK87Uf3AjJciR0tErylJ3Da2+yrTyxQtFGq
-PaaMYkjsWrPsKKEMiK76PfZTT2udJE2z/2/vzma45q5sL9xII0d0fcF3QG+ZZbPR
-iSxU05dGQVSVjYlkbSj3H3O3QefQ5VuOMJVtIr0RG9oL1T98vGwauNYQI1rk7nKm
-JTWhhTXbvm1kh1Q0v6QPV6svlAHTVjna9zYBwG9N0BNYX+mZrwX08LSarxkspB30
-T2/NYY22EgRl9FVfT9nK+zF9aY0GQznCM2lz8KK9woS3l5CWjAViJ8Iz5m0SgvUy
-ubfqJD+WHSiZclOpNiBpr6d+1L5zGC6xD/PT9/eWpyk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUX+Nr1ScldkAqNC5OtNCivnk7tXgwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaWRwMDEuZ2loLnNlMB4XDTE2MDQyMzEyMjg0NVoXDTM2
-MDQyMzEyMjg0NVowFzEVMBMGA1UEAwwMaWRwMDEuZ2loLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgwM04J1nxjyVqi4mRQcEp1XWqbgMB7AHNFO5
-8KKZsWlQDTpvMD+emnoLj3pp7txvQBpM2YjxZMcz/Bq3UF5IHgkBwA22OQrTTpHu
-ACicoyM2Gje/IKsrqH8zgAIOPdrPlYpQI597fBDmJ9KJPljySytyXDHOTUrchW/b
-ma3HPPxeSxleuOoB5m6yM+XKIIUzzEGfJOn3oEOrRgcPwFyMTsJxB9VwzBrPxQ+F
-iZZ2UoI5DQCI6lJsoHbuy4Tq+Atb2ntpx4O/JzQjCqx+UgInUL0Da1J/KKeSZJO3
-CtbDtYkSL+w1tWHSaZ//thm4bunLUBJHpMZf2G9aQWM9NlzoIQIDAQABo18wXTAd
-BgNVHQ4EFgQUQQcTAlD72mz43X+baZW/rjeyOBkwPAYDVR0RBDUwM4IMaWRwMDEu
-Z2loLnNlhiNodHRwczovL2lkcDAxLmdpaC5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEAD8Nmj4NyeoRbb4u9IzPGryksCWVil2z4XHcvCT9/MRvO
-kbFFnoB5/CzDBcqJiKIlneI0FzoJilFyELwnUY/GNpOycLg1lz0Tb6pdB6BjIhNp
-u3TzuS1YPDhaiufWkxChtSEjxSY6T505UkrhzQ1DdWxLUkdjmSuVTf0TC8LPssUD
-TnDK5ASEvP8QJkr5wfStck+gFtP1XWGxS4H8jA2Jbkc1MwZDejF6TYmvYJkeXB5f
-zvUap+n3SqCUToLYzA89q/JuslbmRNv7eK9BLtwpCBpFKdV4G3tsY125CgEOypFY
-MEsSqGHVIFzyCxPzfTl7HEhnSzXaKE07ShUemr6eig==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.gih.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.gih.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp01.gih.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://idp01.gih.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" ns1:supportsRequestedAttributes="true" Location="https://idp01.gih.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://idp01.gih.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIA7TPvcyGp+Ykj0r30UUoyyzuTRMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAxLmdpaC5zZTAeFw0xNjA0MjMxMjI4NDZaFw0z
-NjA0MjMxMjI4NDZaMBcxFTATBgNVBAMMDGlkcDAxLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIyJ46wxZPbrT1PX2jZaC1dojfffukTaBuIH
-4EMzHaza/EeEA1L0T7KQV+PcbZGg4oiq7I+6h017fkKvLDdyRQ9w5pwmzluNh0em
-1yX6LRYJJl29qpMjSLHOL7UVMLXK7JQXYwODHGuqNLSjbRZ6I4KYcja9AZUgCmsm
-XOGNXQeppSXtyUeM1xdqxL1zK+lDEdOPlovS0r27ZBTCfT3zucppULaVime7BG6F
-id76LGRHboficczPVrmP6n82LoJXMCBnKTMlX/8xBJqukrHvGQgFGOM/GQ0YvA6N
-a2MHs82P3fb6L34etaUznd89xXH0X37E3rpoK1+BG5+VaJ9iiv0CAwEAAaNfMF0w
-HQYDVR0OBBYEFPiSoxfrNIq57hU2wbm/WTPhioj8MDwGA1UdEQQ1MDOCDGlkcDAx
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMS5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBABXMhwO7+C3O3qrdFTo1nzDlgcuuYp7FxpqnRtJjJXVH
-tdGqOy+32dY/8OIhEcG1EFk+NiL046ytzHP5IwKh96CLZCDNoY0AI848q1qzKiSN
-0gceOerW9V/ydov2Sf3P27MyJtxKRvao0lWEuQFG174Lgrqe2j51lUqd5TFy9LQ8
-PYopAvnbZaUuF+8jfzxeyN/k6ZLs+DwF0aQBudRP2yX1+v/m/tz61LO15PjnyeqW
-CBrxpLKO37g0kNPV5ahlI/rw0qrHS8ht8GVXQ85gHyWWPHQehf57HAO/pGCAJd7K
-+/lsamxWxT83wSfZqcSs1JeIqYJtQSCB+PETITRO0Qc=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAOAdN8mb8jSf9chQAMGdb0mkF+ACMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAxLmdpaC5zZTAeFw0xNjA0MjMxMjI4NDVaFw0z
-NjA0MjMxMjI4NDVaMBcxFTATBgNVBAMMDGlkcDAxLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALamhoGQylwmx6ShGrSq4s2YyzNN8AGIbfhc
-nQTOSKrhrFmmol1QSBDYrpOqE2KzRZVeDupl3PopizoHqtdpzDSOpfgjwTrA7+Dt
-ZiAhP9P23UaosDYQjrlO1I+1OrhzzyHZQx0QzlnPkD6izCHH37/x1ObhK3Nsf/qb
-UmJ7ZotD5hiBxPG4KZ58cOoHnjCmRaJv6Vch814x3qqqV+22ycf2awL9i5oXGgPS
-mXkB1LGCSr1EAiA7O4Bmo7Ht/LVwqQnzgH5/u6Oa765lc7sf2BhKWiy1cL4gWyxV
-k9AsLapt9DBA6pf/mtG5aVTciiqMBWx+LTBtL0PlcTcikEyvnbkCAwEAAaNfMF0w
-HQYDVR0OBBYEFGikshvstXvejKVhZeXaTIWfTvDUMDwGA1UdEQQ1MDOCDGlkcDAx
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMS5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAKNQEsBSuRK87Uf3AjJciR0tErylJ3Da2+yrTyxQtFGq
-PaaMYkjsWrPsKKEMiK76PfZTT2udJE2z/2/vzma45q5sL9xII0d0fcF3QG+ZZbPR
-iSxU05dGQVSVjYlkbSj3H3O3QefQ5VuOMJVtIr0RG9oL1T98vGwauNYQI1rk7nKm
-JTWhhTXbvm1kh1Q0v6QPV6svlAHTVjna9zYBwG9N0BNYX+mZrwX08LSarxkspB30
-T2/NYY22EgRl9FVfT9nK+zF9aY0GQznCM2lz8KK9woS3l5CWjAViJ8Iz5m0SgvUy
-ubfqJD+WHSiZclOpNiBpr6d+1L5zGC6xD/PT9/eWpyk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUX+Nr1ScldkAqNC5OtNCivnk7tXgwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaWRwMDEuZ2loLnNlMB4XDTE2MDQyMzEyMjg0NVoXDTM2
-MDQyMzEyMjg0NVowFzEVMBMGA1UEAwwMaWRwMDEuZ2loLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgwM04J1nxjyVqi4mRQcEp1XWqbgMB7AHNFO5
-8KKZsWlQDTpvMD+emnoLj3pp7txvQBpM2YjxZMcz/Bq3UF5IHgkBwA22OQrTTpHu
-ACicoyM2Gje/IKsrqH8zgAIOPdrPlYpQI597fBDmJ9KJPljySytyXDHOTUrchW/b
-ma3HPPxeSxleuOoB5m6yM+XKIIUzzEGfJOn3oEOrRgcPwFyMTsJxB9VwzBrPxQ+F
-iZZ2UoI5DQCI6lJsoHbuy4Tq+Atb2ntpx4O/JzQjCqx+UgInUL0Da1J/KKeSZJO3
-CtbDtYkSL+w1tWHSaZ//thm4bunLUBJHpMZf2G9aQWM9NlzoIQIDAQABo18wXTAd
-BgNVHQ4EFgQUQQcTAlD72mz43X+baZW/rjeyOBkwPAYDVR0RBDUwM4IMaWRwMDEu
-Z2loLnNlhiNodHRwczovL2lkcDAxLmdpaC5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEAD8Nmj4NyeoRbb4u9IzPGryksCWVil2z4XHcvCT9/MRvO
-kbFFnoB5/CzDBcqJiKIlneI0FzoJilFyELwnUY/GNpOycLg1lz0Tb6pdB6BjIhNp
-u3TzuS1YPDhaiufWkxChtSEjxSY6T505UkrhzQ1DdWxLUkdjmSuVTf0TC8LPssUD
-TnDK5ASEvP8QJkr5wfStck+gFtP1XWGxS4H8jA2Jbkc1MwZDejF6TYmvYJkeXB5f
-zvUap+n3SqCUToLYzA89q/JuslbmRNv7eK9BLtwpCBpFKdV4G3tsY125CgEOypFY
-MEsSqGHVIFzyCxPzfTl7HEhnSzXaKE07ShUemr6eig==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.gih.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.gih.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.gih.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Gymnastik- och idrottshögskolan, GIH</md:Company>
-    <md:SurName>CIO</md:SurName>
-    <md:EmailAddress>mailto:cio@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Gymnastik- och idrottshögskolan, GIH</md:Company>
-    <md:SurName>ITOps</md:SurName>
-    <md:EmailAddress>mailto:itops@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Gymnastik- och idrottshögskolan, GIH</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@gih.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml b/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
deleted file mode 100644
index ffc8927c..00000000
--- a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp02.gih.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp02.gih.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitetsutgivare för Gymnastik- och Idrottshögskolan - Test</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences - Test</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="80" width="80">https://idp02.gih.se/idp/images/gihlogo-mdui.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="80" width="80">https://idp02.gih.se/idp/images/gihlogo-mdui.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://www.gih.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.gih.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gih.se/OM-GIH/Styrdokument/Forvaltning-styrdokument/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gih.se/OM-GIH/Styrdokument/Forvaltning-styrdokument/</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>gih.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3467350,18.0811920</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAKtN6+g8qyINNSUdMUj+ETmlrH8pMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTAeFw0yMDExMTkxMTMyMTBaFw0z
-MDExMTkxMTMyMTBaMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIpGBr68QLi3BUV91eCG3U76xIuPwQdwJc3I
-0UkWaVUDT3018TmVOpHUftzi7ratKM2/YsSCXjKXAwd55Wrg9b13jZOBOajPumKA
-rTQ0j1XrJe3RrNXYV8fW3YGc2r5QkSK9exgZOQMYvrYszB4TRUxGFxtVbQ1bVqDu
-TPZw9+q3hZPwg7SXMyJxMqtviA73M8MhfwFhIS6oYiKa4vf3wVEWxRC8x/YOuzCh
-h1Yvq3BIzNWxJCimrcZeWe/VJlYnK2XsJ+37R94oPA/UZZWM4W7gZks3o0btJR8r
-jihmzfw63uTdiLQuquxti7vf3AfKjmy5CccigFDHN+7RUvtnBvUCAwEAAaNfMF0w
-HQYDVR0OBBYEFEsdX6ciDexkMd7P4b2DrjG9EtM+MDwGA1UdEQQ1MDOCDGlkcDAy
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMi5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAFvSriJHkdCy3EJ7W7Xn1guLHf7wMpACeOIv0TRK+TKi
-msQNzObMvxFRnAFgmIvuxq/7f6DZ0XGm0VqCcKxmuM7dW9GXtzVzzrtAIds5kFI1
-d3WUWkx8q//v9NGPG4i5KpXZHwR30IuDl5AyrUh0mm1haKWHy9ybm5/y/Yw/OoX1
-BGnFSMWW9V5fwiW1S6E5QqCC/LTPBJR3jIl0pQS/Ik2u2+6hVu/O12U9eaE5ZOCB
-pp7OqR+jjunl42YyKK6PYT209nJiW8SmFi+c9qSYmDgPKwlHnA/hYdvy9heTAWYm
-HrR00emNkHk9fs7zq95jHw4hSBCKWKhvoL62Xe4m/EE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAL7+mBPoPWMeB+fhGyTwStsYI5rrMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTAeFw0yMDExMTkxMTMxNDlaFw0z
-MDExMTkxMTMxNDlaMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK5ldipbAra5FH7zwDzdDHtZWqb64qBIIr7L
-Tjrg0tDxP2RGRzYEHuIwf14ce/fkDjTbBidgQTOj3DxnL7Pg/PfkSLsOiL9yPiiC
-y3ql3KJ+eB8JipnrtiGlU61D4o8g1kwGSCn+dSWECtPFh8L42++ht3n2YOUeWFn+
-+V/TKtGG3Ng0MfKb434K2eAJ89lkyd7Rwj7IWiCRXfLnuC+Hz5wz/HSR3L4xsIjh
-RDmEpsQpjBVsPdq6asuiLNTsuN6qQBQNg1oVjumCH1GD3mDas6oaGwICFnzl1wWW
-51A+9i6EHtW2nxtP3pTZZioxUwTzlVwmXVHtPwAixNMvksEqyz0CAwEAAaNfMF0w
-HQYDVR0OBBYEFFU9Z4F8VzfJPZnhDM1V0c8bLGWBMDwGA1UdEQQ1MDOCDGlkcDAy
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMi5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAIF/cLOHqzlGE6b3VTi0PDKME9IU/UXayuTPLwXcZC/W
-iU8aiaX9Ut2l5seEpQW49n9/llHpMz8U3YKOKqkpdinB4b8dCcYbP9m9rOsuvYBM
-ONL0hwFxwl2Ph6WB3U7jbpIt+dwShQzmWLDYMjqMbj5lW0dyq8cVii3w46L4Rgz0
-e7Hcjpzmj8XWf1qt/PotxX9RC6KpztrVAiuECnLo2M32uqYISykOPVW1ojpSG0Yb
-/4q9l+xBYxQ8zhXh+WHYK+m2iTYGc3yBaogxoylffp7dm735Y6+e/u7McDJgSuYU
-hfPauxBtehyqdj0u5Kh1alBnJrNgsNU1ldLSDXt8fxU=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.gih.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp02.gih.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://idp02.gih.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" ns1:supportsRequestedAttributes="true" Location="https://idp02.gih.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://idp02.gih.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUfL5eIxaCCsXXEHWoMbWDcuznRdkwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaWRwMDIuZ2loLnNlMB4XDTIwMTExOTExMzA1OFoXDTMw
-MTExOTExMzA1OFowFzEVMBMGA1UEAwwMaWRwMDIuZ2loLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj+HoBNvAQtsXd+fWDPJaB3oZhN4sLRxKxvr2
-6GnH67VmUtzb8LpByJ6P9aW+xbHP/KYZ2waDDM0OwmhFsgT6WMfIwu3JWa+JL0ey
-5ttKaP6Z7Dv20UD6ntntVLq9hGf/RDQSlbAtqoYAUMURAbiGQ8W0MK1K1cLCzJNn
-51xgvIJ0EFCThoBm29Qz9L85MwLFM/qQm3HLf3VuR7Sm9r1Uehr1XeZbylv1n5Ln
-PKThGVqNF3EUWPxY1rJb07MYKyis+IG8jf+8GyXi9hmdBX96znacB3MAZ+VSSxYX
-/glQYdukMZZr0UoL5AowT9GkEZ82lBOPngXm9SnDA4tGabe8jQIDAQABo18wXTAd
-BgNVHQ4EFgQUmf0NpPd2MGKF4HJmHxXsmDBhVyowPAYDVR0RBDUwM4IMaWRwMDIu
-Z2loLnNlhiNodHRwczovL2lkcDAyLmdpaC5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEARcQYXeG/c5NT1dqlOQEbS5RmuuHo8YeVJqn42J4p7YWK
-ePa/fGNyiIa6r5L96S4zf1pBGXQ4waEofvdDr3WC/bUr2y4zpSoGL04z7Kz4JhIn
-2vv9sUFxjU+N61NxuSu/nSdoHNNi0+vTLqO0dCn2tsCzCYDOM+8fIzanWT7CCMd1
-+7kzroyXpbQfrsg1gHwkdz6FRhpyy8wYlkQBqNiYw8uI2Enz5DtCIgTdzeY5K6T2
-sq6tAAvkig6Q9YAKsZp2pxchkm8VE3Asn9pkKmmylelMXYrX1JZzfPyaQcY2UPD8
-U+hy+KSevibyVy5OBDk6lia+Yp9JAMYJ9eXkcaI1mg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAKtN6+g8qyINNSUdMUj+ETmlrH8pMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTAeFw0yMDExMTkxMTMyMTBaFw0z
-MDExMTkxMTMyMTBaMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIpGBr68QLi3BUV91eCG3U76xIuPwQdwJc3I
-0UkWaVUDT3018TmVOpHUftzi7ratKM2/YsSCXjKXAwd55Wrg9b13jZOBOajPumKA
-rTQ0j1XrJe3RrNXYV8fW3YGc2r5QkSK9exgZOQMYvrYszB4TRUxGFxtVbQ1bVqDu
-TPZw9+q3hZPwg7SXMyJxMqtviA73M8MhfwFhIS6oYiKa4vf3wVEWxRC8x/YOuzCh
-h1Yvq3BIzNWxJCimrcZeWe/VJlYnK2XsJ+37R94oPA/UZZWM4W7gZks3o0btJR8r
-jihmzfw63uTdiLQuquxti7vf3AfKjmy5CccigFDHN+7RUvtnBvUCAwEAAaNfMF0w
-HQYDVR0OBBYEFEsdX6ciDexkMd7P4b2DrjG9EtM+MDwGA1UdEQQ1MDOCDGlkcDAy
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMi5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAFvSriJHkdCy3EJ7W7Xn1guLHf7wMpACeOIv0TRK+TKi
-msQNzObMvxFRnAFgmIvuxq/7f6DZ0XGm0VqCcKxmuM7dW9GXtzVzzrtAIds5kFI1
-d3WUWkx8q//v9NGPG4i5KpXZHwR30IuDl5AyrUh0mm1haKWHy9ybm5/y/Yw/OoX1
-BGnFSMWW9V5fwiW1S6E5QqCC/LTPBJR3jIl0pQS/Ik2u2+6hVu/O12U9eaE5ZOCB
-pp7OqR+jjunl42YyKK6PYT209nJiW8SmFi+c9qSYmDgPKwlHnA/hYdvy9heTAWYm
-HrR00emNkHk9fs7zq95jHw4hSBCKWKhvoL62Xe4m/EE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAL7+mBPoPWMeB+fhGyTwStsYI5rrMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTAeFw0yMDExMTkxMTMxNDlaFw0z
-MDExMTkxMTMxNDlaMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK5ldipbAra5FH7zwDzdDHtZWqb64qBIIr7L
-Tjrg0tDxP2RGRzYEHuIwf14ce/fkDjTbBidgQTOj3DxnL7Pg/PfkSLsOiL9yPiiC
-y3ql3KJ+eB8JipnrtiGlU61D4o8g1kwGSCn+dSWECtPFh8L42++ht3n2YOUeWFn+
-+V/TKtGG3Ng0MfKb434K2eAJ89lkyd7Rwj7IWiCRXfLnuC+Hz5wz/HSR3L4xsIjh
-RDmEpsQpjBVsPdq6asuiLNTsuN6qQBQNg1oVjumCH1GD3mDas6oaGwICFnzl1wWW
-51A+9i6EHtW2nxtP3pTZZioxUwTzlVwmXVHtPwAixNMvksEqyz0CAwEAAaNfMF0w
-HQYDVR0OBBYEFFU9Z4F8VzfJPZnhDM1V0c8bLGWBMDwGA1UdEQQ1MDOCDGlkcDAy
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMi5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAIF/cLOHqzlGE6b3VTi0PDKME9IU/UXayuTPLwXcZC/W
-iU8aiaX9Ut2l5seEpQW49n9/llHpMz8U3YKOKqkpdinB4b8dCcYbP9m9rOsuvYBM
-ONL0hwFxwl2Ph6WB3U7jbpIt+dwShQzmWLDYMjqMbj5lW0dyq8cVii3w46L4Rgz0
-e7Hcjpzmj8XWf1qt/PotxX9RC6KpztrVAiuECnLo2M32uqYISykOPVW1ojpSG0Yb
-/4q9l+xBYxQ8zhXh+WHYK+m2iTYGc3yBaogxoylffp7dm735Y6+e/u7McDJgSuYU
-hfPauxBtehyqdj0u5Kh1alBnJrNgsNU1ldLSDXt8fxU=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.gih.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.gih.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Gymnastik- och idrottshögskolan, GIH</md:Company>
-    <md:SurName>CIO</md:SurName>
-    <md:EmailAddress>mailto:cio@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Gymnastik- och idrottshögskolan, GIH</md:Company>
-    <md:SurName>ITOps</md:SurName>
-    <md:EmailAddress>mailto:itops@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Gymnastik- och idrottshögskolan, GIH</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@gih.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.bth.se-idp-shibboleth.xml b/swamid-2.0/idp2.bth.se-idp-shibboleth.xml
deleted file mode 100644
index 2173671b..00000000
--- a/swamid-2.0/idp2.bth.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp2.bth.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-28T18:33:43Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp2.bth.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - OLD</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - OLD</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola - OLD</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology - OLD</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        <mdui:Logo xml:lang="sv" height="139" width="114">https://idp2.bth.se/idp/images/logo_bth.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="139" width="114">https://idp2.bth.se/idp/images/logo_bth.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.bth.se/eng/about-bth/personal-data/swamid-service-definition/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.bth.se/om-oss/personuppgifter/swamid-tjanstedefinition/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>bth.se</mdui:DomainHint>
-        <mdui:IPHint>193.11.184.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.128.0/19</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:2a::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:56.181775,15.590592</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUAjSTOLSd0Pch+pYciElnGplug8kwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwHhcNMTYwMjE4MTE1OTI0WhcNMzYw
-MjE4MTE1OTI0WjAWMRQwEgYDVQQDDAtpZHAyLmJ0aC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMbKNJA6MEAtWxPCzMAc84dxsVBo0+Tmh0wbMJUI
-ZIOAvU4ceRUKc/ZpOZ0KbnjX7W48J+dVyTD9ix4vyr4kyHXL7DK6XH3rtZafpUxo
-PX/MBA3JBd2uArrYSChmJS8bUMwZFZmN7tCEAMRsSozUxyYBZ0HCxJdhSTS2Rzrg
-Zcd5Gd9wzmxOmXR2yx8xwfvJUSXotH1x9zLIu80XD+dzn7Ym9XyMnVxVmZJ5G9AG
-piwccsUXo/6g3/DzRL0i2nLQWZPxZ4EUkRLAU+bBkhJ2HpshC4pJzzmZmLG+H1VQ
-4Yl6FcfEcwkzl0Vj356PTKjA9iTTpHIPFj7au9knGR+HMh0CAwEAAaNdMFswHQYD
-VR0OBBYEFKvL63FlLvmyTOAcHPnFB/oufu6HMDoGA1UdEQQzMDGCC2lkcDIuYnRo
-LnNlhiJodHRwczovL2lkcDIuYnRoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBs+q+yxQFE2CmufA2uFvBXgQV72zVwCwNeWgFsIt40JIVyGuEi
-LhJGuygAKgDq0weMkS+v+Uq+6VFfSdDQtkMqLmQbzQPPTX5KDXZBl+0qHoe1N2pb
-0EM+J8z6mUYInN33EqO8p7rxxLtbWHrf52uLeVJ0GRCjM0VYJQVdkdZkHaJJ6zjX
-TfH2lJmH0df+CSgiQATV5DOdTQlFe7lYvzUIeACjf6vEHEeDcV36U+U9Y1/sd0y6
-1HLIAeSH9AfmfubhTXLHD8xaQG2J1BJaOKZA+HeYL7MgJV9i9x9nyiv95tkxjDgl
-GbWSba9T9esRqtkbCarn3pNZbtkvA/eL7AkD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVALFoKFMrJuieCS8dfq1gtvn345/lMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC2lkcDIuYnRoLnNlMB4XDTE2MDIxODExNTkyMloXDTM2
-MDIxODExNTkyMlowFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDTprjClVpgF6iDPrC6sbZMhQeGI95pa2fCIlcV
-uIsGglNn5rfUETtjcn1Njf3XXqLgKi0f+WykowBXuarw2cguvUjwiE3jQARyxg+M
-3uuqUWIAYrE8bInbR2uVs9qhylqKv/tK+ILXFXrNiylqTN1xyV1LdEcGmiyr8uWz
-9srrt/zV0LqHt5IpuDlS3vcgKFgmBipP1I7jiTTH98JnbgSxwSTWv40FaEAWPbgz
-MlaBrzbKsVU/h+IRpVaQCnWI2MyBb9rr2B/q+3OWv3CpBk/uL++xSZC9teXHgFWF
-tDqVakTXC7P6ySPx885mzOqzWIzXgRqm4GTcT7FubvN0ztnjAgMBAAGjXTBbMB0G
-A1UdDgQWBBRvZOA7bCpDBGhA7gMGZBJyapFMKzA6BgNVHREEMzAxggtpZHAyLmJ0
-aC5zZYYiaHR0cHM6Ly9pZHAyLmJ0aC5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEAtmCmwWJSyH4WGqoPusV0m5Oe8JiTOBC66ccZo7fOYPIQh0OU
-U9SKlSvuoC3i6oOAXEDd/8yr1YScgaCFxbDb+h1GFv5Ng1QXudCowSYXabQA3pEw
-mmDc3+0FkRtRkR2tks2K3563mjFEWoMyd8y+3Aycu53FI/NNCNcawrB8VmE+GLXN
-6Jq1pwISVamDiJanykiDubEjKEm8AuwjKz/3Vbu1TtDKNPcbDdpZGHNKgNMuSeDC
-C6IIfksrX1+HwFx5AyCAEg3wp9xeP3+BEQciX25HSwNEOCy382O6pWQC+mFvTXVA
-NtrCdbz6qKoDHbanW9dGf/6dGg95GwTJAA1ZSA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAOSVWhOajvTHRYTBeX4CXM/zZ1l+MA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC2lkcDIuYnRoLnNlMB4XDTE2MDIxODExNTkyNFoXDTM2
-MDIxODExNTkyNFowFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDmHrGdGbyhgX+HlfSBbQ5T8+hgF3YpdqwCfzrj
-zil+YdZ+GO6YT84zSbmH75SX9wbcOw2TTfaPUPF40CSF5VBp9zqvnBdFINFN2cEd
-sI96UbB/BQGUeTV8dze298ItCWtHV/y+BYWRyDgnFRijt8WIUJUHA9FvxcrU5zns
-pXVStBlqIZt5iaGrvt5s5imTi50gq1SmtdOBE64vkYkQHdzIcWcd+00dpXgqiciU
-ej/sA+NnE9IreGXUpKlLHhLmJuQXxqHBfXAX90CYiOutpotUPJULaxYt5UlAVQc0
-46Xeb7kQoNkKyOqKwgm4I6YevwkNmS70/As/TEH2LIjUpG2JAgMBAAGjXTBbMB0G
-A1UdDgQWBBRIaBMwAzytSCAmOuvKBR2NTRu3gDA6BgNVHREEMzAxggtpZHAyLmJ0
-aC5zZYYiaHR0cHM6Ly9pZHAyLmJ0aC5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEA0QJ25UYZc0vbqkEUbsAG3tqlC6woUq0sCfTbf522PtlVPpbS
-UXuOoNJvhFFa0qEny6QqJhGmFT51ZUC5FaRevzshVMkTxMDTOwRh7YF94KUTwtWn
-tpjGabharxvOUuaD1FPQyXtIq49YH1KuaqpZFN+f8mjLVVVYqjvDgB+lpb2FvzoQ
-//eLyFyrZR2ZTqHMMDSVC6Y3fm8PP7kGFgSMYNaaKTGaNVao1dGE09Lu3O2yjfgT
-B9VY8Qllh3EWiRkI3VA8tR5RuMjFd6A8AOtoxbW2BJQM4rn9Ma2Su2nOD23s7w/H
-KWto/xyUQbv82gswLTMa9y869J9X9IcMEYjVxg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.bth.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.bth.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.bth.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUAjSTOLSd0Pch+pYciElnGplug8kwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwHhcNMTYwMjE4MTE1OTI0WhcNMzYw
-MjE4MTE1OTI0WjAWMRQwEgYDVQQDDAtpZHAyLmJ0aC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMbKNJA6MEAtWxPCzMAc84dxsVBo0+Tmh0wbMJUI
-ZIOAvU4ceRUKc/ZpOZ0KbnjX7W48J+dVyTD9ix4vyr4kyHXL7DK6XH3rtZafpUxo
-PX/MBA3JBd2uArrYSChmJS8bUMwZFZmN7tCEAMRsSozUxyYBZ0HCxJdhSTS2Rzrg
-Zcd5Gd9wzmxOmXR2yx8xwfvJUSXotH1x9zLIu80XD+dzn7Ym9XyMnVxVmZJ5G9AG
-piwccsUXo/6g3/DzRL0i2nLQWZPxZ4EUkRLAU+bBkhJ2HpshC4pJzzmZmLG+H1VQ
-4Yl6FcfEcwkzl0Vj356PTKjA9iTTpHIPFj7au9knGR+HMh0CAwEAAaNdMFswHQYD
-VR0OBBYEFKvL63FlLvmyTOAcHPnFB/oufu6HMDoGA1UdEQQzMDGCC2lkcDIuYnRo
-LnNlhiJodHRwczovL2lkcDIuYnRoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBs+q+yxQFE2CmufA2uFvBXgQV72zVwCwNeWgFsIt40JIVyGuEi
-LhJGuygAKgDq0weMkS+v+Uq+6VFfSdDQtkMqLmQbzQPPTX5KDXZBl+0qHoe1N2pb
-0EM+J8z6mUYInN33EqO8p7rxxLtbWHrf52uLeVJ0GRCjM0VYJQVdkdZkHaJJ6zjX
-TfH2lJmH0df+CSgiQATV5DOdTQlFe7lYvzUIeACjf6vEHEeDcV36U+U9Y1/sd0y6
-1HLIAeSH9AfmfubhTXLHD8xaQG2J1BJaOKZA+HeYL7MgJV9i9x9nyiv95tkxjDgl
-GbWSba9T9esRqtkbCarn3pNZbtkvA/eL7AkD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVALFoKFMrJuieCS8dfq1gtvn345/lMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC2lkcDIuYnRoLnNlMB4XDTE2MDIxODExNTkyMloXDTM2
-MDIxODExNTkyMlowFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDTprjClVpgF6iDPrC6sbZMhQeGI95pa2fCIlcV
-uIsGglNn5rfUETtjcn1Njf3XXqLgKi0f+WykowBXuarw2cguvUjwiE3jQARyxg+M
-3uuqUWIAYrE8bInbR2uVs9qhylqKv/tK+ILXFXrNiylqTN1xyV1LdEcGmiyr8uWz
-9srrt/zV0LqHt5IpuDlS3vcgKFgmBipP1I7jiTTH98JnbgSxwSTWv40FaEAWPbgz
-MlaBrzbKsVU/h+IRpVaQCnWI2MyBb9rr2B/q+3OWv3CpBk/uL++xSZC9teXHgFWF
-tDqVakTXC7P6ySPx885mzOqzWIzXgRqm4GTcT7FubvN0ztnjAgMBAAGjXTBbMB0G
-A1UdDgQWBBRvZOA7bCpDBGhA7gMGZBJyapFMKzA6BgNVHREEMzAxggtpZHAyLmJ0
-aC5zZYYiaHR0cHM6Ly9pZHAyLmJ0aC5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEAtmCmwWJSyH4WGqoPusV0m5Oe8JiTOBC66ccZo7fOYPIQh0OU
-U9SKlSvuoC3i6oOAXEDd/8yr1YScgaCFxbDb+h1GFv5Ng1QXudCowSYXabQA3pEw
-mmDc3+0FkRtRkR2tks2K3563mjFEWoMyd8y+3Aycu53FI/NNCNcawrB8VmE+GLXN
-6Jq1pwISVamDiJanykiDubEjKEm8AuwjKz/3Vbu1TtDKNPcbDdpZGHNKgNMuSeDC
-C6IIfksrX1+HwFx5AyCAEg3wp9xeP3+BEQciX25HSwNEOCy382O6pWQC+mFvTXVA
-NtrCdbz6qKoDHbanW9dGf/6dGg95GwTJAA1ZSA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAOSVWhOajvTHRYTBeX4CXM/zZ1l+MA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC2lkcDIuYnRoLnNlMB4XDTE2MDIxODExNTkyNFoXDTM2
-MDIxODExNTkyNFowFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDmHrGdGbyhgX+HlfSBbQ5T8+hgF3YpdqwCfzrj
-zil+YdZ+GO6YT84zSbmH75SX9wbcOw2TTfaPUPF40CSF5VBp9zqvnBdFINFN2cEd
-sI96UbB/BQGUeTV8dze298ItCWtHV/y+BYWRyDgnFRijt8WIUJUHA9FvxcrU5zns
-pXVStBlqIZt5iaGrvt5s5imTi50gq1SmtdOBE64vkYkQHdzIcWcd+00dpXgqiciU
-ej/sA+NnE9IreGXUpKlLHhLmJuQXxqHBfXAX90CYiOutpotUPJULaxYt5UlAVQc0
-46Xeb7kQoNkKyOqKwgm4I6YevwkNmS70/As/TEH2LIjUpG2JAgMBAAGjXTBbMB0G
-A1UdDgQWBBRIaBMwAzytSCAmOuvKBR2NTRu3gDA6BgNVHREEMzAxggtpZHAyLmJ0
-aC5zZYYiaHR0cHM6Ly9pZHAyLmJ0aC5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEA0QJ25UYZc0vbqkEUbsAG3tqlC6woUq0sCfTbf522PtlVPpbS
-UXuOoNJvhFFa0qEny6QqJhGmFT51ZUC5FaRevzshVMkTxMDTOwRh7YF94KUTwtWn
-tpjGabharxvOUuaD1FPQyXtIq49YH1KuaqpZFN+f8mjLVVVYqjvDgB+lpb2FvzoQ
-//eLyFyrZR2ZTqHMMDSVC6Y3fm8PP7kGFgSMYNaaKTGaNVao1dGE09Lu3O2yjfgT
-B9VY8Qllh3EWiRkI3VA8tR5RuMjFd6A8AOtoxbW2BJQM4rn9Ma2Su2nOD23s7w/H
-KWto/xyUQbv82gswLTMa9y869J9X9IcMEYjVxg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">BTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.bth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@bth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml
deleted file mode 100644
index 1a0a0fdc..00000000
--- a/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp2.it.gu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T14:46:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp2.it.gu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Gothenburg idp2.it.gu.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IdP for University of Gothenburg idp2.it.gu.se</mdui:Description>
-        <mdui:Description xml:lang="sv">Test Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Göteborgs Universitet idp2.it.gu.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.gu.se/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.gu.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="129" width="127">https://idp2.it.gu.se/idp/images/1498144_ny_logo_en_normal.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="128" width="126">https://idp2.it.gu.se/idp/images/1510601_logo_sv_126.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>gu.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
-        <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>gu.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
-        <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAINrwBJif7MyDdcmC3aMRQx/C6NIMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwHhcNMTYwMzE0MTA0NzMwWhcN
-MzYwMzE0MTA0NzMwWjAYMRYwFAYDVQQDDA1pZHAyLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklmy11Wi1gbd2qqX51/6ye3KfqM3AAac
-dcrQIrLzdaqZL7vrrQpq2qgH/epM6Ed+WzixDZqnkUoKoumyAmyC46yWXfrz1+Hj
-1yjvXsnwbRefs7lT1JqRJczZiCli5hQ4WYZap+3QPHQrvJGEq51i13ULhNgK5xe+
-ito4GpVUlUwOjyoI08LXIZs7l59eTGK/sHsHh0WC/46u3AduQfnpZx1mlq6+3huk
-2DFgKrXNzFQRfhsyB/btD0v7DQ1wyn/b94fECeIiJtNWfzifKtsvXOMGuNUMhk04
-8EFeHfL5vMX7K3maJTfS5B9wcvi/mf7E0xhvCD9n5R/C5ikNzqzfqQIDAQABo2Ew
-XzAdBgNVHQ4EFgQUbhaTcpz0n3M1pcZ3wQqBG5L4ROYwPgYDVR0RBDcwNYINaWRw
-Mi5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAyLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAAtb8IM9rZSxCDqFqQqwiZH0Ij4pJPwTZbSUXW
-+T2O9LzLpCtJSVWtLlv15R0OILRieh9ckIFbnW40Y4JVbjETaX1CbVFUSIgq6WZG
-aKzoKR2m1IgP9Gs/2EUrZFFr7FXsAzDTbGZhPbaF6GhmK8+vIacbtmdAKO85BlOR
-n6JxeyT4l0tcm8loeajCPpER+1DyWeGtgFdXdIUsP5TfJdKwG1hZL0dUNc7YI/sR
-fm8r33IUquovFZwOmEmfgMBP7JZGwgf+UKA8YLCTuqzXrKhOOS+w0gS/I0xOeKvi
-slmWOOgRICBRYA2lHBZc0E9cAHv8ltiP/1ummZfZL3snn+eX
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAJXNXfPkY/tJdDVMCaw+c61mVwv0MA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwHhcNMTYwMzE0MTA0NzI5WhcN
-MzYwMzE0MTA0NzI5WjAYMRYwFAYDVQQDDA1pZHAyLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlpXT1DgnFLxxOsRy8LSuNHkmsHm0waBS
-BwtCXiqTEYDRcnB31Hye4DT7wjwpqsg8e81QFqszdDO3b/se1brgrsAX4gX+UoHv
-mNd9CkG9vfNF3vNpL3aUTV5CID7+r8iXXqvgxcCTH39W2b/1E/7xhV2cd1PAP9VI
-pRNuHVibWJEixl4MpHsrVJJk1TrmvQtjT+frCMKTM14i2wGLJMLjzudebsWZFX64
-A02XhkzloQIrE3+/bUkZBsTxpJzJBL9Gc+HLVraB4RVzrnmh+7U0BEPbkcgHEvAS
-OkidW/RtyBCTcr3uoxiXEHvW9f5/Wca0VMAKs8csNxQIUqUE+oc9ewIDAQABo2Ew
-XzAdBgNVHQ4EFgQUP7zSE8MllrSEOvovWKnieEDjsjYwPgYDVR0RBDcwNYINaWRw
-Mi5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAyLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAKn5K5CdnG2bZgzeQu+g4Ay8AcnjpRHRw6w89v
-edu6nBWvqQyAqZcLl9STC6UJBeWwfLMGj8eu9wOOCtCBETGE7hXcaTp+N2tGVHnG
-l8+lwZ6s5R8B95quke4OTzlxazWhwI3xicZL1Kwrj64GfjLvDCrQpEZJYd50hzyb
-rGGOOQN4j/oViF5Yl0xMLx2u+DLn6Zd/6/I7Eon6NoIdhNYVyd6UGlt0nYIpeBVI
-tkZr09dLUyeu1kGsnGhZZnRL7G+YLxJlO4SFHV/VjoeRZXwZ1MQJ1XIbqa7xgDpM
-fHA2iBVTGFOHR/EduBYUoKmhYK2LkJVMyHI3DzTNEle07mr6
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUKT1nsJWjTvn/gUt5ZMVyXM6ax78wDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwMi5pdC5ndS5zZTAeFw0xNjAzMTQxMDQ3MjlaFw0z
-NjAzMTQxMDQ3MjlaMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzq06/MQ7xCiwlHbHaliAkLuQnTkkD0sQ6
-1jKuwGzjNn/shY7Hf2EVKzy/vYOH9QLbMMzeHMwCAeq/W7QcZwnVjgSTeFaK7DeW
-xJkUELJvp8/T2RJMdj3XnSO76x01g1eLXKtgHfKC/WWeAP+WkrT07YBj0fRen+99
-jXHgj5BqL5IEtBGYFWA6GjNlWXdD3CDsUnDnj7S7fLo6BXs9Ob4vSFjRF9KWUaHf
-uspv1Sc4qIcm5qvhuYejuiP1oP1jLINE27ZRQgNGB9OFbe2dQrsdIiDVVNcdKq28
-Bltq+vu8+7c19RyY7oasDfxp01nIVpKAjLQxRHhkERkMNl/19y0VAgMBAAGjYTBf
-MB0GA1UdDgQWBBQsqSwdpJcQrBYLYtdKR9PAdv2mNjA+BgNVHREENzA1gg1pZHAy
-Lml0Lmd1LnNlhiRodHRwczovL2lkcDIuaXQuZ3Uuc2UvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAHF5lvS7YzKY4qPZI1sVSkQuiIK9U2jht5wYUQEC
-HnWFGAmS3idl3afHdGBVv+jD44jndnkojJ5pl63c9phYiKRiFqaRvoyC+hHkd0qD
-pkbY+yOc1ePrjXuIyNBKh9UJTiWWF2x/J7MJ2fiSsL+Q44Ot/wd3VzsOTWMgY+Gz
-USCXAEeFWLAs1crBEAaW2mmWQOYSyp95LNXV1JCsyd1R7I1KAQ6S21XqSyPEBtZf
-ocfXlxiISI9q8HuuNs3FvJhJZWITD4pgq6hDioWmYyDa5Xjr7d9e2oOJD9C25Te2
-1l6gYUDIMOfT4TSe+YHPj0W7ZChHQwggdChvqjV0WtykKL4=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.it.gu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.it.gu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.it.gu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAINrwBJif7MyDdcmC3aMRQx/C6NIMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwHhcNMTYwMzE0MTA0NzMwWhcN
-MzYwMzE0MTA0NzMwWjAYMRYwFAYDVQQDDA1pZHAyLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklmy11Wi1gbd2qqX51/6ye3KfqM3AAac
-dcrQIrLzdaqZL7vrrQpq2qgH/epM6Ed+WzixDZqnkUoKoumyAmyC46yWXfrz1+Hj
-1yjvXsnwbRefs7lT1JqRJczZiCli5hQ4WYZap+3QPHQrvJGEq51i13ULhNgK5xe+
-ito4GpVUlUwOjyoI08LXIZs7l59eTGK/sHsHh0WC/46u3AduQfnpZx1mlq6+3huk
-2DFgKrXNzFQRfhsyB/btD0v7DQ1wyn/b94fECeIiJtNWfzifKtsvXOMGuNUMhk04
-8EFeHfL5vMX7K3maJTfS5B9wcvi/mf7E0xhvCD9n5R/C5ikNzqzfqQIDAQABo2Ew
-XzAdBgNVHQ4EFgQUbhaTcpz0n3M1pcZ3wQqBG5L4ROYwPgYDVR0RBDcwNYINaWRw
-Mi5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAyLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAAtb8IM9rZSxCDqFqQqwiZH0Ij4pJPwTZbSUXW
-+T2O9LzLpCtJSVWtLlv15R0OILRieh9ckIFbnW40Y4JVbjETaX1CbVFUSIgq6WZG
-aKzoKR2m1IgP9Gs/2EUrZFFr7FXsAzDTbGZhPbaF6GhmK8+vIacbtmdAKO85BlOR
-n6JxeyT4l0tcm8loeajCPpER+1DyWeGtgFdXdIUsP5TfJdKwG1hZL0dUNc7YI/sR
-fm8r33IUquovFZwOmEmfgMBP7JZGwgf+UKA8YLCTuqzXrKhOOS+w0gS/I0xOeKvi
-slmWOOgRICBRYA2lHBZc0E9cAHv8ltiP/1ummZfZL3snn+eX
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAJXNXfPkY/tJdDVMCaw+c61mVwv0MA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwHhcNMTYwMzE0MTA0NzI5WhcN
-MzYwMzE0MTA0NzI5WjAYMRYwFAYDVQQDDA1pZHAyLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlpXT1DgnFLxxOsRy8LSuNHkmsHm0waBS
-BwtCXiqTEYDRcnB31Hye4DT7wjwpqsg8e81QFqszdDO3b/se1brgrsAX4gX+UoHv
-mNd9CkG9vfNF3vNpL3aUTV5CID7+r8iXXqvgxcCTH39W2b/1E/7xhV2cd1PAP9VI
-pRNuHVibWJEixl4MpHsrVJJk1TrmvQtjT+frCMKTM14i2wGLJMLjzudebsWZFX64
-A02XhkzloQIrE3+/bUkZBsTxpJzJBL9Gc+HLVraB4RVzrnmh+7U0BEPbkcgHEvAS
-OkidW/RtyBCTcr3uoxiXEHvW9f5/Wca0VMAKs8csNxQIUqUE+oc9ewIDAQABo2Ew
-XzAdBgNVHQ4EFgQUP7zSE8MllrSEOvovWKnieEDjsjYwPgYDVR0RBDcwNYINaWRw
-Mi5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAyLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAKn5K5CdnG2bZgzeQu+g4Ay8AcnjpRHRw6w89v
-edu6nBWvqQyAqZcLl9STC6UJBeWwfLMGj8eu9wOOCtCBETGE7hXcaTp+N2tGVHnG
-l8+lwZ6s5R8B95quke4OTzlxazWhwI3xicZL1Kwrj64GfjLvDCrQpEZJYd50hzyb
-rGGOOQN4j/oViF5Yl0xMLx2u+DLn6Zd/6/I7Eon6NoIdhNYVyd6UGlt0nYIpeBVI
-tkZr09dLUyeu1kGsnGhZZnRL7G+YLxJlO4SFHV/VjoeRZXwZ1MQJ1XIbqa7xgDpM
-fHA2iBVTGFOHR/EduBYUoKmhYK2LkJVMyHI3DzTNEle07mr6
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUKT1nsJWjTvn/gUt5ZMVyXM6ax78wDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwMi5pdC5ndS5zZTAeFw0xNjAzMTQxMDQ3MjlaFw0z
-NjAzMTQxMDQ3MjlaMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzq06/MQ7xCiwlHbHaliAkLuQnTkkD0sQ6
-1jKuwGzjNn/shY7Hf2EVKzy/vYOH9QLbMMzeHMwCAeq/W7QcZwnVjgSTeFaK7DeW
-xJkUELJvp8/T2RJMdj3XnSO76x01g1eLXKtgHfKC/WWeAP+WkrT07YBj0fRen+99
-jXHgj5BqL5IEtBGYFWA6GjNlWXdD3CDsUnDnj7S7fLo6BXs9Ob4vSFjRF9KWUaHf
-uspv1Sc4qIcm5qvhuYejuiP1oP1jLINE27ZRQgNGB9OFbe2dQrsdIiDVVNcdKq28
-Bltq+vu8+7c19RyY7oasDfxp01nIVpKAjLQxRHhkERkMNl/19y0VAgMBAAGjYTBf
-MB0GA1UdDgQWBBQsqSwdpJcQrBYLYtdKR9PAdv2mNjA+BgNVHREENzA1gg1pZHAy
-Lml0Lmd1LnNlhiRodHRwczovL2lkcDIuaXQuZ3Uuc2UvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAHF5lvS7YzKY4qPZI1sVSkQuiIK9U2jht5wYUQEC
-HnWFGAmS3idl3afHdGBVv+jD44jndnkojJ5pl63c9phYiKRiFqaRvoyC+hHkd0qD
-pkbY+yOc1ePrjXuIyNBKh9UJTiWWF2x/J7MJ2fiSsL+Q44Ot/wd3VzsOTWMgY+Gz
-USCXAEeFWLAs1crBEAaW2mmWQOYSyp95LNXV1JCsyd1R7I1KAQ6S21XqSyPEBtZf
-ocfXlxiISI9q8HuuNs3FvJhJZWITD4pgq6hDioWmYyDa5Xjr7d9e2oOJD9C25Te2
-1l6gYUDIMOfT4TSe+YHPj0W7ZChHQwggdChvqjV0WtykKL4=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Lena Ström</md:SurName>
-    <md:EmailAddress>mailto:lena.strom@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Tobias Galéus</md:SurName>
-    <md:EmailAddress>mailto:tobias.galeus@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>GU-Support</md:SurName>
-    <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46317862020</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IRT GU</md:GivenName>
-    <md:EmailAddress>mailto:irt@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
deleted file mode 100644
index 3b8255c0..00000000
--- a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp2.kkh.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-01-05T12:16:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp2.kkh.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kkh.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungl. Konsthögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Royal Institute of Art</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungl. Konsthögskolan (KKH)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Royal Institute of Art (KKH)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
-        <mdui:InformationURL xml:lang="sv">https://kkh.se/sv/kontakt/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.kkh.se/en/contact/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://kkh.se/styrdokument/Riktlinjer_for_behandling_av_personuppgifter_vid_Kungl_Konsthogskolan.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="225" width="225">https://idp2.kkh.se/idp/images/Kungl_Konsthogskolan_Vapen_225.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="225" width="225">https://idp2.kkh.se/idp/images/Kungl_Konsthogskolan_Vapen_225.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://kkh.se/styrdokument/Riktlinjer_for_behandling_av_personuppgifter_vid_Kungl_Konsthogskolan.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kkh.se</mdui:DomainHint>
-        <mdui:IPHint>130.242.7.0/24</mdui:IPHint>
-        <mdui:IPHint>130.242.8.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.324458,18.082998</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUKSlBy0/PK+dLgfzr4YQyQUTWSmswDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmtraC5zZTAeFw0xNzEyMjgyMjIzMjRaFw0zNzEy
-MjgyMjIzMjRaMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCkcQ4heWoeLnCVuWcbyIyJuiGKTQUn3G4AgFPzPrzu
-kmHOB1TYZaoHSf29nwaxIlwWBP8I1Ht/ZV0YEEcXdVzi6aqTaAyaG/EI+I4W9Mt6
-fahyfqbrMUobtsE8gGjKNPuENlwJaoE20QGKjKVgEAZD6rf6x67tAMOksD+mWlEO
-C92hqo524ALCvyq6j/+ZBpy9N0mGco/UU09XJYN6ox85xi28yyGnUVPIU/dSqatA
-D3UAVXogrXZL0tqcp56g5WZ0ea2Vt5GcKzAg4MyFjMrjWYtZl5aqE6FO2KhSiH+0
-g4PO59qaF29e1ELnkTLsnlqRkVcDpGmz7mG3DTyqBPLLAgMBAAGjWzBZMB0GA1Ud
-DgQWBBSXhrPEfp0EsoC3wrOp+PNey4m5PTA4BgNVHREEMTAvggppZHAua2toLnNl
-hiFodHRwczovL2lkcC5ra2guc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBADRwTzIescaIEtFHM1deQl5oTR9J49dZHBVwpnlEMZaPqj3lEG3UYWK3
-ydkSkVR/b3XJ6V9l22spA7GMeB7RylB5de7Wk8CTX8RIkO/hrM5GKUY9EknYk81Y
-wasuEUslFH0CioXR8wNtBZlu8cX0TioTCxuv8Z6mF1n/LdQISWylmxFGb9RBjrbF
-1DIr+i2Al4MHbhokAYwVgVhP3PiTDms25MT5uARGYoz/11GsiWYzxDgCqcFbw+oy
-er0t5sfPQZ9gp2fu7eG27+cm3BryxcLUUoGN+9qN43pSnlXex3zIwSIr9SuBmOq7
-txB7BxAsEsxkzuE7M1p2N62744NyMWs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVANz+UgEHXLfMQL+quk51wR7pDqSvMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTcxMjI4MjIyMzIzWhcNMzcx
-MjI4MjIyMzIzWjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAkhuu6h49llcV1GOSUwjfk+P7cROS5Qxa4XVqS8Uv
-7vh8+bZMJu+MpozCE/PLR8T7ERB+isf8zU4GNrY0d5Lo0pkfSfJ8KxeWjegQ4bLy
-SoKbGh2mvDy4DSYQU3GscVrl+eTOExSao4kyACc4J4Wog0lWEwN1K0Gxhiw9mRLb
-43b16dSonrtrypoCEgYeSjxdnOGcCicivDCXm25/wYvMrMuB73pqhfkRgd0WFg2N
-QbsZ5aWiqGVsRwYFydy/N3gs7+IDQ+iZ0aM3TWeL4wb551iMqERtzYO49oeMbmcW
-FHGfoo5vmi7VgwK9eM9k0auORaYY2ePbSdTqGGYeZ1kqqwIDAQABo1swWTAdBgNV
-HQ4EFgQUC+Cfy2cOPFRRRxvKxnI3i/NBznQwOAYDVR0RBDEwL4IKaWRwLmtraC5z
-ZYYhaHR0cHM6Ly9pZHAua2toLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA9RzNZvlQuc8RYNExHbolJeTVQ6rk0ap3yqM16PKAcuR7WxUHoINQU
-9xDZjTGvoXkt/57Lela5AwM2FV48BiS4CvG/1w1GEHRnWCRt4v+y4dnbKa11+GzA
-AhwjTQySGNjWMfgkBrwEg304dhetj9dVsS8gKs69YdBFPJJn5psClgm34ozsmqtg
-v5Dvj4Iva1cXj4GM43N3QERr615wdrkkabCNLTvb9x9PdqvZ0pF+v8IY5mOOzoMk
-R+j6OtHbXjzDF0eehnoMWOiCbKguULWN5TfILfce+mwblQD2eVP70gyD5gL9Zpt4
-NlZX5y7b3GoY/Eio8u4N/p6Id9sfmbUb
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAMfqkTpxpjF9WdBM63DL5ybHrThKMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTcxMjI4MjIyMzI0WhcNMzcx
-MjI4MjIyMzI0WjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAoqXgmOoiWpIsO5cK4dgmPH41dhh0Jau2WSNUsT4R
-lMnEcW26NZL6/DAXPOODKFKIFRp6Oahg+74IU5FqhgsZe4RDcs+bFbbKLz6Y1+kd
-ITl6gBOR0sjqsjqKcpMsTHM6PD/sGO7JqsEVS9ddJRnW2b6BubQ7nbHDUeJxO+rI
-VzGIAJJxNcWkj0gbWyViluP4lFE94adATcTVBb1F0XPfbWEhoIhDxzbcQQBXW/qN
-DsmJc75WRMas268qRRpKcf1hFFXXqYVEhCy83OY/QVADWLdxtw833z/VeFHB+PBz
-GCSwZ71DNaW0iDl77CkOQnkh0e34HQHq4xretgaM0gDn7QIDAQABo1swWTAdBgNV
-HQ4EFgQUjRz86bc3SzB/mkZC00+WjfXO25owOAYDVR0RBDEwL4IKaWRwLmtraC5z
-ZYYhaHR0cHM6Ly9pZHAua2toLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQBD1IRgMoPb/N7UuXoHMQ4C59FncMHxrjcHtZxRqMdEquvQg/rVF27L
-UIwkkzBvmnPGK0bM5iJxi4NA26IVLVBDDg+HD2oMkZW/04uJV/ef6QKdzEyCkmCO
-y/7WkQTjBX9KJeUrnFZNwGb4bRPYrFBElvEHD0hLax4efouwiCaFLsS1w3T+xKsJ
-uoYU5bjUrWQrnHO+BRO1b0D6YAsFx7sTSJGT6v2FCsCNC7DC/1blmZIp7J73FBOr
-R/BU8rcOeQ5KU1e3ooJqSzIKBhWce80g4TaX1u1rYibKqkSUwgp1Jh2MSnKN0B8c
-/RKD8pPFLEQHT32tIHhoRw/Qv+Il4d6h
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.kkh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kkh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kkh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kkh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUKSlBy0/PK+dLgfzr4YQyQUTWSmswDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmtraC5zZTAeFw0xNzEyMjgyMjIzMjRaFw0zNzEy
-MjgyMjIzMjRaMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCkcQ4heWoeLnCVuWcbyIyJuiGKTQUn3G4AgFPzPrzu
-kmHOB1TYZaoHSf29nwaxIlwWBP8I1Ht/ZV0YEEcXdVzi6aqTaAyaG/EI+I4W9Mt6
-fahyfqbrMUobtsE8gGjKNPuENlwJaoE20QGKjKVgEAZD6rf6x67tAMOksD+mWlEO
-C92hqo524ALCvyq6j/+ZBpy9N0mGco/UU09XJYN6ox85xi28yyGnUVPIU/dSqatA
-D3UAVXogrXZL0tqcp56g5WZ0ea2Vt5GcKzAg4MyFjMrjWYtZl5aqE6FO2KhSiH+0
-g4PO59qaF29e1ELnkTLsnlqRkVcDpGmz7mG3DTyqBPLLAgMBAAGjWzBZMB0GA1Ud
-DgQWBBSXhrPEfp0EsoC3wrOp+PNey4m5PTA4BgNVHREEMTAvggppZHAua2toLnNl
-hiFodHRwczovL2lkcC5ra2guc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBADRwTzIescaIEtFHM1deQl5oTR9J49dZHBVwpnlEMZaPqj3lEG3UYWK3
-ydkSkVR/b3XJ6V9l22spA7GMeB7RylB5de7Wk8CTX8RIkO/hrM5GKUY9EknYk81Y
-wasuEUslFH0CioXR8wNtBZlu8cX0TioTCxuv8Z6mF1n/LdQISWylmxFGb9RBjrbF
-1DIr+i2Al4MHbhokAYwVgVhP3PiTDms25MT5uARGYoz/11GsiWYzxDgCqcFbw+oy
-er0t5sfPQZ9gp2fu7eG27+cm3BryxcLUUoGN+9qN43pSnlXex3zIwSIr9SuBmOq7
-txB7BxAsEsxkzuE7M1p2N62744NyMWs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVANz+UgEHXLfMQL+quk51wR7pDqSvMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTcxMjI4MjIyMzIzWhcNMzcx
-MjI4MjIyMzIzWjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAkhuu6h49llcV1GOSUwjfk+P7cROS5Qxa4XVqS8Uv
-7vh8+bZMJu+MpozCE/PLR8T7ERB+isf8zU4GNrY0d5Lo0pkfSfJ8KxeWjegQ4bLy
-SoKbGh2mvDy4DSYQU3GscVrl+eTOExSao4kyACc4J4Wog0lWEwN1K0Gxhiw9mRLb
-43b16dSonrtrypoCEgYeSjxdnOGcCicivDCXm25/wYvMrMuB73pqhfkRgd0WFg2N
-QbsZ5aWiqGVsRwYFydy/N3gs7+IDQ+iZ0aM3TWeL4wb551iMqERtzYO49oeMbmcW
-FHGfoo5vmi7VgwK9eM9k0auORaYY2ePbSdTqGGYeZ1kqqwIDAQABo1swWTAdBgNV
-HQ4EFgQUC+Cfy2cOPFRRRxvKxnI3i/NBznQwOAYDVR0RBDEwL4IKaWRwLmtraC5z
-ZYYhaHR0cHM6Ly9pZHAua2toLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA9RzNZvlQuc8RYNExHbolJeTVQ6rk0ap3yqM16PKAcuR7WxUHoINQU
-9xDZjTGvoXkt/57Lela5AwM2FV48BiS4CvG/1w1GEHRnWCRt4v+y4dnbKa11+GzA
-AhwjTQySGNjWMfgkBrwEg304dhetj9dVsS8gKs69YdBFPJJn5psClgm34ozsmqtg
-v5Dvj4Iva1cXj4GM43N3QERr615wdrkkabCNLTvb9x9PdqvZ0pF+v8IY5mOOzoMk
-R+j6OtHbXjzDF0eehnoMWOiCbKguULWN5TfILfce+mwblQD2eVP70gyD5gL9Zpt4
-NlZX5y7b3GoY/Eio8u4N/p6Id9sfmbUb
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAMfqkTpxpjF9WdBM63DL5ybHrThKMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTcxMjI4MjIyMzI0WhcNMzcx
-MjI4MjIyMzI0WjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAoqXgmOoiWpIsO5cK4dgmPH41dhh0Jau2WSNUsT4R
-lMnEcW26NZL6/DAXPOODKFKIFRp6Oahg+74IU5FqhgsZe4RDcs+bFbbKLz6Y1+kd
-ITl6gBOR0sjqsjqKcpMsTHM6PD/sGO7JqsEVS9ddJRnW2b6BubQ7nbHDUeJxO+rI
-VzGIAJJxNcWkj0gbWyViluP4lFE94adATcTVBb1F0XPfbWEhoIhDxzbcQQBXW/qN
-DsmJc75WRMas268qRRpKcf1hFFXXqYVEhCy83OY/QVADWLdxtw833z/VeFHB+PBz
-GCSwZ71DNaW0iDl77CkOQnkh0e34HQHq4xretgaM0gDn7QIDAQABo1swWTAdBgNV
-HQ4EFgQUjRz86bc3SzB/mkZC00+WjfXO25owOAYDVR0RBDEwL4IKaWRwLmtraC5z
-ZYYhaHR0cHM6Ly9pZHAua2toLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQBD1IRgMoPb/N7UuXoHMQ4C59FncMHxrjcHtZxRqMdEquvQg/rVF27L
-UIwkkzBvmnPGK0bM5iJxi4NA26IVLVBDDg+HD2oMkZW/04uJV/ef6QKdzEyCkmCO
-y/7WkQTjBX9KJeUrnFZNwGb4bRPYrFBElvEHD0hLax4efouwiCaFLsS1w3T+xKsJ
-uoYU5bjUrWQrnHO+BRO1b0D6YAsFx7sTSJGT6v2FCsCNC7DC/1blmZIp7J73FBOr
-R/BU8rcOeQ5KU1e3ooJqSzIKBhWce80g4TaX1u1rYibKqkSUwgp1Jh2MSnKN0B8c
-/RKD8pPFLEQHT32tIHhoRw/Qv+Il4d6h
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KKH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">KKH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Royal Institute of Art</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.kkh.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.kkh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Kungl. Konsthögskolan</md:Company>
-    <md:SurName>Fredrik Reuterswärd</md:SurName>
-    <md:EmailAddress>mailto:it-support@kkh.se</md:EmailAddress>
-    <md:TelephoneNumber>+4686144000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Kungl. Konsthögskolan</md:Company>
-    <md:SurName>IT-Support</md:SurName>
-    <md:EmailAddress>mailto:it-support@kkh.se</md:EmailAddress>
-    <md:TelephoneNumber>+4686144000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Kungl. Konsthögskolan</md:Company>
-    <md:SurName>IT-Support</md:SurName>
-    <md:EmailAddress>mailto:it-support@kkh.se</md:EmailAddress>
-    <md:TelephoneNumber>+4686144000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Kungl. Konsthögskolan</md:Company>
-    <md:GivenName>KKH</md:GivenName>
-    <md:SurName>IT-Security</md:SurName>
-    <md:EmailAddress>mailto:abuse@kkh.se</md:EmailAddress>
-    <md:TelephoneNumber>+4686144000</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp3.hig.se-idp-shibboleth.xml b/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
deleted file mode 100644
index f2432e7e..00000000
--- a/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp3.hig.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-11-16T16:34:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp3.hig.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
-        <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo xml:lang="en" height="83" width="94">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">gävle gavle hig</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">gävle gavle hig</mdui:Keywords>
-        <mdui:InformationURL xml:lang="sv">https://hig.se/Ext/Sv/Om-Hogskolan.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://hig.se/Ext/En/University-of-Gavle/About-the-University.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hig.se/Ext/Sv/-Om-webbplatsen/Om-webbplatsen/Behandling-av-personuppgifter---IDP.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.hig.se/Ext/En/University-of-Gavle/Om-webbplatsen/About-the-website/Processing-of-personal-data---IDP.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="83" width="94">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>hig.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.0.0/20</mdui:IPHint>
-        <mdui:IPHint>193.11.48.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.163.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUb49uwCfYwUsxLAS4QX52Z+LGD/owDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI2WhcNMzYx
-MTE2MTQzNDI2WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAI+kkAfT+diALb7gF1jLrQts59EwS6MM0WId9Zcb
-ypHLNuGXe2QEvdeCVSCx229elyNOOgNm+AuGDKBFveiv7O2Dd6Xebb6dm9v/DnbT
-wLZUAOQB2qSlP0OXxa3TlRWS7l12PcGT5FMmjq7xSstX4YPWE7E0r39eqvLfCGjY
-sAmzibMyVuqr07Vb/+1M2SiG/lFjfdxA/Ze016LDiG/wax5aLp5KEN2M3kIRPOC4
-6Hi5PDX3HdqHAI9gCJydeHGJSABdS2x9uykcl35fZGHc7IhaHFoUl75BUSy/fRKe
-wdWaXW5UDIG1Wi2DvUxLzT41mzUrnAHxqAbUf8c1fBn8hPUCAwEAAaNdMFswHQYD
-VR0OBBYEFLbU5xzHGS8IhBXGrqmk2mFARsV/MDoGA1UdEQQzMDGCC2lkcDMuaGln
-LnNlhiJodHRwczovL2lkcDMuaGlnLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQAzD+a0UFyhxa+fTp9Hz3g1wBE7VSyLKn7ydgI8qWpmzxt8YzZt
-pYPm7XjUfmrQhxtaVp9aCLGgaKB3QZ2AWWqe8wlin2oVA80c3vwqNERwanwh8HXy
-KY9+Pk/xM4SccOG5d7Fli9/DMMtA9lCfcB+VvkEvyB0JXncAoduMFuJWeDH1+YNj
-X06y0H12Vb0MAOdX+ZwUDCcljRTXs/Xz17JlPEIA573fpUUX9iUGHapyi49Lf6P3
-emKBZGVGPtOEIkuwUNjvkAXxTdSqztW3tHz/4c4yAXRIyKtwi4zrWYCw8pPnz2LN
-fZ9x1HnkUO7tsnLp4MMfANCrRtVqNZuBaHjV
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIURDaPmh4fojI5RTQlsw6odpGuJ9IwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI1WhcNMzYx
-MTE2MTQzNDI1WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJNac0ev7kxZgrXM1GL1XM3rnBiD8PsiaFHFB5fn
-hXKrmDEtb1gXSp8ZS5ZDkZdyOW1LHWGkflGdR1y5LfmZUdTI3LGAwUx+5QgHggQd
-LSB9x5kLP3m2RE/cmFV9Ec0CAyoizbpKcoYuBjCN/YfQH4u6ZtWbrPBIhEZ9tF70
-HHJ26e+6UXWmFzw2BHv9BJ47XywJg3pbQ+ozhV/kRm727YyyxAb2s4j69dtpWcxM
-bpaHbZf3ZZUwODBFY+wlVWwL2GSZomBTIxSdWyjUBmdxFnWmtrP7gu1MqTXOMaGm
-90KJbmvNko9hw0wD1EbkNL7LTjRhjuUIaOSZuOUUXjjFBkUCAwEAAaNdMFswHQYD
-VR0OBBYEFKkedXD1X7fDQXcCyWHjSWf85AGhMDoGA1UdEQQzMDGCC2lkcDMuaGln
-LnNlhiJodHRwczovL2lkcDMuaGlnLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBcHSpCvSXvIqjKu1z6L51V6t6joTmqDUYeuQG6wPeMNXuNojI5
-zuIv4hvKuLUfyjryH8igCl8361zkjkiOw5vJqCTIpmIsH+OkxqL88H6GOr2jzAQ5
-53f8zLmNSi6ThwTWRfUIGc7qu+zbjPUh3fi3JRiJXmye8DiOvr0vTOManWtsnab5
-+70k82K16/LTroAtsoL5ILTpP0XH/f5UzEnrUP5seaFMP+zA4n2ps4jc1h7kLkfb
-UAZ6TEcqZzYGuUQhgz7Q4dwexohnWyfJXSzADbEgxqYrG6M4OUhMsVSYwsx06oQz
-MfV1UqCXysIAIN4hzYWJPMBj/EBD8cha92n8
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUd7xvAjohRdOXVDSf0wu3l75uPbMwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI1WhcNMzYx
-MTE2MTQzNDI1WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ1KSzfqvoHf3493SBKtumXDyZWRZsLqFUXcwvmX
-oVTECzGmQU82/GR2Wbr11v6NC3ShIVy+tdP5H4nfQgIKgJZEo4eisesa/vT6a9e4
-DdpipjHwAn8Y8Ogm1ZI/d28bwTWi6EJhu85Pe9eRwnRYtkkNYHmm2Te5iCib5/95
-reI6fL2PFx2BDIhphEW+r+zGT8s3Ptxqsf335L8dRR4HM7IbJ+FEbvrGv62tosY/
-MNvrXjIHNKjaF2OWV5ka9o0JF6mkcCFx2zA5yF9TRDFo3TJWbSsgK0MGO4g+zLpK
-qY3YX3JMTn2nGwl9RjwY4opaIK3hh1L8JBw+bfYCAWA/ZkUCAwEAAaNdMFswHQYD
-VR0OBBYEFJ1ItL4gA2MYHs0PiGplkA6DUrxxMDoGA1UdEQQzMDGCC2lkcDMuaGln
-LnNlhiJodHRwczovL2lkcDMuaGlnLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQB01IX/rJQDncwW0bJxX82liWdb9vH+rDA9lIxmj7dtc+18P9/Y
-eImEmbKZ7P3QvO3/e7tVlt+Ld4eWPDd/wftpV4kWXincS3XooEJroDSAFjrS4jEn
-86ZQk8ujVLMVWwHh+c4qbKt5b4ENpc628+i2MTzEqTCzYB7GZJgFSej9Qzdnz7P4
-wKRijhkjyNeyPebflCRaA5XoYfBNdabJy+bqTxTbbfpev0PCIXSzWMK6+ZwFtlJ8
-D7xYfJe/x9FrVnIZHPsrwj3ekyL0qpQ4Bs1BFkKDe0bpcyVSrrV0txbaJxnWcgQE
-uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.hig.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.hig.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.hig.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUb49uwCfYwUsxLAS4QX52Z+LGD/owDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI2WhcNMzYx
-MTE2MTQzNDI2WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAI+kkAfT+diALb7gF1jLrQts59EwS6MM0WId9Zcb
-ypHLNuGXe2QEvdeCVSCx229elyNOOgNm+AuGDKBFveiv7O2Dd6Xebb6dm9v/DnbT
-wLZUAOQB2qSlP0OXxa3TlRWS7l12PcGT5FMmjq7xSstX4YPWE7E0r39eqvLfCGjY
-sAmzibMyVuqr07Vb/+1M2SiG/lFjfdxA/Ze016LDiG/wax5aLp5KEN2M3kIRPOC4
-6Hi5PDX3HdqHAI9gCJydeHGJSABdS2x9uykcl35fZGHc7IhaHFoUl75BUSy/fRKe
-wdWaXW5UDIG1Wi2DvUxLzT41mzUrnAHxqAbUf8c1fBn8hPUCAwEAAaNdMFswHQYD
-VR0OBBYEFLbU5xzHGS8IhBXGrqmk2mFARsV/MDoGA1UdEQQzMDGCC2lkcDMuaGln
-LnNlhiJodHRwczovL2lkcDMuaGlnLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQAzD+a0UFyhxa+fTp9Hz3g1wBE7VSyLKn7ydgI8qWpmzxt8YzZt
-pYPm7XjUfmrQhxtaVp9aCLGgaKB3QZ2AWWqe8wlin2oVA80c3vwqNERwanwh8HXy
-KY9+Pk/xM4SccOG5d7Fli9/DMMtA9lCfcB+VvkEvyB0JXncAoduMFuJWeDH1+YNj
-X06y0H12Vb0MAOdX+ZwUDCcljRTXs/Xz17JlPEIA573fpUUX9iUGHapyi49Lf6P3
-emKBZGVGPtOEIkuwUNjvkAXxTdSqztW3tHz/4c4yAXRIyKtwi4zrWYCw8pPnz2LN
-fZ9x1HnkUO7tsnLp4MMfANCrRtVqNZuBaHjV
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIURDaPmh4fojI5RTQlsw6odpGuJ9IwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI1WhcNMzYx
-MTE2MTQzNDI1WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJNac0ev7kxZgrXM1GL1XM3rnBiD8PsiaFHFB5fn
-hXKrmDEtb1gXSp8ZS5ZDkZdyOW1LHWGkflGdR1y5LfmZUdTI3LGAwUx+5QgHggQd
-LSB9x5kLP3m2RE/cmFV9Ec0CAyoizbpKcoYuBjCN/YfQH4u6ZtWbrPBIhEZ9tF70
-HHJ26e+6UXWmFzw2BHv9BJ47XywJg3pbQ+ozhV/kRm727YyyxAb2s4j69dtpWcxM
-bpaHbZf3ZZUwODBFY+wlVWwL2GSZomBTIxSdWyjUBmdxFnWmtrP7gu1MqTXOMaGm
-90KJbmvNko9hw0wD1EbkNL7LTjRhjuUIaOSZuOUUXjjFBkUCAwEAAaNdMFswHQYD
-VR0OBBYEFKkedXD1X7fDQXcCyWHjSWf85AGhMDoGA1UdEQQzMDGCC2lkcDMuaGln
-LnNlhiJodHRwczovL2lkcDMuaGlnLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBcHSpCvSXvIqjKu1z6L51V6t6joTmqDUYeuQG6wPeMNXuNojI5
-zuIv4hvKuLUfyjryH8igCl8361zkjkiOw5vJqCTIpmIsH+OkxqL88H6GOr2jzAQ5
-53f8zLmNSi6ThwTWRfUIGc7qu+zbjPUh3fi3JRiJXmye8DiOvr0vTOManWtsnab5
-+70k82K16/LTroAtsoL5ILTpP0XH/f5UzEnrUP5seaFMP+zA4n2ps4jc1h7kLkfb
-UAZ6TEcqZzYGuUQhgz7Q4dwexohnWyfJXSzADbEgxqYrG6M4OUhMsVSYwsx06oQz
-MfV1UqCXysIAIN4hzYWJPMBj/EBD8cha92n8
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUd7xvAjohRdOXVDSf0wu3l75uPbMwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI1WhcNMzYx
-MTE2MTQzNDI1WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ1KSzfqvoHf3493SBKtumXDyZWRZsLqFUXcwvmX
-oVTECzGmQU82/GR2Wbr11v6NC3ShIVy+tdP5H4nfQgIKgJZEo4eisesa/vT6a9e4
-DdpipjHwAn8Y8Ogm1ZI/d28bwTWi6EJhu85Pe9eRwnRYtkkNYHmm2Te5iCib5/95
-reI6fL2PFx2BDIhphEW+r+zGT8s3Ptxqsf335L8dRR4HM7IbJ+FEbvrGv62tosY/
-MNvrXjIHNKjaF2OWV5ka9o0JF6mkcCFx2zA5yF9TRDFo3TJWbSsgK0MGO4g+zLpK
-qY3YX3JMTn2nGwl9RjwY4opaIK3hh1L8JBw+bfYCAWA/ZkUCAwEAAaNdMFswHQYD
-VR0OBBYEFJ1ItL4gA2MYHs0PiGplkA6DUrxxMDoGA1UdEQQzMDGCC2lkcDMuaGln
-LnNlhiJodHRwczovL2lkcDMuaGlnLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQB01IX/rJQDncwW0bJxX82liWdb9vH+rDA9lIxmj7dtc+18P9/Y
-eImEmbKZ7P3QvO3/e7tVlt+Ld4eWPDd/wftpV4kWXincS3XooEJroDSAFjrS4jEn
-86ZQk8ujVLMVWwHh+c4qbKt5b4ENpc628+i2MTzEqTCzYB7GZJgFSej9Qzdnz7P4
-wKRijhkjyNeyPebflCRaA5XoYfBNdabJy+bqTxTbbfpev0PCIXSzWMK6+ZwFtlJ8
-D7xYfJe/x9FrVnIZHPsrwj3ekyL0qpQ4Bs1BFkKDe0bpcyVSrrV0txbaJxnWcgQE
-uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HIG</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HIG</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gävle</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.hig.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.hig.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Gävle</md:Company>
-    <md:SurName>Network Operations</md:SurName>
-    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Gävle</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Gävle</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml
deleted file mode 100644
index 0b0eaab1..00000000
--- a/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp3.it.gu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-06-17T14:08:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idp3.it.gu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Göteborgs Universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://www.gu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.gu.se/en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>gu.se</mdui:DomainHint>
-        <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUF1A5OQ50ULddi80RkyMVt2S5dnYwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwMy5pdC5ndS5zZTAeFw0xNjA2MTUwODMyMzZaFw0z
-NjA2MTUwODMyMzZaMBgxFjAUBgNVBAMMDWlkcDMuaXQuZ3Uuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCascqNAImvwkXYD1oLzUmCzpuMElSPHhzX
-b2sDbGcD7nbIZbBGRrd0EnU44G7buwLbjT+KV2XZNH9dY0zlJuNp5Hger6BRGKtG
-cY3f4gQ9G67Km1Uog5enbozO/voscqNOKTzBs/Af/Nri5X0Yo5dRGCqbs8/HmtHF
-yUyHrT0UA0DjcMMDiqMhUOuipWqtiSHmqBfuT8JKvd5lZuQkrNU6zWV8fnNBZWJe
-if6IaqgDyrwNBfAtkmUwXhODp4oABlY/oI8qxa+Ed2jcMh89oY7+bhABMCtGGFLA
-W3b/r6WlshpHsaPGx/Kt7oFH0eOXQp2lhVMhe0lHaFh1FqpN5FhtAgMBAAGjYTBf
-MB0GA1UdDgQWBBThJ3g+kJ+cZwLb42V3sVkC/7VpXzA+BgNVHREENzA1gg1pZHAz
-Lml0Lmd1LnNlhiRodHRwczovL2lkcDMuaXQuZ3Uuc2UvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAA/sfO1zipZ47Kgvb2PGymYLsIsuWgufLVVA3axe
-BmOVZZQivU1SXs7zEGrLuDWf1MKPajj5+MPQOMUQojyvrrJataDmwokCKbxzKIlK
-xiXkFwgCAYQ8BdZ+3sajzECVnC56XKdyrmTcsAFiZCu+TKA+QQFCf0RuFs84VXQn
-VLLhEPVx0oyiDl+kVsGJBffJJuT2euYQXY/aWukZQApI4SAVSD9+kMLLR7aylp5G
-PbBhz2wYpM9y3w9Ou1xFKFwIhLUm9vCAaFbKIISIMwz/AGfD0RlWNLK1XLqE/9iU
-pW7MUEqHahaaNf594Rb2HSPJiGdjq42oIgjV5O/iZQhhajM=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUBk9rqsAITZHji4oNlQkTn8tKeYIwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwMy5pdC5ndS5zZTAeFw0xNjA2MTUwODMyMzVaFw0z
-NjA2MTUwODMyMzVaMBgxFjAUBgNVBAMMDWlkcDMuaXQuZ3Uuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeHYglrDVaR8MZ5xbJY3F67/8BAVQeKkFo
-fX5wjnpYhDqliWtbkEtXxe1KMTWrGYX6iGHYY/OSL+OlIQa4HS5ddDGgOFrL9CJq
-K+10ksjhYGCqc7sFxrpNWkhqBAC1ZDU/IFBkpUYPvqUybWK0HNi8+vOGEbjDLGjB
-EbnRbyCOzSie2imkJ2hXdkXWtYaFQUgh2zJN3sGjbh0XyoCc3r3Kp/vEYI1oeWeq
-L8VLWCTyd0UbnvwHobOJacNCQwoGDRr0xoVDBATQ5LEmPjqd1Bhfsm2h25qoPlLy
-Fpsgo1P/r3Dx7K4i8s59jlbMwgrlSHBSZ/ARsczZaE68ulYmFpRJAgMBAAGjYTBf
-MB0GA1UdDgQWBBQKO3oNLb6llqHEj77Btda7DskwfTA+BgNVHREENzA1gg1pZHAz
-Lml0Lmd1LnNlhiRodHRwczovL2lkcDMuaXQuZ3Uuc2UvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAEZsh2pLePXmGHMsuCAiVmEtGnZdXKZFwFz8ZQx3
-6MlsiPAIa1YJYP6w8W9IfDRl6OA5lZj9RMBgYkjMAsceMg+OXgFVxU3Pa/sEB4Hn
-97QnOCTXOJTpZEGu8bljxYShhi8QNJwd5TnYa8iHtHxyv2r1wArCJlEcToX3qoY+
-BtpSJ1lK8n4Ij3Pr0b+8f11FoNHmH0x/EWL5DGWRsgKFZYvqK4ZB51UNwhIO1nDR
-gpxgwMi4sgXwJh/SVhZUu5cm7ZIwW73BO5EfQ4O40gDOECF8+KgfyJpnXBtDShrh
-oIVPmjhtjo5JX9haWnr6ff/1870FFrYliFq35HAVN1pmrhk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAM+/+9aCFZpXtTFRmp0xShPwTGplMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDMuaXQuZ3Uuc2UwHhcNMTYwNjE1MDgzMjM2WhcN
-MzYwNjE1MDgzMjM2WjAYMRYwFAYDVQQDDA1pZHAzLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlHeHwSYiDlrT9fVCz57EFr0hHNR/dSB1
-9GzruYV43k9S+9YDcpGr52OdREf5JehQPHJ4/804arJbZKhMHq1bILK3iSWrzbmm
-teWUp9roLroioS9N2PRsIoU0/oxslxgS/nwxa9VWB5X04w7Jw2STuneMAK6yJLuK
-b75YHBAuvQub7plrLQ3HckYXNK/cr3BVxBHsVLN3pm1uLxfnoi4vjz40EcFYhwXg
-DrodSchSPRSNDzBh90Gkuyo7XmSk5SLjYz3iIj67Nb2DoZnEd3mmMVyhOEfesl8K
-qD618iO9tx2uOy/egr8sMW+yF5Wzx3cZtW7VRMlFvLDXkp1zMHlE9QIDAQABo2Ew
-XzAdBgNVHQ4EFgQUACHdgdZSJ/6L++v0I+LMcu6s2UQwPgYDVR0RBDcwNYINaWRw
-My5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAzLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAO7p786KdN2fnxXrR4aawZ/WIWQo52SVRx2pav
-0U13e0h/ZXJNo7x0ZXr1wif2RrGI0n10oW8n93pUUmJZ07srggiTOHVbeBI0JjDE
-QoVlEjThh43zDN9nILz7qbN79XuhOEh/U7/nesokb7oYkty1JfyLpMY/aZsBf2XM
-XhVNSeI3xTN09qpS+e5O/I513/Ca8hEZCzymiDem1qvf5qz+CgDe3wKWVAS599nj
-wJ3oumaClu6wAVkixxcmL+Z+JxnQ28v+vf22yCNQp4j3X6cOKdRylAC5NlobQYZ8
-mbmfzT51FSO1LI3Xw2lAtTgYi5oMWqxMao2yJl8MZKP4OY3Y
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.it.gu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.it.gu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.it.gu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUF1A5OQ50ULddi80RkyMVt2S5dnYwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwMy5pdC5ndS5zZTAeFw0xNjA2MTUwODMyMzZaFw0z
-NjA2MTUwODMyMzZaMBgxFjAUBgNVBAMMDWlkcDMuaXQuZ3Uuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCascqNAImvwkXYD1oLzUmCzpuMElSPHhzX
-b2sDbGcD7nbIZbBGRrd0EnU44G7buwLbjT+KV2XZNH9dY0zlJuNp5Hger6BRGKtG
-cY3f4gQ9G67Km1Uog5enbozO/voscqNOKTzBs/Af/Nri5X0Yo5dRGCqbs8/HmtHF
-yUyHrT0UA0DjcMMDiqMhUOuipWqtiSHmqBfuT8JKvd5lZuQkrNU6zWV8fnNBZWJe
-if6IaqgDyrwNBfAtkmUwXhODp4oABlY/oI8qxa+Ed2jcMh89oY7+bhABMCtGGFLA
-W3b/r6WlshpHsaPGx/Kt7oFH0eOXQp2lhVMhe0lHaFh1FqpN5FhtAgMBAAGjYTBf
-MB0GA1UdDgQWBBThJ3g+kJ+cZwLb42V3sVkC/7VpXzA+BgNVHREENzA1gg1pZHAz
-Lml0Lmd1LnNlhiRodHRwczovL2lkcDMuaXQuZ3Uuc2UvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAA/sfO1zipZ47Kgvb2PGymYLsIsuWgufLVVA3axe
-BmOVZZQivU1SXs7zEGrLuDWf1MKPajj5+MPQOMUQojyvrrJataDmwokCKbxzKIlK
-xiXkFwgCAYQ8BdZ+3sajzECVnC56XKdyrmTcsAFiZCu+TKA+QQFCf0RuFs84VXQn
-VLLhEPVx0oyiDl+kVsGJBffJJuT2euYQXY/aWukZQApI4SAVSD9+kMLLR7aylp5G
-PbBhz2wYpM9y3w9Ou1xFKFwIhLUm9vCAaFbKIISIMwz/AGfD0RlWNLK1XLqE/9iU
-pW7MUEqHahaaNf594Rb2HSPJiGdjq42oIgjV5O/iZQhhajM=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUBk9rqsAITZHji4oNlQkTn8tKeYIwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwMy5pdC5ndS5zZTAeFw0xNjA2MTUwODMyMzVaFw0z
-NjA2MTUwODMyMzVaMBgxFjAUBgNVBAMMDWlkcDMuaXQuZ3Uuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeHYglrDVaR8MZ5xbJY3F67/8BAVQeKkFo
-fX5wjnpYhDqliWtbkEtXxe1KMTWrGYX6iGHYY/OSL+OlIQa4HS5ddDGgOFrL9CJq
-K+10ksjhYGCqc7sFxrpNWkhqBAC1ZDU/IFBkpUYPvqUybWK0HNi8+vOGEbjDLGjB
-EbnRbyCOzSie2imkJ2hXdkXWtYaFQUgh2zJN3sGjbh0XyoCc3r3Kp/vEYI1oeWeq
-L8VLWCTyd0UbnvwHobOJacNCQwoGDRr0xoVDBATQ5LEmPjqd1Bhfsm2h25qoPlLy
-Fpsgo1P/r3Dx7K4i8s59jlbMwgrlSHBSZ/ARsczZaE68ulYmFpRJAgMBAAGjYTBf
-MB0GA1UdDgQWBBQKO3oNLb6llqHEj77Btda7DskwfTA+BgNVHREENzA1gg1pZHAz
-Lml0Lmd1LnNlhiRodHRwczovL2lkcDMuaXQuZ3Uuc2UvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAEZsh2pLePXmGHMsuCAiVmEtGnZdXKZFwFz8ZQx3
-6MlsiPAIa1YJYP6w8W9IfDRl6OA5lZj9RMBgYkjMAsceMg+OXgFVxU3Pa/sEB4Hn
-97QnOCTXOJTpZEGu8bljxYShhi8QNJwd5TnYa8iHtHxyv2r1wArCJlEcToX3qoY+
-BtpSJ1lK8n4Ij3Pr0b+8f11FoNHmH0x/EWL5DGWRsgKFZYvqK4ZB51UNwhIO1nDR
-gpxgwMi4sgXwJh/SVhZUu5cm7ZIwW73BO5EfQ4O40gDOECF8+KgfyJpnXBtDShrh
-oIVPmjhtjo5JX9haWnr6ff/1870FFrYliFq35HAVN1pmrhk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAM+/+9aCFZpXtTFRmp0xShPwTGplMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDMuaXQuZ3Uuc2UwHhcNMTYwNjE1MDgzMjM2WhcN
-MzYwNjE1MDgzMjM2WjAYMRYwFAYDVQQDDA1pZHAzLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlHeHwSYiDlrT9fVCz57EFr0hHNR/dSB1
-9GzruYV43k9S+9YDcpGr52OdREf5JehQPHJ4/804arJbZKhMHq1bILK3iSWrzbmm
-teWUp9roLroioS9N2PRsIoU0/oxslxgS/nwxa9VWB5X04w7Jw2STuneMAK6yJLuK
-b75YHBAuvQub7plrLQ3HckYXNK/cr3BVxBHsVLN3pm1uLxfnoi4vjz40EcFYhwXg
-DrodSchSPRSNDzBh90Gkuyo7XmSk5SLjYz3iIj67Nb2DoZnEd3mmMVyhOEfesl8K
-qD618iO9tx2uOy/egr8sMW+yF5Wzx3cZtW7VRMlFvLDXkp1zMHlE9QIDAQABo2Ew
-XzAdBgNVHQ4EFgQUACHdgdZSJ/6L++v0I+LMcu6s2UQwPgYDVR0RBDcwNYINaWRw
-My5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAzLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAO7p786KdN2fnxXrR4aawZ/WIWQo52SVRx2pav
-0U13e0h/ZXJNo7x0ZXr1wif2RrGI0n10oW8n93pUUmJZ07srggiTOHVbeBI0JjDE
-QoVlEjThh43zDN9nILz7qbN79XuhOEh/U7/nesokb7oYkty1JfyLpMY/aZsBf2XM
-XhVNSeI3xTN09qpS+e5O/I513/Ca8hEZCzymiDem1qvf5qz+CgDe3wKWVAS599nj
-wJ3oumaClu6wAVkixxcmL+Z+JxnQ28v+vf22yCNQp4j3X6cOKdRylAC5NlobQYZ8
-mbmfzT51FSO1LI3Xw2lAtTgYi5oMWqxMao2yJl8MZKP4OY3Y
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Lena Ström</md:SurName>
-    <md:EmailAddress>mailto:lena.strom@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Tobias Galéus</md:SurName>
-    <md:EmailAddress>mailto:tobias.galeus@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>GU-Support</md:SurName>
-    <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46317862020</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IRT GU</md:GivenName>
-    <md:EmailAddress>mailto:irt@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idpproxy.dev.eduid.se-idp.xml b/swamid-2.0/idpproxy.dev.eduid.se-idp.xml
deleted file mode 100644
index a12fb40d..00000000
--- a/swamid-2.0/idpproxy.dev.eduid.se-idp.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idpproxy.dev.eduid.se/idp">
-  <md:Extensions>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-20T21:04:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idpproxy.dev.eduid.se/idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">dev.eduid.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">test.eduid.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">eduID Proxy IdP Sverige</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">eduID Proxy IdP Sweden</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">eduID är en gemensam inloggning för din utbildning</mdui:Description>
-        <mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://eduid.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://eduid.se</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://eduid.se/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://eduid.se/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIUHwEGLhFEa8Ow6G6Xpz4I572785cwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMB4XDTIwMDMxODE1MDQwOFoXDTMwMDMxNjE1MDQwOFowGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAouQV4lrmp+k+7a8Q/kfovbIF9me1Ls4LMZ3PyqL5JYvAVd+KcMQG4GGEwQ7HHsSzQnhsypyQsZFQeWqtAu5H81KZL1i7DHqD2n2/DmYqfuV9l2f9FlQ1e3VTLtOWX2PlkmiN38VNTWWFAYDNeJg46EJHn/5kFIuBycVcR0wveaXDs8dtjOTSqSawfnwiGeUCv508OK3OD5L9U1snKp7trT5Q1EPLojnihfpqkol0UwecjSBPhd5Lpocm/VGKLfOqnMWLF71PJvu0QN9V4KMZ17rmD8IQlxo8TQQpcYKov55E7AwX9e0H/q9PjjmMVATAfCBVdUCHX93+VvUuQzEBGdT97F0ldbnZsrsp+ec4niKaeIqRYu77B0oWwNQfgJ0xJazkYdjfyTkM5RhMxjTsRKWjpKBFk6YOfcP7wQZVJMKvSKXkosFBMHgZfttoyfcoERMoItuZfbjR9DhQxBIxJ+/D9+QCT/dXqETmxZ6ftEeRKjqKF86GVnq/OYZVpqZth1EUyQxI7FcF2H9t6SmwR5KaK1eN13i5fB2XCuWAYResk63i9XZmD+idHERpi9NN6oVK7tz1WQBxPcl4UGqLG1VGY22ctlCcb0PI6GFj+DZqhErl1a3wrhMY22oCRhAwZGk68yK39nLti2isq+wYT+aYl8f7ZYWsp97xq3GHm8kCAwEAAaNTMFEwHQYDVR0OBBYEFL4Gvq/MygCukZfrLP5OE9nCKqA5MB8GA1UdIwQYMBaAFL4Gvq/MygCukZfrLP5OE9nCKqA5MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGHfzhiMltgYqZHLn66GYOeY/8ugqu5zQK3D+SFVyxsfOsaQedoxyCqlBUlw1rRtdFUr2pC1xW1onPUcXlUzIkYypJ0AHZwlnfAfAKOSCrK38gsRQI6RDIhPIH7yuPHxyXGq6rWLUBzZpcb40EhWPK8o+KMG5i3cNrCC/+LSU4uL7QVJwkUeqltPBDABL5ZggoT9Dx85bUlU0PgQtEpbyFtt03kbkOut8tC4feiWzbRXAkvhwZhgqFDft+UeKUyF5z6MtScS7Q6oqnDGbyVCL0k77sXmv66mjD3J/wwUywnNSnlfWVfohJAY2E6b1IMYsihjBB8m1Ltb9F3CVrlB2DXtG8MgitBRuHeSAehpXss8676FOdApAVL4VnMoW2GC5JKYmpVA8yx5uZb6tMlRmLRly0GpxKx0Sy4D8joPXSExyjM8XHK22gMjgFYCJixDo3lhTzsLSKv9uwH9gdoxDg+F6gnLaihtTOwJRGcFTgj2S19iYQYWCLg2BNNC6Q8pmSh+KkIHOrf4a3nHVQhnm6fF0mtaKUnLg2D5ivPD8cJswOn+LZ4a75kbbeMcw2l+GArzeN5hhEDgCLwUnD11zhHcK/XYiI23fVLoIM+nOLykw2rtAW16QFjSAQ0FNODex/EiljOCUvSGY97rCQHdhd0UzehdiDakhIDPq2ZRF8Co</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIUHwEGLhFEa8Ow6G6Xpz4I572785cwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMB4XDTIwMDMxODE1MDQwOFoXDTMwMDMxNjE1MDQwOFowGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAouQV4lrmp+k+7a8Q/kfovbIF9me1Ls4LMZ3PyqL5JYvAVd+KcMQG4GGEwQ7HHsSzQnhsypyQsZFQeWqtAu5H81KZL1i7DHqD2n2/DmYqfuV9l2f9FlQ1e3VTLtOWX2PlkmiN38VNTWWFAYDNeJg46EJHn/5kFIuBycVcR0wveaXDs8dtjOTSqSawfnwiGeUCv508OK3OD5L9U1snKp7trT5Q1EPLojnihfpqkol0UwecjSBPhd5Lpocm/VGKLfOqnMWLF71PJvu0QN9V4KMZ17rmD8IQlxo8TQQpcYKov55E7AwX9e0H/q9PjjmMVATAfCBVdUCHX93+VvUuQzEBGdT97F0ldbnZsrsp+ec4niKaeIqRYu77B0oWwNQfgJ0xJazkYdjfyTkM5RhMxjTsRKWjpKBFk6YOfcP7wQZVJMKvSKXkosFBMHgZfttoyfcoERMoItuZfbjR9DhQxBIxJ+/D9+QCT/dXqETmxZ6ftEeRKjqKF86GVnq/OYZVpqZth1EUyQxI7FcF2H9t6SmwR5KaK1eN13i5fB2XCuWAYResk63i9XZmD+idHERpi9NN6oVK7tz1WQBxPcl4UGqLG1VGY22ctlCcb0PI6GFj+DZqhErl1a3wrhMY22oCRhAwZGk68yK39nLti2isq+wYT+aYl8f7ZYWsp97xq3GHm8kCAwEAAaNTMFEwHQYDVR0OBBYEFL4Gvq/MygCukZfrLP5OE9nCKqA5MB8GA1UdIwQYMBaAFL4Gvq/MygCukZfrLP5OE9nCKqA5MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGHfzhiMltgYqZHLn66GYOeY/8ugqu5zQK3D+SFVyxsfOsaQedoxyCqlBUlw1rRtdFUr2pC1xW1onPUcXlUzIkYypJ0AHZwlnfAfAKOSCrK38gsRQI6RDIhPIH7yuPHxyXGq6rWLUBzZpcb40EhWPK8o+KMG5i3cNrCC/+LSU4uL7QVJwkUeqltPBDABL5ZggoT9Dx85bUlU0PgQtEpbyFtt03kbkOut8tC4feiWzbRXAkvhwZhgqFDft+UeKUyF5z6MtScS7Q6oqnDGbyVCL0k77sXmv66mjD3J/wwUywnNSnlfWVfohJAY2E6b1IMYsihjBB8m1Ltb9F3CVrlB2DXtG8MgitBRuHeSAehpXss8676FOdApAVL4VnMoW2GC5JKYmpVA8yx5uZb6tMlRmLRly0GpxKx0Sy4D8joPXSExyjM8XHK22gMjgFYCJixDo3lhTzsLSKv9uwH9gdoxDg+F6gnLaihtTOwJRGcFTgj2S19iYQYWCLg2BNNC6Q8pmSh+KkIHOrf4a3nHVQhnm6fF0mtaKUnLg2D5ivPD8cJswOn+LZ4a75kbbeMcw2l+GArzeN5hhEDgCLwUnD11zhHcK/XYiI23fVLoIM+nOLykw2rtAW16QFjSAQ0FNODex/EiljOCUvSGY97rCQHdhd0UzehdiDakhIDPq2ZRF8Co</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/Saml2SP/sso/post"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpproxy.dev.eduid.se/Saml2SP/sso/redirect"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">eduID Proxy IdP Sweden</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">eduID Proxy IdP Sweden</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://eduid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Administrative</md:GivenName>
-    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
deleted file mode 100644
index 34286ff3..00000000
--- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idpshibboleth.irf.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-12T17:00:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idpshibboleth.irf.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitesutfärdare för Institutet för rymdfysik</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Swedish Institute of Space Physics</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.irf.se/sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.irf.se/en/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://cloud.irf.se/s/mkagGeXZPb7aSyg</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://cloud.irf.se/s/mkagGeXZPb7aSyg</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="80" width="80">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="80" width="80">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">irf kiruna rymdcampus space physics campus</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>irf.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:67.84,20.41</mdui:GeolocationHint>
-        <mdui:IPHint>192.71.13.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.33.0/24</mdui:IPHint>
-        <mdui:IPHint>192.71.152.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.16.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.17.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:27::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIUa5oeenhHPCRZR3Fo7OoalJEOoOQwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5pcmYuc2UwHhcNMjIxMTA5MDcz
-ODUzWhcNMzIxMTA5MDczODUzWjAfMR0wGwYDVQQDDBRpZHBzaGliYm9sZXRoLmly
-Zi5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJIs7p9r9wAFzuSH
-ZOWFbAwdlmgfQwG2GrbUxvGatziB5sUe1ZlRA+n2OTpM3JCGGPbNYn70T3COUrOd
-/R+c+5sIEWWAiuohKbjZ6Nhhap9pB4EFtJjTd93lYTpX8VHSuncBVxkw+cfKmq51
-HOU++1jgDoRX3LtwqgsisDQqI1KwzAcrapf3VNP62CKxdeGTz7wt8WbZ0vDJygr8
-cRC3c2mWkIg62Lrf1oocIo5j7zRLRZxO3Zjfp+A/UuYUAkXT+dpP4qcaQDOl260m
-UqUjnJKLc56l+flmqJdF0QaO1pHSb7UBXD4/alr3XjXgK4IVlm1lTolyZEJiSP6N
-pXhS2G22fWLN+C9A6pUCHqyguZ3EyRLirKaT5K6BKnsxesK1aPZ3ounyE0pTYLMq
-808iMer2aI91NM6WtaPCtx7+WRbu7QXSndkemm+b3U8WN0O7zfLWMC7NiDZQPG1M
-tl5NiBoMkm/B5TyOo1jf5U4+DvdvhVfEFwwl5wshfvCdZuU/zYhvvsYWb/jyjtbi
-yb3cESqUx3vtGb8TLc21vlqtB9j9XGOGTiqj4nXuoWnIC1GVPIxNu3X/iA2PYxhd
-wBLddd0yT+Rz5YzJ/mTNy6SRra3sgflXLn+49XJNl0VlDfFJ+wLxtQ9qaRisK92Z
-5p/pMQt0TBygS1gMHmiHr21sm3BbAgMBAAGjQjBAMB0GA1UdDgQWBBT6te8GTOwS
-mAteAp7vAsRwB+u+HjAfBgNVHREEGDAWghRpZHBzaGliYm9sZXRoLmlyZi5zZTAN
-BgkqhkiG9w0BAQsFAAOCAgEADoDP/NWcLu5LpuUzTZToqkztCKrkKCe1e/NtEHU8
-dPucGah1DIPqnYUVwhieP7Brb7CPhZz7CqbCtwtgc/KbZJXKpOf5S5ofpBXiYGnB
-V+oE2U21xglzw61EYgS1EwaeceSaYfTMbX6y9cjCTBQTAkJ1ZJA2+zJBMRFYfy2G
-U7tZDL04dTSRpHUvZHRuT2a+9IM8GHc2R3mURcZvrwShDyKhG45EVHJdZIXWtQDH
-l2fAV9Yv9ykG35PzGX8L8q6D9dxL+BVm1D0PQZkUEmA8EukgLXnsvlmxyhY6r/v3
-GHsI0ftRrjLjvySWMW+NkCRW3FoCqJHpIuchBuZbvLM07sBcdKnNBVvSFDRdjJIr
-/NTbacmthEefcLGodjmxmxq0MiJfWIIhp2KbBi/odsb4K2A7rAia3SEOkY/nC+NJ
-EJ+mVx5hqhzIqMmFr603utXYUGAVC/foX3KxhoDIA5o3hcOrK0vpmi+mekhelyFI
-1/1rWrwyImaQdexW320APGDrPSVrXCEyjMsOSfQ/scHpsyvN8xJXaOR8iJHA8KAC
-AACVD198JjSnWA25HwZ8PlYt4tm80EJmarJ5YcsWBVlwV1SRdqekjTb2o8NBIuZL
-v5Pr0LqV2VHifS0hTRd84qZ+/sao0y5X/TAc3FW6BORpEsOCblOPGHW+CoHicDX+
-+wk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDzCCAvegAwIBAgIVAPtjDi+3iZ+3i2UvPXVpNzFUAn/3MA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTIyMTEwOTA3
-MzkxMloXDTMyMTEwOTA3MzkxMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
-cmYuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9Hu0rjW0PGELi
-Xxc7v1E1le3nrGhVdxOHRUX6sDQ8Ajeu3CxXCO14ysgdLPVcT2edhecp2cfIGmRP
-+dAgdxQc5sXU2fwZjwPQpMUEyIMbD6ikbKv0gsWW5hnZZfcOhnPERLBF6DoM6M/7
-uqVzaWfvNrW7DzrbFRaBbI8s5vH+qBUXMrxbTWjETSMLvASohdQv/AzBoiMZJw/r
-v6vaJMX7VYxRPdGz5U6AGqMA0Rba3Z2EWHtG3QrJMl+SE9nlYTLlm+MF1X2HjN8U
-w73sdx1/9Hvp2Ly/KXgt00ypkniNzCjZZ7Ji7dU8/iPF3UhPDpZdNUQDwVeCzOpm
-sFBAB5rMGMHNpc95llhKhytV2WBEjSFXjivczn+o1leVjYTriMUZpZN+EzYN6WHz
-ztwWBhA16CdIoMv3C2HGGeHj+SS8KQIul+0MnZU9g0Ad/e0ChCqk+EvTKkJ8QelJ
-RjUvXYcqdwoRFHuN2xyJtNl2v54ZGafe6NVRQux0I5dh4lXkkUg/uUpb1ssaQY9X
-aHHkT9AwMx3IkNcL5WXCtG8BZSqjliLGo7pFVvuYD0XNZRWxRz9m6OTUUbcGldRZ
-rNUdK1/4NnpsqdLOiYH3Tu3kdFND18w1jUT0pqBhI51Sd+DneHNn/nRbqI1a1yeE
-s+eYnf0ReW0R0yROdrLp9LLK/rbfIQIDAQABo0IwQDAdBgNVHQ4EFgQU9xXG6PBK
-wijFum5pAh3PENSgoUgwHwYDVR0RBBgwFoIUaWRwc2hpYmJvbGV0aC5pcmYuc2Uw
-DQYJKoZIhvcNAQELBQADggIBAJ2kFXJWMGZj1DfQicHoA5af4mwsWuywnL4BFr+X
-LEtecwgNOH78GSXVHFVFt7H1cRN7QG110EkZ12jNdxDbG6hLzW6apIDWqgCDognm
-fEru/+01loGXW4jr56fMe573SmK+W/+f4APdEZ4tNWv25AcxbJesM1KUlSFE/1uM
-sdZQhIDbdZH6UppxakXoNjv4ERjFqsP5xG3pkRyfd2bx4EFXLC/6CAzoOoScGx0K
-GF1iSXcv7lLMrG98QEP9EMO4dITTdb8VzxOM7mbCBlVl7UfvUGd8pEEEXCbJrSxo
-mEo9vzQpGu5KGhckasVUXSiam4m23mIWXgy8UgqnlW5Rmci/hygb9CQMoiMvBYVL
-mlkwbm+61QxlMWVX3/651TANudaaSx95rGpdod8oLRCt64HSSsGTseAxldYLt1hJ
-IVVFlezj2nENCSBn7Fe6XaO+IZ426SCFVe49b3HX+hdb3P6jCTXu59RKFtzflehJ
-Q9zt4K1woLxX0LksHWtLRWW+a0kbWL2UqEq4q1Em6LAz74UR+5isEGSMaJE5cJ1B
-nnmgcuLeWY0JKSObDThQxmQM+PHnszKEdo9hDZTGcQc49C8dSN7Wup5pFzSm2i0t
-3kBrU4hmFSqLrhE3B/S/F+xL5TqFHd623+LfT3QCAAG/eL0yglCQs2oRfWEEFuEm
-7QT5</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshibboleth.irf.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRF</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">IRF</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.irf.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.irf.se/sv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Swedish Institute of Space Physics</md:Company>
-    <md:SurName>Mats Luspa</md:SurName>
-    <md:EmailAddress>mailto:swamid@irf.se</md:EmailAddress>
-    <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Swedish Institute of Space Physics</md:Company>
-    <md:SurName>Mats Luspa</md:SurName>
-    <md:EmailAddress>mailto:swamid@irf.se</md:EmailAddress>
-    <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Swedish Institute of Space Physics</md:Company>
-    <md:SurName>Mats Luspa</md:SurName>
-    <md:EmailAddress>mailto:swamid@irf.se</md:EmailAddress>
-    <md:TelephoneNumber>+4698079000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@irf.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml b/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml
deleted file mode 100644
index 3916428c..00000000
--- a/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idpv4.lu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-05-28T12:09:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://idpv4.lu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitetshanterare för anställda och studenter vid Lunds universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity provider for employees and students at Lund University)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
-        <mdui:InformationURL xml:lang="sv">https://www.lu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.lunduniversity.lu.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.it.lu.se/fileadmin/user_upload/itlu/personuppgiftshantering.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.it.lu.se/fileadmin/user_upload/itlu/personaldata.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="146" width="121">https://idpv4.lu.se/idp/images/mdui-logo-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="116">https://idpv4.lu.se/idp/images/mdui-logo-en.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>lu.se</mdui:DomainHint>
-        <mdui:DomainHint>lth.se</mdui:DomainHint>
-        <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEGDCCAoCgAwIBAgIVAKdIP7eMddg3zDrWrc+09WAj2x7AMA0GCSqGSIb3DQEB
-                        CwUAMBYxFDASBgNVBAMMC2lkcHY0Lmx1LnNlMB4XDTIwMDQyMjEyNTgzMloXDTQw
-                        MDQyMjEyNTgzMlowFjEUMBIGA1UEAwwLaWRwdjQubHUuc2UwggGiMA0GCSqGSIb3
-                        DQEBAQUAA4IBjwAwggGKAoIBgQCvHmABYJf9A/WJ5+cUcWp9dTSfMZQZHJ+z7B04
-                        J+H133U7VP7jBHl36XL2CEdl7G0eCbk01Cw7IbkcIaQwLa3dJGgADMM8Lh0iE/BE
-                        4YG1p779QdZU77ZT/91FDsXn/B9qsY0NsYxWCvxUN52qX7+a9ZgW35xEfMDEF6ZW
-                        R3Bll3VZyqwtYbE7jU/f0ujyRFmntYl3dGMRamlzu9o7+sXLi1xlceJMWWADh63O
-                        eNGWm2XKWeGtmGyyyeo8mQbDBZNmS6K5WEIznhzXPJfbwMlXrLye041/r2kppB+Y
-                        4nISfL6S1IuPObw0HM9kosBlrwZFjP++Wodmt6OHXiHLbKA2rj/Jxt7BpxIGM5It
-                        7cEFAn6J/5MvsqGmWVLnCMPF1vzq866oQdDLfNJXCbyOgvPDPnw/Zl6bb3qYx5Kk
-                        PvQsTMK36e8zB/pFrzagSgbFkYQuUA+KNBgIpgeMO3bpoRZ4S7wc0Vq7JShJ9fBQ
-                        uP6NtJw6iTehHMDFTn8kbU9LxnECAwEAAaNdMFswHQYDVR0OBBYEFMUWZ/DnrU5S
-                        unY+y/Upo+dVljnpMDoGA1UdEQQzMDGCC2lkcHY0Lmx1LnNlhiJodHRwczovL2lk
-                        cHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBgQALwnh8
-                        uEl9xWrin4vPLm+Mc0THPPVaeGZF1ivyDcY5WefOXaxaX80BxHKOcA2aG/+Ne/Ko
-                        k9u1COHrjp3QfkHE2SQTAPoD4EWtHaiCyoBYnwRA1qfSFbcnVlZOr9IOIRAA6TiS
-                        iE+G4kf9QW/xUSmONPGLU8vqXuisxTr46XjQMbl+dtTZ5fxURKFFv21C0KBXMkLI
-                        xSzTTn9Q0acVT07oNgNQscJtWtStXbsrEhQ9+uyEd3xCF883BjpF4nDDtLOo0jXD
-                        iyhJcGU4fKD4MMeREoKb+OKLpCqE+8BdmO93kMJLrbdS1EPIlVG1fShtJCeF40EL
-                        C4Ns9OOYE0uD7tQG4oQQht3WFSiS95Plylg62BGqk5LpwODuDpuO7tqZkLbI5gN1
-                        7S98DoMZftlEg8leJv1NuaBIKD/C/WI6OPAqVmBCckb6R8eGU7yGGc2i2qZ9yC2r
-                        3SMS6VsKOZJv77OE9yzH7JF8aKjaSNHu1lpP42IG/hmrAgNjQMTbXFyni5o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-			MIIEGDCCAoCgAwIBAgIVALae7VoaIcI/4rrT+/szHHki9TuEMA0GCSqGSIb3DQEB
-			CwUAMBYxFDASBgNVBAMMC2lkcHY0Lmx1LnNlMB4XDTIwMDQyMjEyNTc0NVoXDTQw
-			MDQyMjEyNTc0NVowFjEUMBIGA1UEAwwLaWRwdjQubHUuc2UwggGiMA0GCSqGSIb3
-			DQEBAQUAA4IBjwAwggGKAoIBgQCzN4NFUJ5I2R08SllQy3zS5Gc4WBPx0R+wE6/w
-			QpU1QaQF41/BHzY7fwS/rVABmv/RsBLVe35h3yTuKo4pEQ3LkWhQEhaxkKOGaUNR
-			Z+bonBFjhAlTqwLYcC6StE59POkaQc2MLiVJcBsW64kYk6ENYTCJC287k7C9YjwK
-			o2rpyvG4ZAY50Cv0pMvB0eLaCJIG1ypwbU1TakUYsoR0Dl2j7DWkh899hyKJKbOj
-			xosvWqfZ7g3bT8II7VMTai4Y0jT0yO2SIRe4oT3/veISYeJgxNI/jvGbFdD1s7nL
-			4J+QamCRGQo5stasOdTMzXpWdlW87hB8/22qWNgEQ98B97fZmM3FT4aUPN+07tJe
-			4lPJADf4PTLs3uqSqRQ5nQZKkQp1hc7L0Qnl4dPdlYdgqBOJiJT80dkfH6/4nldV
-			Mn/817W8X27/yXII39Rmrq9C2fvCT4QGMuebkYaCYZ6bvYQfDGSUkwY2oaffKxQL
-			qWDcTRMOkmhsikCDWXdkC07zbCkCAwEAAaNdMFswHQYDVR0OBBYEFG2dqJIPVRHa
-			DyG6RRTY6sTB055EMDoGA1UdEQQzMDGCC2lkcHY0Lmx1LnNlhiJodHRwczovL2lk
-			cHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBgQCPmSd7
-			8LmOdb6nyu+enxNaZEFg1TDOV7JCcCJUqsRyQBoWlTezGlZWhoQ7bAvhtZVyjkwV
-			BGSHklHdzGwXv3R37CVY012QVJD1mmj+OOjMi6OZJ+emKyOO/TeSlET3m5XNmoJd
-			Oya3ofYYRYgdYQI0KAvfTtJe3fk5zSmnWR9dw2KUm7XB63HPFoDaK+PWO+46x0wR
-			gdcXF4i8LqaLlijDxRECpIWtYdGxYDDFVNYXPSR/E6WhP0OkCHJpMyW3uhN+KzNW
-			p5ZLpI8YZPJikKtAdJOl/GhUDYP0+UBecIs6PAbAkcoqcr6CRhpCZn6CPa4Dyiyq
-			3XVu2CGPUhYtXsRYtkJGu7FOMKYoGvm2W6KUwE5A5nR3kFguCbjaYmDTm6fRvO19
-			UHOkhlkwi7FZQRIfICn4GPW8+QlSvrCt5IVSMr+tdMlXbhxfDBnMG96bRp8UzGDq
-			qLV+J6JXH5Uyx9L2sLDwlsKDxMxakoPYZidS3VUZgydMQ77LkW6nrfeE6QY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-			MIIEGDCCAoCgAwIBAgIVAPacJ0kuXSIr9hVPqts20i1hXvnpMA0GCSqGSIb3DQEB
-			CwUAMBYxFDASBgNVBAMMC2lkcHY0Lmx1LnNlMB4XDTIwMDQyMjEyNTc0NloXDTQw
-			MDQyMjEyNTc0NlowFjEUMBIGA1UEAwwLaWRwdjQubHUuc2UwggGiMA0GCSqGSIb3
-			DQEBAQUAA4IBjwAwggGKAoIBgQCEdojjsZjgcD+FETx5Jz9vqfCVdvED2+uujbt0
-			hS0crcUjGSlbvvSq/edcxNytITYVb/XKgbrvFtP46j8fhEgpzBvpnjXL/KxIwoGt
-			4908I+hNqEByBsXA3CPxZ13Y9z9wuxl4K/A0NLOAA7W74FJB33Xh1LpZUSiRP4Am
-			zzW74k0vcLbSacwno2GSopOfnuFj2EjEcwCh0HSvKDglpQfaKAarPYQMGlBJSjeN
-			TX6bs4pkyqnUB5R5l38wOrBHwE6oqKXqWBARRqmFD6qTzAq3OiVVo5t7FMwPSH7r
-			ue+K3EM6dG4E0Wmp2KVwwpu4whhLSlRSg5FEpMdW2fMzDxaaMsxZWuedV32NXYpc
-			tAnS3r3VqcuE2L0GMs4H7Xy8dbDsO0kcOWs4avQnZe4gay2lFXzyQbGkbkGrw+e9
-			l+jdTmurLmxy69P4xgJUpW4Fb1S1cn/yXPe16D7LW9DWDXlhZnHc6LHh5t6shnE7
-			g96vckx9apGdPKco2Zbz67WtDHMCAwEAAaNdMFswHQYDVR0OBBYEFCbme+8q4WRW
-			RcMDwrZuHgNZ2nsKMDoGA1UdEQQzMDGCC2lkcHY0Lmx1LnNlhiJodHRwczovL2lk
-			cHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBgQB8iLyd
-			Ahx6hglEmnYEXjbaD47m6cOcdRhtkLailVusIHfUcBZXJifZrHKP0EaLBuvXQ+CM
-			4AzO00J2IU5Iv4KMadVWu8PFn8de1kVNN/2fcMfYCscWJ6kgvnxZZ0KsWFQm9XC+
-			5bkq2UQsTZLETCyT7da6F4BCAQfy5lKaLFF7e6JUQbnA/6+B3mLFE29y2EJnDifR
-			vZ9AKP+9S4oGnavxczUtT7uIJhkzuTBj2SqdUOPRlj9eu3bCHQ9k0GEv9Uoo+Phh
-			h1siurnjmkHQHZxz6Jn4FEf5mLKhxFoyKET8gL3ueLRKIKmFrYXp/Y1OyI7jaHBB
-			4+JMu3921iPKiXqFVPu/pPdUFroyF6qklOAdVUhNsKNuV7R3X4v+QijNWxL0aE9Z
-			Qj27T8aBUjh/SiMdgRBpEdnIABtBBOiznZQPAHQPeYIuE9ZFwtSto5LHXLuCPTsd
-			GrCh3rUTEojgrcUQEW3DV3dOkFRG0WkIKbZfrs5gwb1bqjpVhle488QNBzc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv4.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv4.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv4.lu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv4.lu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv4.lu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://idpv4.lu.se/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://idpv4.lu.se/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-			MIIEGDCCAoCgAwIBAgIVAKdIP7eMddg3zDrWrc+09WAj2x7AMA0GCSqGSIb3DQEB
-			CwUAMBYxFDASBgNVBAMMC2lkcHY0Lmx1LnNlMB4XDTIwMDQyMjEyNTgzMloXDTQw
-			MDQyMjEyNTgzMlowFjEUMBIGA1UEAwwLaWRwdjQubHUuc2UwggGiMA0GCSqGSIb3
-			DQEBAQUAA4IBjwAwggGKAoIBgQCvHmABYJf9A/WJ5+cUcWp9dTSfMZQZHJ+z7B04
-			J+H133U7VP7jBHl36XL2CEdl7G0eCbk01Cw7IbkcIaQwLa3dJGgADMM8Lh0iE/BE
-			4YG1p779QdZU77ZT/91FDsXn/B9qsY0NsYxWCvxUN52qX7+a9ZgW35xEfMDEF6ZW
-			R3Bll3VZyqwtYbE7jU/f0ujyRFmntYl3dGMRamlzu9o7+sXLi1xlceJMWWADh63O
-			eNGWm2XKWeGtmGyyyeo8mQbDBZNmS6K5WEIznhzXPJfbwMlXrLye041/r2kppB+Y
-			4nISfL6S1IuPObw0HM9kosBlrwZFjP++Wodmt6OHXiHLbKA2rj/Jxt7BpxIGM5It
-			7cEFAn6J/5MvsqGmWVLnCMPF1vzq866oQdDLfNJXCbyOgvPDPnw/Zl6bb3qYx5Kk
-			PvQsTMK36e8zB/pFrzagSgbFkYQuUA+KNBgIpgeMO3bpoRZ4S7wc0Vq7JShJ9fBQ
-			uP6NtJw6iTehHMDFTn8kbU9LxnECAwEAAaNdMFswHQYDVR0OBBYEFMUWZ/DnrU5S
-			unY+y/Upo+dVljnpMDoGA1UdEQQzMDGCC2lkcHY0Lmx1LnNlhiJodHRwczovL2lk
-			cHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBgQALwnh8
-			uEl9xWrin4vPLm+Mc0THPPVaeGZF1ivyDcY5WefOXaxaX80BxHKOcA2aG/+Ne/Ko
-			k9u1COHrjp3QfkHE2SQTAPoD4EWtHaiCyoBYnwRA1qfSFbcnVlZOr9IOIRAA6TiS
-			iE+G4kf9QW/xUSmONPGLU8vqXuisxTr46XjQMbl+dtTZ5fxURKFFv21C0KBXMkLI
-			xSzTTn9Q0acVT07oNgNQscJtWtStXbsrEhQ9+uyEd3xCF883BjpF4nDDtLOo0jXD
-			iyhJcGU4fKD4MMeREoKb+OKLpCqE+8BdmO93kMJLrbdS1EPIlVG1fShtJCeF40EL
-			C4Ns9OOYE0uD7tQG4oQQht3WFSiS95Plylg62BGqk5LpwODuDpuO7tqZkLbI5gN1
-			7S98DoMZftlEg8leJv1NuaBIKD/C/WI6OPAqVmBCckb6R8eGU7yGGc2i2qZ9yC2r
-			3SMS6VsKOZJv77OE9yzH7JF8aKjaSNHu1lpP42IG/hmrAgNjQMTbXFyni5o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-			MIIEGDCCAoCgAwIBAgIVALae7VoaIcI/4rrT+/szHHki9TuEMA0GCSqGSIb3DQEB
-			CwUAMBYxFDASBgNVBAMMC2lkcHY0Lmx1LnNlMB4XDTIwMDQyMjEyNTc0NVoXDTQw
-			MDQyMjEyNTc0NVowFjEUMBIGA1UEAwwLaWRwdjQubHUuc2UwggGiMA0GCSqGSIb3
-			DQEBAQUAA4IBjwAwggGKAoIBgQCzN4NFUJ5I2R08SllQy3zS5Gc4WBPx0R+wE6/w
-			QpU1QaQF41/BHzY7fwS/rVABmv/RsBLVe35h3yTuKo4pEQ3LkWhQEhaxkKOGaUNR
-			Z+bonBFjhAlTqwLYcC6StE59POkaQc2MLiVJcBsW64kYk6ENYTCJC287k7C9YjwK
-			o2rpyvG4ZAY50Cv0pMvB0eLaCJIG1ypwbU1TakUYsoR0Dl2j7DWkh899hyKJKbOj
-			xosvWqfZ7g3bT8II7VMTai4Y0jT0yO2SIRe4oT3/veISYeJgxNI/jvGbFdD1s7nL
-			4J+QamCRGQo5stasOdTMzXpWdlW87hB8/22qWNgEQ98B97fZmM3FT4aUPN+07tJe
-			4lPJADf4PTLs3uqSqRQ5nQZKkQp1hc7L0Qnl4dPdlYdgqBOJiJT80dkfH6/4nldV
-			Mn/817W8X27/yXII39Rmrq9C2fvCT4QGMuebkYaCYZ6bvYQfDGSUkwY2oaffKxQL
-			qWDcTRMOkmhsikCDWXdkC07zbCkCAwEAAaNdMFswHQYDVR0OBBYEFG2dqJIPVRHa
-			DyG6RRTY6sTB055EMDoGA1UdEQQzMDGCC2lkcHY0Lmx1LnNlhiJodHRwczovL2lk
-			cHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBgQCPmSd7
-			8LmOdb6nyu+enxNaZEFg1TDOV7JCcCJUqsRyQBoWlTezGlZWhoQ7bAvhtZVyjkwV
-			BGSHklHdzGwXv3R37CVY012QVJD1mmj+OOjMi6OZJ+emKyOO/TeSlET3m5XNmoJd
-			Oya3ofYYRYgdYQI0KAvfTtJe3fk5zSmnWR9dw2KUm7XB63HPFoDaK+PWO+46x0wR
-			gdcXF4i8LqaLlijDxRECpIWtYdGxYDDFVNYXPSR/E6WhP0OkCHJpMyW3uhN+KzNW
-			p5ZLpI8YZPJikKtAdJOl/GhUDYP0+UBecIs6PAbAkcoqcr6CRhpCZn6CPa4Dyiyq
-			3XVu2CGPUhYtXsRYtkJGu7FOMKYoGvm2W6KUwE5A5nR3kFguCbjaYmDTm6fRvO19
-			UHOkhlkwi7FZQRIfICn4GPW8+QlSvrCt5IVSMr+tdMlXbhxfDBnMG96bRp8UzGDq
-			qLV+J6JXH5Uyx9L2sLDwlsKDxMxakoPYZidS3VUZgydMQ77LkW6nrfeE6QY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-			MIIEGDCCAoCgAwIBAgIVAPacJ0kuXSIr9hVPqts20i1hXvnpMA0GCSqGSIb3DQEB
-			CwUAMBYxFDASBgNVBAMMC2lkcHY0Lmx1LnNlMB4XDTIwMDQyMjEyNTc0NloXDTQw
-			MDQyMjEyNTc0NlowFjEUMBIGA1UEAwwLaWRwdjQubHUuc2UwggGiMA0GCSqGSIb3
-			DQEBAQUAA4IBjwAwggGKAoIBgQCEdojjsZjgcD+FETx5Jz9vqfCVdvED2+uujbt0
-			hS0crcUjGSlbvvSq/edcxNytITYVb/XKgbrvFtP46j8fhEgpzBvpnjXL/KxIwoGt
-			4908I+hNqEByBsXA3CPxZ13Y9z9wuxl4K/A0NLOAA7W74FJB33Xh1LpZUSiRP4Am
-			zzW74k0vcLbSacwno2GSopOfnuFj2EjEcwCh0HSvKDglpQfaKAarPYQMGlBJSjeN
-			TX6bs4pkyqnUB5R5l38wOrBHwE6oqKXqWBARRqmFD6qTzAq3OiVVo5t7FMwPSH7r
-			ue+K3EM6dG4E0Wmp2KVwwpu4whhLSlRSg5FEpMdW2fMzDxaaMsxZWuedV32NXYpc
-			tAnS3r3VqcuE2L0GMs4H7Xy8dbDsO0kcOWs4avQnZe4gay2lFXzyQbGkbkGrw+e9
-			l+jdTmurLmxy69P4xgJUpW4Fb1S1cn/yXPe16D7LW9DWDXlhZnHc6LHh5t6shnE7
-			g96vckx9apGdPKco2Zbz67WtDHMCAwEAAaNdMFswHQYDVR0OBBYEFCbme+8q4WRW
-			RcMDwrZuHgNZ2nsKMDoGA1UdEQQzMDGCC2lkcHY0Lmx1LnNlhiJodHRwczovL2lk
-			cHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBgQB8iLyd
-			Ahx6hglEmnYEXjbaD47m6cOcdRhtkLailVusIHfUcBZXJifZrHKP0EaLBuvXQ+CM
-			4AzO00J2IU5Iv4KMadVWu8PFn8de1kVNN/2fcMfYCscWJ6kgvnxZZ0KsWFQm9XC+
-			5bkq2UQsTZLETCyT7da6F4BCAQfy5lKaLFF7e6JUQbnA/6+B3mLFE29y2EJnDifR
-			vZ9AKP+9S4oGnavxczUtT7uIJhkzuTBj2SqdUOPRlj9eu3bCHQ9k0GEv9Uoo+Phh
-			h1siurnjmkHQHZxz6Jn4FEf5mLKhxFoyKET8gL3ueLRKIKmFrYXp/Y1OyI7jaHBB
-			4+JMu3921iPKiXqFVPu/pPdUFroyF6qklOAdVUhNsKNuV7R3X4v+QijNWxL0aE9Z
-			Qj27T8aBUjh/SiMdgRBpEdnIABtBBOiznZQPAHQPeYIuE9ZFwtSto5LHXLuCPTsd
-			GrCh3rUTEojgrcUQEW3DV3dOkFRG0WkIKbZfrs5gwb1bqjpVhle488QNBzc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv4.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.lu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>LU IdP administrators</md:GivenName>
-    <md:EmailAddress>mailto:idpadmin@epic.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LU Servicedesk</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IRT Lund University</md:GivenName>
-    <md:EmailAddress>mailto:abuse@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LU IdP administrators</md:GivenName>
-    <md:EmailAddress>mailto:idpadmin@epic.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index fbb49c94..00000000
--- a/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://imogen.surfnet.nl/proxy/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-07-02T09:50:20Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SURFconext test proxy</md:ServiceName>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bas</md:GivenName>
-    <md:SurName>Zoetekouw</md:SurName>
-    <md:EmailAddress>mailto:bas.zoetekouw@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml b/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml
deleted file mode 100644
index a1467092..00000000
--- a/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://inacademia.org/metadata/inacademia-simple-validation.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-10T18:49:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>any</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">InAcademia Affiliation Validation Service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">InAcademia Affiliation Validation Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">InAcademia validates the academic affiliation assigned to users by home institutions. This data is provided in pseudonymised form to registered services that request it.</mdui:Description>
-        <mdui:Description xml:lang="de">InAcademia prüft die akademische Zugehörigkeit die Heimatuniversitäten Anwendern zugewiesen haben. Diese Daten werden auf Anforderung in pseudonymisierter Form an registrierte Services weitergeleitet.</mdui:Description>
-        <mdui:Keywords xml:lang="en">Academic Affiliation Validation</mdui:Keywords>
-        <mdui:Keywords xml:lang="de">Academic Affiliation Validation</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="75" width="276">https://inacademia.org/wp-content/uploads/2019/10/inacademia_logo_main.png</mdui:Logo>
-        <mdui:Logo xml:lang="de" height="75" width="276">https://inacademia.org/wp-content/uploads/2019/10/inacademia_logo_main.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://inacademia.org/about</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">https://inacademia.org/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://inacademia.org/privacy-statement/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="de">https://inacademia.org/privacy-statement/</mdui:PrivacyStatementURL>
-        <mdui:Description xml:lang="sv">InAcademia validerar den akademiska tillhörighet som lärosätet tilldelats användaren.  Dessa uppgifter tillhandahålls i pseudonymiserad form till registrerade tjänster som begär det.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="75" width="276">https://inacademia.org/wp-content/uploads/2019/10/inacademia_logo_main.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="sv">InAcademia Affiliation Validation Service</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://inacademia.org/about</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">Academic Affiliation Validation</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://inacademia.org/privacy-statement/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFrzCCA5egAwIBAgIJAJ7He1WDjB6qMA0GCSqGSIb3DQEBCwUAMG4xCzAJBgNV
-                        BAYTAkVVMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApJbkFjYWRlbWlh
-                        MRwwGgYDVQQLDBNTaWduaW5nIENlcnRpZmljYXRlMRcwFQYDVQQDDA5pbmFjYWRl
-                        bWlhLm9yZzAeFw0xNzA3MDUxNjIxNDNaFw0yNzA3MDMxNjIxNDNaMG4xCzAJBgNV
-                        BAYTAkVVMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApJbkFjYWRlbWlh
-                        MRwwGgYDVQQLDBNTaWduaW5nIENlcnRpZmljYXRlMRcwFQYDVQQDDA5pbmFjYWRl
-                        bWlhLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5A2uV67ia4
-                        FD5vvzZiNsP5XcdaSxqkDxzf+zC4JfnY+2xRsxdCtznxCc1dfsrT4dbg/xfXfced
-                        Fxz0GcNIXM6eQkxFUztUbIgkKjt8m2wsDHiByiG7b3PtAqh+ZozttDW5cKNMf67c
-                        2qWS6g0/ZqDhGuyEVYpRVmFpKJ56/yGvSle5QLV2u/TEhJCt8z/4/EZdzjEY6ljb
-                        M/LCbfPyJHgiPJZf6+oKvKVQrdixe88/Jy+ISRCGWoCyhs1LHLqs/17nK4huej/w
-                        dmzn/e5Md6OFxnb6sJkNUmb3wCWyi03KJCR4W/I2LX0BKR38yQAf2YKaU2a77UN8
-                        WYTDfgjyW8WbqTpZ85S3l1WKJ2dEiTiIvAfoodSgRye0YVBcZtcleMT+MAmZBKp7
-                        TsBuCS78CZ7kr9BEKkR5c8bvjkCvcUzJK84WAdX2vsazhnF5oUT1QNeNe2LF51OD
-                        VTQOPvDuI3upEJuZtQiHAKHvlApzm68LqtB+QI7YEqisMBu0q5xs8WSMEHakJa0y
-                        cWEQPYaALZP09h06OSuUXWdXDFgJn9APDWEXtjZJq9zD/1E0cMjVm7cGpmAmH/Cv
-                        9CfXL3YzYV25doENWiYP3AibLvs7RueYjr0iWpLZmi15tBgu3c991PkI2zx1n/uD
-                        YHBMzLvjBSr72Tt4QigWMLVQR6PEDMONAgMBAAGjUDBOMB0GA1UdDgQWBBS2ESl6
-                        idHz81HR/aAzMpc+wG+HLzAfBgNVHSMEGDAWgBS2ESl6idHz81HR/aAzMpc+wG+H
-                        LzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAlf6ttaoNN00b8PQS4
-                        qsbuFIa/pxOKIRnchIMXWB1L/+0I5zdupkZ2Uumy6iunfpvNpWjrTY1hLZa+HtOD
-                        Bquxan6QUm4+dmkfg1y0tzseZiKj2ZLy8wxsrLLf+q1EmHHKvuBDsn52OVWBZG/p
-                        BbLT/uCwJaM7AnfIppETpGL4DFCkFspeLY2mgLqfz9fMRLeJRgPyXamS2CuB/bbX
-                        GKCMlFjOKrRb1GNYu79IBNjKxIDnIV4IgqUhkTnRLqxfrexWQU9ANyCX/kexsAeU
-                        pOvzwgwR3iwu77ry9b3AtMGQ/26QsaMjeD0SbbrfJT5ffMKRgYk8Yp5MflEyWVfI
-                        tTbGHOCSaxyP7QL5hvlQMF+qqI/W6rLdj9PJ6OTH451btgiXPb/pv65Zq3F35BO6
-                        9k89e4vhzUDLeSGGfKqDoDSdhFJqjiHWQecAq6BCChDpdIz/U/S7aSkOi4MKxk5q
-                        kGC16780BusA1PbP9VmH6L18N9bYthe3zaVbYqMYiwIO9YvWWUe28q3OPUkfvSTa
-                        32k/sfrJ0o+irX+aRVDE/CWEu+ltlG9e3iXk/RLt/n2eimTbMrhnPI21D5jgXmh9
-                        zY91qGAJIzbynoNQ0cH6njsRUyfOiz/oVniEpxuoRj+TkXo6KuDIZQ930zli9LcL
-                        YFDRpeiG/ZuZFBXEc7xgyiIa+Q==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFrzCCA5egAwIBAgIJAJ7He1WDjB6qMA0GCSqGSIb3DQEBCwUAMG4xCzAJBgNV
-                        BAYTAkVVMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApJbkFjYWRlbWlh
-                        MRwwGgYDVQQLDBNTaWduaW5nIENlcnRpZmljYXRlMRcwFQYDVQQDDA5pbmFjYWRl
-                        bWlhLm9yZzAeFw0xNzA3MDUxNjIxNDNaFw0yNzA3MDMxNjIxNDNaMG4xCzAJBgNV
-                        BAYTAkVVMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApJbkFjYWRlbWlh
-                        MRwwGgYDVQQLDBNTaWduaW5nIENlcnRpZmljYXRlMRcwFQYDVQQDDA5pbmFjYWRl
-                        bWlhLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5A2uV67ia4
-                        FD5vvzZiNsP5XcdaSxqkDxzf+zC4JfnY+2xRsxdCtznxCc1dfsrT4dbg/xfXfced
-                        Fxz0GcNIXM6eQkxFUztUbIgkKjt8m2wsDHiByiG7b3PtAqh+ZozttDW5cKNMf67c
-                        2qWS6g0/ZqDhGuyEVYpRVmFpKJ56/yGvSle5QLV2u/TEhJCt8z/4/EZdzjEY6ljb
-                        M/LCbfPyJHgiPJZf6+oKvKVQrdixe88/Jy+ISRCGWoCyhs1LHLqs/17nK4huej/w
-                        dmzn/e5Md6OFxnb6sJkNUmb3wCWyi03KJCR4W/I2LX0BKR38yQAf2YKaU2a77UN8
-                        WYTDfgjyW8WbqTpZ85S3l1WKJ2dEiTiIvAfoodSgRye0YVBcZtcleMT+MAmZBKp7
-                        TsBuCS78CZ7kr9BEKkR5c8bvjkCvcUzJK84WAdX2vsazhnF5oUT1QNeNe2LF51OD
-                        VTQOPvDuI3upEJuZtQiHAKHvlApzm68LqtB+QI7YEqisMBu0q5xs8WSMEHakJa0y
-                        cWEQPYaALZP09h06OSuUXWdXDFgJn9APDWEXtjZJq9zD/1E0cMjVm7cGpmAmH/Cv
-                        9CfXL3YzYV25doENWiYP3AibLvs7RueYjr0iWpLZmi15tBgu3c991PkI2zx1n/uD
-                        YHBMzLvjBSr72Tt4QigWMLVQR6PEDMONAgMBAAGjUDBOMB0GA1UdDgQWBBS2ESl6
-                        idHz81HR/aAzMpc+wG+HLzAfBgNVHSMEGDAWgBS2ESl6idHz81HR/aAzMpc+wG+H
-                        LzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAlf6ttaoNN00b8PQS4
-                        qsbuFIa/pxOKIRnchIMXWB1L/+0I5zdupkZ2Uumy6iunfpvNpWjrTY1hLZa+HtOD
-                        Bquxan6QUm4+dmkfg1y0tzseZiKj2ZLy8wxsrLLf+q1EmHHKvuBDsn52OVWBZG/p
-                        BbLT/uCwJaM7AnfIppETpGL4DFCkFspeLY2mgLqfz9fMRLeJRgPyXamS2CuB/bbX
-                        GKCMlFjOKrRb1GNYu79IBNjKxIDnIV4IgqUhkTnRLqxfrexWQU9ANyCX/kexsAeU
-                        pOvzwgwR3iwu77ry9b3AtMGQ/26QsaMjeD0SbbrfJT5ffMKRgYk8Yp5MflEyWVfI
-                        tTbGHOCSaxyP7QL5hvlQMF+qqI/W6rLdj9PJ6OTH451btgiXPb/pv65Zq3F35BO6
-                        9k89e4vhzUDLeSGGfKqDoDSdhFJqjiHWQecAq6BCChDpdIz/U/S7aSkOi4MKxk5q
-                        kGC16780BusA1PbP9VmH6L18N9bYthe3zaVbYqMYiwIO9YvWWUe28q3OPUkfvSTa
-                        32k/sfrJ0o+irX+aRVDE/CWEu+ltlG9e3iXk/RLt/n2eimTbMrhnPI21D5jgXmh9
-                        zY91qGAJIzbynoNQ0cH6njsRUyfOiz/oVniEpxuoRj+TkXo6KuDIZQ930zli9LcL
-                        YFDRpeiG/ZuZFBXEc7xgyiIa+Q==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://op.srv.inacademia.org/InAcademiaBackend/acs/post" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">InAcademia Affiliation Validation Service</md:ServiceName>
-      <md:ServiceName xml:lang="de">InAcademia Affiliation Validation Service</md:ServiceName>
-      <md:ServiceName xml:lang="sv">InAcademia Affiliation Validation Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">InAcademia validates the academic affiliation assigned to users by home institutions. This data is provided in pseudonymised form to registered services that request it.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="de">InAcademia prüft die akademische Zugehörigkeit die Heimatuniversitäten Anwendern zugewiesen haben. Diese Daten werden auf Anforderung in pseudonymisierter Form an registrierte Services weitergeleitet.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">InAcademia validerar den akademiska tillhörighet som lärosätet tilldelats användaren. Dessa uppgifter tillhandahålls i pseudonymiserad form till registrerade tjänster som begär det.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">InAcademia operated by GÉANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="de">InAcademia operated by GÉANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">InAcademia operated by GÉANT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="de">InAcademia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">InAcademia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="de">https://inacademia.org/about</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://inacademia.org/about</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>InAcademia</md:GivenName>
-    <md:SurName>Enduser Support</md:SurName>
-    <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>InAcademia</md:GivenName>
-    <md:SurName>Administrative Support</md:SurName>
-    <md:EmailAddress>mailto:admin@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>InAcademia</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>InAcademia</md:GivenName>
-    <md:SurName>security Support</md:SurName>
-    <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/indico.fysik.su.se-Shibboleth.sso.xml b/swamid-2.0/indico.fysik.su.se-Shibboleth.sso.xml
deleted file mode 100644
index 65140451..00000000
--- a/swamid-2.0/indico.fysik.su.se-Shibboleth.sso.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://indico.fysik.su.se/Shibboleth.sso">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-11-29T07:48:19Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indico.fysik.su.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://indico.fysik.su.se/Shibboleth.sso/DS/Login" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indico.fysik.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Fysikum Indico</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Fysikum Indico</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Fysikum Indico</mdui:Description>
-        <mdui:Description xml:lang="en">Fysikum Indico</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.fysik.su.se/english</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.fysik.su.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.su.se/english/about-this-website-1.517563</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/om-webbplatsen-1.517562</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>0a416d5e9a75</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=0a416d5e9a75</ds:X509SubjectName>
-          <ds:X509Certificate>MIID6zCCAlOgAwIBAgIJAJyNQaITDFm4MA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDDBhNDE2ZDVlOWE3NTAeFw0xOTEwMTgxNDM5MTlaFw0yOTEwMTUxNDM5MTla
-MBcxFTATBgNVBAMTDDBhNDE2ZDVlOWE3NTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-ADCCAYoCggGBALb4QVy20idupUVhX/+6Jk19+j7nSHlHryN5J8gYvTfqg4D4uAmR
-GV40xw8vPecM1h9MlukA5r/IPmFd5s/pMSYChFLYbJoV9g9wf9diCV7ilI1N0UUA
-FTjkvlU56jHvi0EYsC34uCT1a7wZYD1zqWGSQh1HxKgOIP5F9+npP9HuC7vNhm75
-MK5oIuIxj75VXe71K65JytTLVb3hh/mrvn8CTvd2+KxZGPfdrRIl9uEs0mHsKrOG
-lFwrsv3QZxCq2r81EBb4vMnfOeEYnNt1wDvP61WO4P3v8Ypn3rs6cxTGji30gzi6
-SAce1UJcALtcgy7wrBrX++KDVdW6EeS3wRtVOge1rRcuuoJS7jDJjx6qQJOCLSp6
-RxFxxR3u7sZhe396X4eyyHJZmjjAYjyH0zHy6FBKuQhuNAmECkBGeveOUlKxmha6
-u0Eyn99yKAamHI8KmT22Cnh1Bt02ml5wknNJdCfAITT4Gerhq7xrd4fG/+/WqXXl
-UqhFSvJRERiLpwIDAQABozowODAXBgNVHREEEDAOggwwYTQxNmQ1ZTlhNzUwHQYD
-VR0OBBYEFIbW1iaf/h/OK98If8oScL8lKoGfMA0GCSqGSIb3DQEBCwUAA4IBgQAH
-tUwnPwA3DMhBFHbVeV9OF5GaQw1WpvFJlgILF0BOEHTman3jb8A5JTBSGbSRFtSq
-Wj8HEMagMgkZgx14MzbpMuCBrcDHjzssxS5XpSBnI3Lopeiya4mLkrQV0rOS7eE0
-rn/aix7xMW2E+TkyP0h8NR75Y4/ppioiTrcto/niZt7P9i1HnGiwqA1d/SoOmR7b
-5ck+GriMjJ4khS+ST1tNmcyLJOYZP4vUN2KUAMGFQozZIRKwiqc0A5p+hDHutf8m
-prEUCojQ4zzR9QEDNyAKKVFH7V3E3bNbTgIHO7smNAlwMXM58+j4Gzjuqn1lM25f
-y9uU5fJux0yHIp7ym00qf0VVOhsgevwjvunDkQkZuanEnlat787OxiezmV0L6jpm
-FwgoenLfYvwhMMTrLnihQgG7zjiDK7bJrnONepZURLDmrykmJ9ORWxgAbpttnIPK
-6iKMIADA4VXO/4J3d0nrRpWsfBKPWGo+JMw1+0BOyV1VlwzPb2SQqRQ2KITni7g=
-</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://indico.fysik.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.fysik.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.fysik.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.fysik.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.fysik.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.fysik.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stockholm Univerity</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fysikum, Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Fysikum, Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.fysik.su.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/fysikum/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Fysikum, Stockholms Universitet</md:SurName>
-    <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alex Kastanas</md:SurName>
-    <md:EmailAddress>mailto:kastanas@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Alex Kastanas</md:SurName>
-    <md:EmailAddress>mailto:kastanas@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/indico.nordu.net-mellon.xml b/swamid-2.0/indico.nordu.net-mellon.xml
deleted file mode 100644
index 0a9e2c1d..00000000
--- a/swamid-2.0/indico.nordu.net-mellon.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://indico.nordu.net/mellon">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-11-11T15:18:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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="en">Indico NORDUnet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="da">Indico NORDUnet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Indico NORDUnet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Indico NORDUnet is a meeting, workshop and conference collaboration service.</mdui:Description>
-        <mdui:Description xml:lang="da">Indico NORDUnet er en samarbejds platform til at arrangere møder, workshops og konferencer.</mdui:Description>
-        <mdui:Description xml:lang="sv">Indico NORDUnet är en mötes- och konferenssamarbetsservice.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://indico.nordu.net/privacy-statement/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEvTCCAqUCFA5ORy4xhWVYr4K0A+z+Wm6l3eoGMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGluZGljby5ub3JkdS5uZXQwHhcNMTkwOTAzMTM0MzU1WhcNMjkwOTAyMTM0MzU1WjAbMRkwFwYDVQQDDBBpbmRpY28ubm9yZHUubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz5qHznB3r03a/N9JLY28K+Lw7lnoke7dqRFSBWIkBB58NlH0MF/m/eL/gWnlOLNZfE9AfURWzGIbid6mrZUF/ZdrDcJFRq9zrQyCjE4kkxMxbwYAJsO/RUQyuiEmVYBHk8Y06MicHDa10TD5jyDgGIz+JjD5q6ZTrnhfos6o4la38Z5jNUV1y1LOeeGcD1sc8MWj0V7Wv/TjhWuTE7KHifdXEam27jwh/iXrHQeZm07GPj+vytUe9mPa+b+yr9b0brOaXOPYUkrugRRKZlG1tQLPxEq9HosnxPLG7xnUIsHUWUg4rK/ywz+FrGXKG6e5CHfjfSg8L3jNXGEgqCu9Ob1SRTTZeBMPvEhqhAy0kRmFy7aMu/yDueGR/VYJFwmdKV/XTCxy2lbMalFaVfpitckkRij+cik0i66ET2JHbxfsOd5dAVBRrbZ3NcwulbdWFl07OQaXmHJr6YX46eG65BgVaS/6Os0NQCu0+pidSPge4O1W5TN/C7LCLi4jYVeO/fQ7Qr2zEXrgVEHFAblbD26z0eVuHrcIzJbjfgB1x1+vIPmAq1QnkgXSC4oJDVNosMzyCRwF1RG0s9oHrUysMbNafwJgDMMaBJ4HRrXp8b1TbW8aOTOh+MyQTfO2Wb91nkwDaOTz5oUNZSei8YAj8iOo42hFTlW/IRr1lP7nEjUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAxP8ByZzJGuQD8FisLfbH1vctQwHFBB8lQBlONaTDVM48kKrIAcWFdgx4ocn/O4053mqulsk1Bgv05LbuUckuTmgcCi7NDOyPUDEfgkhMsDLxcFe3yf0Kx8SX3SEamfDHR+MVHZOU6MJWGcPZOqmD8gvUPKcRxm1o1xp9HJ91dhKzoHQYv5KMDcZTi5MbCH+cCzYGjPBDYLcB89h3f4Lpx4UqJ4HAfB30R5G+gHXu8vvrQs4nKI7AVI+I34d4XMHyb33+nEmoXRRJuVNOlEexSoGg9keSv2EqkrX/DBijiB3WPctrTXROQOVwNruAkdUF4jZpZdmmWFHyJwPIXAP2NTLeDZnyKygy+fntXxByI+hO92CmC2DOQKzvOPcH7apMV4nmgtQg8ioRjdzrKtcM0ZaEw3B5OLZmYiRaIjT6fYfyaauQGxUgHMeuhgVOYy0vra18nKBXupSXBc9LJhwK8hz69cZ04UkUFuhsDE8Ej2wD9NMKKI5xnrTNM93hHwxvsW5depOrvJY/NqDNJtFqxvlEpoouUevIF4dxuYn3ZQVCVAN2rlkqY7TYY+QG4Nhd+oWJgzKNlR5Ydqk12ODFSujq7L1eOZ7Lypb58jVn6OFlJ8+rup2kAfFZ9IZ9HkVnVoQPdv11zNbDrt03dOMTHgvdEfVmvp0UmfY+c+e24Y8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEvTCCAqUCFA5ORy4xhWVYr4K0A+z+Wm6l3eoGMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGluZGljby5ub3JkdS5uZXQwHhcNMTkwOTAzMTM0MzU1WhcNMjkwOTAyMTM0MzU1WjAbMRkwFwYDVQQDDBBpbmRpY28ubm9yZHUubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz5qHznB3r03a/N9JLY28K+Lw7lnoke7dqRFSBWIkBB58NlH0MF/m/eL/gWnlOLNZfE9AfURWzGIbid6mrZUF/ZdrDcJFRq9zrQyCjE4kkxMxbwYAJsO/RUQyuiEmVYBHk8Y06MicHDa10TD5jyDgGIz+JjD5q6ZTrnhfos6o4la38Z5jNUV1y1LOeeGcD1sc8MWj0V7Wv/TjhWuTE7KHifdXEam27jwh/iXrHQeZm07GPj+vytUe9mPa+b+yr9b0brOaXOPYUkrugRRKZlG1tQLPxEq9HosnxPLG7xnUIsHUWUg4rK/ywz+FrGXKG6e5CHfjfSg8L3jNXGEgqCu9Ob1SRTTZeBMPvEhqhAy0kRmFy7aMu/yDueGR/VYJFwmdKV/XTCxy2lbMalFaVfpitckkRij+cik0i66ET2JHbxfsOd5dAVBRrbZ3NcwulbdWFl07OQaXmHJr6YX46eG65BgVaS/6Os0NQCu0+pidSPge4O1W5TN/C7LCLi4jYVeO/fQ7Qr2zEXrgVEHFAblbD26z0eVuHrcIzJbjfgB1x1+vIPmAq1QnkgXSC4oJDVNosMzyCRwF1RG0s9oHrUysMbNafwJgDMMaBJ4HRrXp8b1TbW8aOTOh+MyQTfO2Wb91nkwDaOTz5oUNZSei8YAj8iOo42hFTlW/IRr1lP7nEjUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAxP8ByZzJGuQD8FisLfbH1vctQwHFBB8lQBlONaTDVM48kKrIAcWFdgx4ocn/O4053mqulsk1Bgv05LbuUckuTmgcCi7NDOyPUDEfgkhMsDLxcFe3yf0Kx8SX3SEamfDHR+MVHZOU6MJWGcPZOqmD8gvUPKcRxm1o1xp9HJ91dhKzoHQYv5KMDcZTi5MbCH+cCzYGjPBDYLcB89h3f4Lpx4UqJ4HAfB30R5G+gHXu8vvrQs4nKI7AVI+I34d4XMHyb33+nEmoXRRJuVNOlEexSoGg9keSv2EqkrX/DBijiB3WPctrTXROQOVwNruAkdUF4jZpZdmmWFHyJwPIXAP2NTLeDZnyKygy+fntXxByI+hO92CmC2DOQKzvOPcH7apMV4nmgtQg8ioRjdzrKtcM0ZaEw3B5OLZmYiRaIjT6fYfyaauQGxUgHMeuhgVOYy0vra18nKBXupSXBc9LJhwK8hz69cZ04UkUFuhsDE8Ej2wD9NMKKI5xnrTNM93hHwxvsW5depOrvJY/NqDNJtFqxvlEpoouUevIF4dxuYn3ZQVCVAN2rlkqY7TYY+QG4Nhd+oWJgzKNlR5Ydqk12ODFSujq7L1eOZ7Lypb58jVn6OFlJ8+rup2kAfFZ9IZ9HkVnVoQPdv11zNbDrt03dOMTHgvdEfVmvp0UmfY+c+e24Y8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.nordu.net/mellon/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.nordu.net/mellon/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.nordu.net/mellon/postResponse"/>
-    <md:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.nordu.net/mellon/artifactResponse"/>
-    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.nordu.net/mellon/paosResponse"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Indico NORDUnet</md:ServiceName>
-      <md:ServiceName xml:lang="da">Indico NORDUnet</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Indico NORDUnet</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Indico NORDUnet is a meeting, workshop and conference collaboration service.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">Indico NORDUnet er en samarbejds platform til at arrangere møder, workshops og konferencer.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Indico NORDUnet är en mötes- och konferenssamarbetsservice.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>mailto:sei@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/indico.uu.se-shibboleth.xml b/swamid-2.0/indico.uu.se-shibboleth.xml
deleted file mode 100644
index d2bc0711..00000000
--- a/swamid-2.0/indico.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://indico.uu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-12-08T13:26: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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
-        <samla:AttributeValue>https://refeds.org/sirtfi</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indico.uu.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://indico.uu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar.</mdui:Description>
-        <mdui:Description xml:lang="en">Indico is an event management system for meetings, conferences and lectures.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="52" width="196">https://indico.uu.se/images/logo_indico.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="52" width="196">https://indico.uu.se/images/logo_indico.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://indico.uu.se/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://indico.uu.se/static/custom/privacy-policy-en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://indico.uu.se/static/custom/privacy-policy-sv</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://indico.uu.se/about</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>indico.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=indico.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID6zCCAlOgAwIBAgIJAKx2XCsmViuCMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDGluZGljby51dS5zZTAeFw0xNjExMjQxMjQ5MjFaFw0yNjExMjIxMjQ5MjFa
-MBcxFTATBgNVBAMTDGluZGljby51dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-ADCCAYoCggGBALjMMPXhMYcxfgSGSyfl+dSpnyOfYB7rFQQRy0ulOMAWrjOlLmtD
-QAfxsh/4liVGsJEBNx9P/nX9iwsp7HPlaUYszincN1oLp86RTovg0rvhUV8FQVB4
-9AvlPutKnxuI3cIwE4lbHlmk5qrTShyX1snPlYUEMmscW/naiWsXTRAbcUzG3FTo
-hfzluac6KN3zLp1Db/7atElFED0mFLYI0G/ANUCXbIsFJ8kMr/0rYSZ1fUVwqSCL
-T/l+8ft5ViEp8I7M7o8454LQGvMXZoCtQcdVfKWzaf44H6nhXFqnV8y/ZnUUdY4Y
-NZwPS9GcAsxyUd9UdVTHiVccCyf4pJEAGWPpjnxzervyACwDPk2mNWiVAoEVrWIY
-8c1qg5tPI+DSU6a3X9sx+SZsx58R/sinNnRzcIDrJ6egSibOfNd9kLW0fL/bctfy
-d3E0eQf+F7ctWedbrSiJHGK3wGwWlP+SulVTgxnTD11tEe5OyPxoiIBeZamjMPIM
-JQOmoeoIWWuh5wIDAQABozowODAXBgNVHREEEDAOggxpbmRpY28udXUuc2UwHQYD
-VR0OBBYEFP6PZrTeByfio/pWGzRr9jxz3nZ2MA0GCSqGSIb3DQEBCwUAA4IBgQBT
-9NM+TG9b7XcDxZ7PP09BJnbLyypdJaxwipcLFN/DrE133cQ84ngcBJrhN+IIpsQG
-tQH7k326CeOPURNFh/QrQoyvGx4aGawzmVyGjDKBa1DyIYMpiXlLc9AGAYNbTnH+
-1VwriPYuD91nzNz/IXDJhwBeSfztxs9GuBoxBQdRh0VmkTnDxD3zWf68pcdtDke1
-WX7mIGG5OIrJwwKEE7TVD2Ntvnn07VkYsC6OZGFl7xwmobezymHoCc14FXbUApSn
-xCbvpiqcEpHZGzPNB3bvBdglYiKFbvq95oYgHrVn2hsFx4b0Eu06aWCHdXO61n5Y
-81yET16MCeVzu/zece86QUX9TNapu/63XH3s00uC5rEMvwUnJRAwubGE4LESs364
-mBuS8hsaMu5++ZZgUiIVUSKRcMaoGOG4/qGni3P0IJlmSNPh08Ba3F3pPXbed3eO
-S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
-</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://indico.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indico.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indico.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Indico</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Indico</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Operations</md:GivenName>
-    <md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Roger</md:GivenName>
-    <md:SurName>Ruber</md:SurName>
-    <md:EmailAddress>mailto:roger.ruber@physics.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Roger</md:GivenName>
-    <md:SurName>Ruber</md:SurName>
-    <md:EmailAddress>mailto:roger.ruber@physics.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml b/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
deleted file mode 100644
index 692cfebb..00000000
--- a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://kantarainitiative.org/confluence/plugins/servlet/samlsso">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-08-28T16:27:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Kantara Initiative</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Kantara Initiative is the global consortium improving trustworthy use of identity and personal data through innovation, standardization and good practice.</mdui:Description>
-        <mdui:Logo xml:lang="en" height="76" width="220">https://kantarainitiative.org/confluence/download/attachments/2293776/global.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIGAV4lG7wQMA0GCSqGSIb3DQEBCwUAMFUxUzBRBgNVBAMMSlNBTUwgU2lu
-Z2xlU2lnbk9uIGNlcnRpZmljYXRlIGZvciBodHRwczovL2thbnRhcmFpbml0aWF0aXZlLm9yZy9j
-b25mbHVlbmNlMB4XDTE3MDgyNzE5MTIwOFoXDTI3MDgyNzE5MTIwOFowVTFTMFEGA1UEAwxKU0FN
-TCBTaW5nbGVTaWduT24gY2VydGlmaWNhdGUgZm9yIGh0dHBzOi8va2FudGFyYWluaXRpYXRpdmUu
-b3JnL2NvbmZsdWVuY2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYi+o/GuShdvBc
-Ng+I4OSlanZFbSreyO6woEZWkP0aGcMO9BrP/Xmu1fY3qgBy48CMsSeps1YoO7JekQL91/Aj/BX8
-qVdQKArh3raI7brfd+h8+BJj7dSrNrr40tgNOfJfNEOsfmRxHTRmmyJkHFtaHbXxb+3kGtqtzoee
-qEL9DnTHu3aE/S3i2cUAIeObicU2qiGvjwdOUeA7wCMVuper9LpZdG8+NPIAO0V73LCIsiZRMH++
-U2LzaqgfKbKq9bt6kIRFa/JodPUBlvt66itmz+v7OkTIgYFNs+qRqYjIh9glpFtdW8Z8PX9LGizI
-m49D5SBs1t+fPdih2FzalP6zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJOCbWJdr9glMdTWKQm4
-VggzxPk8I6mGWfLnKo88q0cPgdagQ5WSYaecQBfc8doUwRXOuoyq+mt8TwQjCT4N/6ad3NhhREfL
-WUMFghUG9S3jFrGxfW9cWktM/LlkF4Wg474ycKs042Ep34R5siHx3Cw+d6pHJt5sia71GfgO4FFk
-t2X18TWpJkTIRFlgxNz+7masn+UuAv3xNZrUSYe2YtlTjqRIPBP5wrKWE01a7ZdzOP7S1UvTjiDW
-PMS4rjAWc41dsrr8CuH3t/NKbvDc9Rn6U+qLGttLcJ1Jlpw2i3fPGGJ+osSsX9+h3KUdLv9j7zJB
-8mDgzdNKONIVTEQ7YsQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIGAV4lG7wQMA0GCSqGSIb3DQEBCwUAMFUxUzBRBgNVBAMMSlNBTUwgU2lu
-Z2xlU2lnbk9uIGNlcnRpZmljYXRlIGZvciBodHRwczovL2thbnRhcmFpbml0aWF0aXZlLm9yZy9j
-b25mbHVlbmNlMB4XDTE3MDgyNzE5MTIwOFoXDTI3MDgyNzE5MTIwOFowVTFTMFEGA1UEAwxKU0FN
-TCBTaW5nbGVTaWduT24gY2VydGlmaWNhdGUgZm9yIGh0dHBzOi8va2FudGFyYWluaXRpYXRpdmUu
-b3JnL2NvbmZsdWVuY2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYi+o/GuShdvBc
-Ng+I4OSlanZFbSreyO6woEZWkP0aGcMO9BrP/Xmu1fY3qgBy48CMsSeps1YoO7JekQL91/Aj/BX8
-qVdQKArh3raI7brfd+h8+BJj7dSrNrr40tgNOfJfNEOsfmRxHTRmmyJkHFtaHbXxb+3kGtqtzoee
-qEL9DnTHu3aE/S3i2cUAIeObicU2qiGvjwdOUeA7wCMVuper9LpZdG8+NPIAO0V73LCIsiZRMH++
-U2LzaqgfKbKq9bt6kIRFa/JodPUBlvt66itmz+v7OkTIgYFNs+qRqYjIh9glpFtdW8Z8PX9LGizI
-m49D5SBs1t+fPdih2FzalP6zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJOCbWJdr9glMdTWKQm4
-VggzxPk8I6mGWfLnKo88q0cPgdagQ5WSYaecQBfc8doUwRXOuoyq+mt8TwQjCT4N/6ad3NhhREfL
-WUMFghUG9S3jFrGxfW9cWktM/LlkF4Wg474ycKs042Ep34R5siHx3Cw+d6pHJt5sia71GfgO4FFk
-t2X18TWpJkTIRFlgxNz+7masn+UuAv3xNZrUSYe2YtlTjqRIPBP5wrKWE01a7ZdzOP7S1UvTjiDW
-PMS4rjAWc41dsrr8CuH3t/NKbvDc9Rn6U+qLGttLcJ1Jlpw2i3fPGGJ+osSsX9+h3KUdLv9j7zJB
-8mDgzdNKONIVTEQ7YsQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kantarainitiative.org/confluence/plugins/servlet/samlsso" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Kantara Initiative Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Kantara Initiative Inc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://kantarainitiative.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Kantara Initiative</md:SurName>
-    <md:EmailAddress>mailto:info@kantarainitiative.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
deleted file mode 100644
index f3279d23..00000000
--- a/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://keystone-beta.cloud.ipnett.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-30T13:14:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute 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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IPnett Cloud Services Beta</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">IPnett Cloud Services Beta</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IPnett Cloud Services OpenStack</mdui:Description>
-        <mdui:Description xml:lang="sv">IPnett Cloud Services OpenStack</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" width="77" height="64">https://idp.cloud.ipnett.se/ipnett.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="77" height="64">https://idp.cloud.ipnett.se/ipnett.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-            BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
-            OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
-            ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
-            PYdXSY28N+u22x7Zpe+9tw/GA8ZqUY82loAk0tZ1m5erQNcW11USum8a8socSi0r
-            QDzHsratiV6s/+8pyp+NorwfONAx/tP5HdvDDWUhJFld6oo6fEhyxk7XIFyuz9Th
-            PkGls8CLphjPvUcvoBu86Uw0bBGC4+bmde5UiNN/8spCWB4IeAzWLNYtF81r9+wA
-            uDPqimL5u2SUH3INquU72oGg6brL+lGOkoFt162YQnBnN6fQEzVmLzvagdXGKw+m
-            /YTph+WnNEeOz2gV9Hhf5gyri3fPk1kXqGlO0w/F4UdTSIV7ypdW8NkrYCf7INbk
-            kETtWcxTjNYOEnL7AgMBAAGjUDBOMB0GA1UdDgQWBBRJBzbqYNaDlZW94WVGApLN
-            XtSrrjAfBgNVHSMEGDAWgBRJBzbqYNaDlZW94WVGApLNXtSrrjAMBgNVHRMEBTAD
-            AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAHw0OXubM7aFCCQal1ZQiNBMZnvePqzujg
-            Yn6c9IRNNMvax9w31hVOLWaE6Kpa++T6LppwI952y3wSqevDPf180dySQWtstziI
-            D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
-            MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
-            VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
-            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-            BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
-            OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
-            ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
-            PYdXSY28N+u22x7Zpe+9tw/GA8ZqUY82loAk0tZ1m5erQNcW11USum8a8socSi0r
-            QDzHsratiV6s/+8pyp+NorwfONAx/tP5HdvDDWUhJFld6oo6fEhyxk7XIFyuz9Th
-            PkGls8CLphjPvUcvoBu86Uw0bBGC4+bmde5UiNN/8spCWB4IeAzWLNYtF81r9+wA
-            uDPqimL5u2SUH3INquU72oGg6brL+lGOkoFt162YQnBnN6fQEzVmLzvagdXGKw+m
-            /YTph+WnNEeOz2gV9Hhf5gyri3fPk1kXqGlO0w/F4UdTSIV7ypdW8NkrYCf7INbk
-            kETtWcxTjNYOEnL7AgMBAAGjUDBOMB0GA1UdDgQWBBRJBzbqYNaDlZW94WVGApLN
-            XtSrrjAfBgNVHSMEGDAWgBRJBzbqYNaDlZW94WVGApLNXtSrrjAMBgNVHRMEBTAD
-            AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAHw0OXubM7aFCCQal1ZQiNBMZnvePqzujg
-            Yn6c9IRNNMvax9w31hVOLWaE6Kpa++T6LppwI952y3wSqevDPf180dySQWtstziI
-            D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
-            MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
-            VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
-            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keystone-beta.cloud.ipnett.se/Shibboleth.sso/Logout"/>
-    <md:AssertionConsumerService Location="https://keystone-beta.cloud.ipnett.se/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">IPnett Cloud Services OpenStack</md:ServiceName>
-      <md:ServiceName xml:lang="sv">IPnett Cloud Services OpenStack</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Technical Support (SafeSpring)</md:SurName>
-    <md:EmailAddress>mailto:iaas@cloud.ipnett.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/konto-test.test.hb.se-Shibboleth.xml b/swamid-2.0/konto-test.test.hb.se-Shibboleth.xml
deleted file mode 100644
index 80f42159..00000000
--- a/swamid-2.0/konto-test.test.hb.se-Shibboleth.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://konto-test.test.hb.se/Shibboleth">
-  <md:Extensions>
-    <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"/>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-11-22T11:58:31Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto-test.test.hb.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://konto-test.test.hb.se/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto-test.test.hb.se/Shibboleth.sso/DS/ds-test.swamid.se"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://konto-test.test.hb.se/Shibboleth.sso/DS/ds-test.swamid.se" index="2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto-test.test.hb.se/Shibboleth.sso/WAYF/shibboleth.antagning.se"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto-test.test.hb.se/Shibboleth.sso/WAYF/login.idp.eduid.se"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https:/konto-test.test.hb.se//Shibboleth.sso/https://hbidp-test.hb.se/idp/profile/Shibboleth/SSO"/>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Testserver for the application Konto, which provides identities at the University of Borås.</mdui:Description>
-        <mdui:Description xml:lang="sv">Testserver för applikationen Konto, som skapar identiteter på Högskolan i Borås.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Konto TEST</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Konto TEST</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp-test.ad.hb.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp-test.ad.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/TCCAmWgAwIBAgIJAJXxIZ8hzubRMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMTEmhic3AtdGVzdC5hZC5oYi5zZTAeFw0xODA4MTUxMDAzMDRaFw0yODA4MTIx
-MDAzMDRaMB0xGzAZBgNVBAMTEmhic3AtdGVzdC5hZC5oYi5zZTCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBAKpwRrE5j42Jku0JU5hbk/GISqjlSmZ5c5Xq
-a0zYBlZPdmYf4K3hVqeUZtK+f2MHE+RZ/M8Xe4ujBvi+KAebSK1f43b/A1+sTQ3Q
-VNuKHu2wNMOy/f/F5IOHaU3H97TG2dirI2hNasG/lQjheIzcrqPAZAlak+CbjAQe
-WNPuyeHtdab9yNllo51zefOt57e3+DfQRY5JOSasmEzhn7BD7Io6P8T4IqDE3viN
-j7uJDmjuEoMHQfXqXuBkNmdbpC/x43u9zOi6FLqjuLlUNNXeYbe6+JGWPHIZZWpw
-10EE52VUo/DqvUFLpW8DQx8dTTTuDVfpkWlNobY7DG6uMVz7KxlPPkzRojZdaU+Z
-IzeAoLgAMnLLf18hBkKdx6Kq/RDH5+4pJCo9y1os1o5tljH80p2+03+Z0rFkApnH
-4G3hnoXaDXnGfm3n0sSMjpvSQ3xhPH1fLHTfJD9IOYgNufWQqrX//61t/HVmoJZZ
-d0RPjU+uL2ahfVQNN4wZkFAYgSudLQIDAQABo0AwPjAdBgNVHREEFjAUghJoYnNw
-LXRlc3QuYWQuaGIuc2UwHQYDVR0OBBYEFETbzt7ILuBVhr6N12meu0FA6OrnMA0G
-CSqGSIb3DQEBCwUAA4IBgQAwjkyU1ADuMjfRiIfF2oHhKghlYyNyWI+UopYkuFS9
-QK+446eydGTRH+sp5LIoB6ylcm588Mn5uVmgNBNkqrEMXYOtbtN8hugfSAMuJTJj
-HEazh3eKpa/PYArmFotw4kLtgtVtYk6gRo6ZKtKXe+Vmgf+eFEbHMTn2i6fsDu7t
-9aDtZNzt1beSdU51awn8wn9jdD7aN9iT9GZ4RNAXU93UaFE+dy9EpC0nd0NNxsLn
-AJnEYrFEZus4XFG0aUGzcZReWQi5C/ryUmXeq93H/Dt82rKfWn/Jg4dKg33vu0Ol
-49WDxOfjUNFXTckw7SmDm2iKNwUZns7/E11Pvt/Sa/Kzo/xccO3dZ0ESLbhlL0sd
-cDAenuSelj4GWkExkn8JJu+Gf4tF454KHdjGHNv4760astFtWDLMcQwFgVW0CDXq
-9z5dsTa3vVJHsD7aUAtDd8TIECi1QmsknXZPEN9kyCYLN1b4+THk8NPw8lfeMA44
-WBZx2UHH2lrrPqfxaKVb5Hg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp-test01.test.hb.se</ds:KeyName>
-        <ds:KeyName>https://hbsp-test01.test.hb.se/idp/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp-test01.test.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCAyugAwIBAgIUbv+kwfKXyZfZfHE3c5/5BL6IMtcwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAxMWaGJzcC10ZXN0MDEudGVzdC5oYi5zZTAeFw0yMjEwMjEw
-ODM1MDdaFw0zMjEwMTgwODM1MDdaMCExHzAdBgNVBAMTFmhic3AtdGVzdDAxLnRl
-c3QuaGIuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCySumGjhEp
-jeo97oOk65Y8BvLQiIAULnd0fYwdvyxzAD8O7sM+DIJTevouyjVZoKv24D1s+L7r
-C6fnwoNNvisSm0QhLTzSoLb5awNlvXCOVQtr62pdfIHRzM9O3GZK5BegzdVzoE+t
-hv7DmupbT5rxwTvfnhm9VVcjWWtcNcQki1KGPplhTD/hWa9t/YesMV5jqiw0AHpO
-HrYRhDmrvgeLtSgEbPfrowmG1p8EDxgMdHWMxLvuY2W6gnPUoPCVW4pRFSEjd9i8
-rxpPArptnA19HWvxt2ff83WgNvJOG7QIkDhmIdfwjnWivVgcKRBo1ee7HF28oKNG
-H/oBrpWukNnSSEobViBaF4dAVxE4A6XOjiQ+fBXx/7jGLdL3S3fag5K2rds2N854
-m1MyYdkihnWk2G1qVHlotnaKiy3UY4KyUwV35J4IvpbQqLLZjxoeCoyCrhEQuy/S
-pTi/Ov2Ctwhb2Iy9Syo90yEEShFM+yud4/APOT/xkBummhWLmAR27isNOydK5LgN
-AWrVecFwmtaL9L8wKIxoeD6wMCO7jhvyHkAUUH6k036OToEebKGNyCpV2504aUuB
-qOby+uLtuZtuDxiy+RaQU27k+MnK/zaZIpgr0cUnAuo5/vX27P1tACQMpDPiBnV+
-F4HlS5O4XWWJY6yyP8qpMd1l/N+iw2ht4QIDAQABo3MwcTBQBgNVHREESTBHghZo
-YnNwLXRlc3QwMS50ZXN0LmhiLnNlhi1odHRwczovL2hic3AtdGVzdDAxLnRlc3Qu
-aGIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHeD7XcxviVnS3tGQaASdHts
-YjIrMA0GCSqGSIb3DQEBCwUAA4ICAQA9PBA8YElA0mYtS935zpEsN60CX3Tu0upe
-4aDoDYZhNH/V1PqDHJPVCTZmYuLOVQw/0qWvHe6IZgWEPjM4Xm+erqOf3x84iVLA
-my2CpSR11sfshCtkW6vUAGYniXglS6KvtHH518cqboQoCJPX/yWOvNtily2DB81E
-dhBZcvn0nEQFwRs504B0BL8jqiwfSto9M/yYR+UCh/3X6fsbvbL/3TrakXNsxrnk
-ajLG1hiopmVyk+sW9VojfDk7vV0UfKlbK0pc/cWWiRUCYY4Xy+yN8kn1xQWLtlKI
-Gze3r2cOqU+loP/7lub7coZyrM9PefU3/kEOIEe/eCfReGnE4tPYAF15zxQzOmvw
-lxDrHYDcP+WGKAz1rl2ltxK8XN0F+a6zxmWMjStK2dE1P7C9eqMIUlYKCRCz83Vn
-Ej/HK8kQih9KAgLxMzD5hKzEvGNcY2giGOek5UnQQcKoKYoKkn3sK5jAj2xRsG9H
-Zmvyp0w98SE4XztFQuXnOGbUsx213dBt07X0roYX2vJgBrIrXmZM53iOMiPYSL0Q
-esgKmZIr47ANPQyW8fR/Kzge8rVplf+YNcBqoQfFoLFujtUWYefNEDAy/h3rcE0b
-pSSKWfSGRNR1HV2zAlx0IcJxHz1Jw1s/6Mx7x96UnApvatqqg0BNuPFu1tbDtmOi
-MCmP/gJ2aw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp-test01.test.hb.se</ds:KeyName>
-        <ds:KeyName>https://hbsp-test01.test.hb.se/idp/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp-test01.test.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCAyugAwIBAgIUQT9mO0y6y74DTDhnpeyyTQFN4DYwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAxMWaGJzcC10ZXN0MDEudGVzdC5oYi5zZTAeFw0yMjEwMjEw
-ODM1MDFaFw0zMjEwMTgwODM1MDFaMCExHzAdBgNVBAMTFmhic3AtdGVzdDAxLnRl
-c3QuaGIuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC1DPXnpgcI
-9DTH4RiPGUJ1gCi9GmU+5Hr5Mal1XhunszKXuC/RcAlrC65pvyfuyG9MLT/C6CsD
-hXJSySOIDkk1GfU+rYZpjxoVG/Yh7Gb8wyD4jId2mPt7H3TqE6Q295gbQNuEURkF
-EPVgBoMWBXxMeqLqOaume0maFyWJx9au/MHNP/o47JfCrmYe2ZOlrKjd8x/vp1gc
-zWpwgi2+p2r7QfqfGytHydxdWg0iOOz9pZZ0DUvxXZfFLSOs+cCcJKGtCbr11Wf2
-D0oJSF2pQoU+ZZJKVmy1SHmeiXOVYzPcr7hrvX0mDOdWnt3ZHn9f4z/x9r4DIQVa
-zmPC/SQhRIHsalyHgR7cs1ohwXX3EwzlUsgW/FduPKclyPgeytOf+do2U+y5/GaW
-4L9wK4w9Z+p+mRsjK2s4kjmlHOoSyRLQDWudN04W/nhkPdp1j8juVWzi7jsfi1DU
-WROABtH1iqGyP5S+iLpSzJA/CJdMuj7ZPmUwM02lbTtV6DWwKG0dBF3M75VWNbKj
-xFOpDR0NXBCNEzfZmRGUK2Wm2pvyZQ/tpHCyf5ccvnqLeMOLmLgEkjZ0yKS9NZIh
-4FLfo3n7ulXnxx1qzx8DuapTHuw5iCO1bJnB9tuSjjqFbSNl+2qeJtzIPeaz2TjE
-DtcIez7mDyzoKmUpTTH5XQu55bF2HNhbDQIDAQABo3MwcTBQBgNVHREESTBHghZo
-YnNwLXRlc3QwMS50ZXN0LmhiLnNlhi1odHRwczovL2hic3AtdGVzdDAxLnRlc3Qu
-aGIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFP6FQ0cu4eKmlm2fovXPJ0J5
-IUeeMA0GCSqGSIb3DQEBCwUAA4ICAQA8x0aoai18EVqOpDXQ8QTdLwqYw7ccmeI3
-401NLQFN3BoUK3katpuGbF/x2RH7QSDaHFemp7eJOZpKABWa3lMo66jTlzYLVPQi
-cR1r0Cb5sgy4D4x8ImlX0h3yG6zTvrCv0S9EnbqXVX8R6bNZ8OXi7gCpfsEVCso0
-qy0ynK/ieTontHmbUy+m9GdKhvEKmyfS2g0fubyC+uhUiOj5IExIJhpXZhyA/7Ht
-j4PxxmfoeI6LyUGFxew6DbBlrMLhtCM/uXqAd/A5a2cfzJaRG62j6Et6vFt//VEb
-UEWIJfSjEnMB7C/sK+ANwEZncqQL17UasgRjcjP+O21ZCcxQqBsaI7cJEd5t6Du1
-FgSd79XjMC//M7Ocuy7Uqb0tFRiVEyXFLIQlcCocvGyhGQCO/n3L8UzMN7dxUAay
-oFGrYn+ozQAULPgB021Pi8BjS35bD1UXI2jjqupY+yJH4Vod3oDPsMx+o/iPvCtU
-+ZTuyJ3+doqVQg+DWPCqdlGJr32IgN6j+sc2nfVIBH1q+zU+E7ZwkvXcljlmwPNB
-YLoLZ5A6rfH7ePRXjUtmreiTl+Ot7wkhM0YBaAKJF4s2wLKKKgBaGg7V6XwVCRm6
-NrN8FBPj/kOnMa3p0GL23XHrva43poBPf9KFgpZIIDxEboI27JQLoAu5uqcW4W7H
-miXuo3j/eA==</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:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp-test01.test.hb.se</ds:KeyName>
-        <ds:KeyName>https://hbsp-test01.test.hb.se/idp/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp-test01.test.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEQzCCAqugAwIBAgIUQEH05pwokb/txDTgbOv4/GMVmtYwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAxMWaGJzcC10ZXN0MDEudGVzdC5oYi5zZTAeFw0yMjEwMjAx
-NDU0NThaFw0zMjEwMTcxNDU0NThaMCExHzAdBgNVBAMTFmhic3AtdGVzdDAxLnRl
-c3QuaGIuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDD7SJgHDBY
-mYQFyI/N16K//515WHWjwxCic0Hog8qcD0zBh5ntgR89XA2H+CKU+qRQ4eotL8GO
-l1UHvO3s2FHJ1Ln6BNTr+bCWsLpAPpOoo9jt6OmiP5gJEiZUv4Y2xjvYfqP8OoOf
-7SG5kueZsmCWXqZqxCqjN9DoP34YstI2RkWpgsnYZuz4VPg+0junZIV2LKLCdC8j
-sgISeGX80LI6tbNeMx9D6qeIbbVLNOvGdCwBt+JLVF/3uEhxNfFnGxlpUH601HYo
-2oUVvCVz9eDWAS53kj0YyrPShXWfM6bvJiLH2+dbJc3sDQhMYugnxs7hdzn2fntF
-I4yBJp64m6Y6ZP6MHCDYG4XqZl+FLQBBHxCQjS7DnWjCNYbHT0D1e6N1QMN6TmmH
-lscSS/Z/2RCqS6Q4uvPSMbMExErKtBQq+6aeRjUdVTeeth1y/X72C8HBXxgmmEW2
-YRK0e2931o2/gphZy7vS4D5qriBHINmMsEg3PZhTxIB1u0i2kb50LBECAwEAAaNz
-MHEwUAYDVR0RBEkwR4IWaGJzcC10ZXN0MDEudGVzdC5oYi5zZYYtaHR0cHM6Ly9o
-YnNwLXRlc3QwMS50ZXN0LmhiLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSE
-oIZAnuKc5dZoqHcmgEQLJiwOkDANBgkqhkiG9w0BAQsFAAOCAYEASRszy9q0VwnS
-VJFmQuChK+M7sFDaLY/haaJF3lliMcYLVtboIYsaUXTEEvs42FqXTpAeYAA8uXmq
-b1BQNxQUpWtyyUfe5Uyn59Yn7JCz8+SbittEyqaeOGu3RawLX0NJAoxK9Agtu0zB
-YPcFizHVdBGTI1bLuR7l2xxWod2vFiD3C6xqBdR5lD/0XATRVQ2q7WrxHO+a/UC9
-wpahXMdZEjIl7+Klwz9oIsOUtsBJCgRGEgvpKoiKzrke0+e4PVYKzhZgU9NFQNkd
-pZ/aNkyfYZe2K/SKo01FIKB0OJRmL6Cu9BjW48DxKOQ6Nmeiat+8x2JJ5hSmdQzG
-iRE+qDXCvtD6tr8Px/nhzI9RrYV92FFTUCdf0v/z8p0dfkkxBQ7gjIArchGVjG/7
-E6gs8WefYo7yCCzLs7uO7rrJFw8SA8bHBvT5OENZc67OtNozTFhCY6F4bWleumQe
-Oh+D0cydIQbcgxJlDUV1KTq54FNEOlrN+NICGbbU2W9Tz6YakVTI</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://konto-test.test.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto-test.test.hb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto-test.test.hb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto-test.test.hb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto-test.test.hb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">konto-test.hb.se</md:ServiceName>
-      <md:ServiceName xml:lang="sv">konto-test.hb.se</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>University of Borås</md:Company>
-    <md:GivenName>IRT HB</md:GivenName>
-    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/konto.test.uu.se-shibboleth.xml b/swamid-2.0/konto.test.uu.se-shibboleth.xml
deleted file mode 100644
index 30650938..00000000
--- a/swamid-2.0/konto.test.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://konto.test.uu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-05-18T09:55:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets kontoaktivering och lösenordsåterställning (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University user account activation and password reset (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Denna tjänst används för att du som ny vid universitetet ska kunna aktivera ditt användarkonto vid universitetet. Om du redan har ett aktivt konto kan du sätta ett nytt lösenord A om du glömt bort det.</mdui:Description>
-        <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account. You can also use this service to reset your password A for your user account after the account activation.</mdui:Description>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://konto.test.uu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://konto.test.uu.se/index-en.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=699273448&amp;l=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=699273448&amp;l=sv</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC8TCCAdmgAwIBAgIJAMVWchzOigTwMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmNoZW4uaXRzLnV1LnNlMB4XDTE0MDYyMzE1MjcwMVoXDTI0MDYyMDE1Mjcw
-MVowGTEXMBUGA1UEAxMOY2hlbi5pdHMudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCfDSR8ylUcIcDm/GKx7Ld6onV92/iKfbyrZj9uXiKM8iq7
-FDUtJpCvl8qlQ59vVMr6as+HeHsf3SHYHd/3i0D5FisBBZ8MBYccSELw/OpRuetc
-BO5ta8cZMTnhnMnRQi+XV1gic8sEg8LEo3vZmP8eoD5/Xky24cLVFaC/Rk/48oFZ
-qInZeSABpFM9FJOXKD801G0xfvma31guTMoTbDWzxg5SM9/oan8kh+lMsfC3Y+zG
-3GqttMtTt5CFRqYl+iBCUerKo14wt5Q429KAfHJPVX4W1RmNZ0gYgT1Fr9aZB8zz
-D9hQMBzTPKX3Myz6VHpqmg4xtTO0GAGsebMnyKOnAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmNoZW4uaXRzLnV1LnNlMB0GA1UdDgQWBBTetpIV/6tzXm6My/TDY9d0txKR
-STANBgkqhkiG9w0BAQUFAAOCAQEAD9vrnvzkjS7kyM7YUZ8d3X6MwwOTfUxhPRzZ
-hoKAFmuXI68K81UYvsSPkoRICeznS5oEk4BRlIDBV4kBO3p4n0351WjIENMAcwFD
-mVrEQWUtZkQAZkARTlv9qNuqdgmmKBRb2lL9FXfovpQWCwDVBUzPlrUDdfmZzGuy
-Ql/gj+HX4uvvRUwouwG8eoqnBSxzzGPYlVHsjmOMD28tvKp9TrMWp2s852Siks3x
-6MnKP/eJW7PcB/XXcpJT8lwLZFnmazLbkUEX5GKijyNNLcRN9u5T7o47iE1tp6Rc
-Lf3VcAZi+NsypUL4nVwgn6iHbsaXGfTZPispp6rXJ48r/XnBFQ==
-        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.test.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.test.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.test.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.test.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.test.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.test.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.test.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.test.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.test.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Uppsala universitets kontoaktivering och lösenordsåterställning (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Uppsala University user account activation and password reset (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/local.cloudmore.com-shibboleth.xml b/swamid-2.0/local.cloudmore.com-shibboleth.xml
deleted file mode 100644
index 4ade3608..00000000
--- a/swamid-2.0/local.cloudmore.com-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://local.cloudmore.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-08-31T11:53:49Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://local.cloudmore.com/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://local.cloudmore.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="240" width="180">https://www.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://web.cloudmore.com/privacy/cloudmore-data-processing-terms</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>desktop-cu2qb29</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=desktop-cu2qb29</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9DCCAlygAwIBAgIJAJKf3OTHrjQ/MA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
-BAMTD2Rlc2t0b3AtY3UycWIyOTAeFw0xNzAyMjcxNDU1MDdaFw0yNzAyMjUxNDU1
-MDdaMBoxGDAWBgNVBAMTD2Rlc2t0b3AtY3UycWIyOTCCAaIwDQYJKoZIhvcNAQEB
-BQADggGPADCCAYoCggGBALhxwbvMdesrUcyhorZ9bHNSWWtqJIrHPT9jGJI5W0oJ
-SosOLD/mrCSy618yHoYl+oo2nE4u/+VDE2CJhrjkThwp+C3bLI/jTYrn4E2w1cVw
-5ws1Cmo7iJ8wEsX4ZpvSpPG7DRUcppzDLbizGUZoZ/7lKDUWEqX+pUErrJCcxk7v
-hDlXyXXdkc4R18hUUIQHMu5XHjDQ7NH5rrLmxNcYdLEg9KG44CLmcgz3ptcDXZRp
-mhvAr55XtDq/3rk/bJODy65F+P/AzTK1AD3hr/7VtqANfp6Gj+FECC9ahVYcQg9z
-8YFrh3T2B86xnRwBpGj5GdAB1Sl48OqpoJvhRd0hAQnxPTyEyr/O3lQX0Ln68Ho2
-0SC+WkSi1GwGP+av8PKZj8UO5KeLwSeUYhqVMMs/jGrfaM278oHWldzo8VfVwsAR
-9/chJ6JN3bUum//bdIgwqQyxS+m+5/tCFZ3IAOWraXYJpofG+vtCJH5THWvC/Pfp
-P17k0KFHDONEbCy+BMJguwIDAQABoz0wOzAaBgNVHREEEzARgg9kZXNrdG9wLWN1
-MnFiMjkwHQYDVR0OBBYEFBJHwGN/tsmAUm7VVbqf3BLHTKNaMA0GCSqGSIb3DQEB
-CwUAA4IBgQC20sT9vv9RVhEvItcTDpV/hOtrhcAtDLfe0jUnycscDbN+zsn9TVE+
-oWyV1a90/YiTbVAdyTW518NjU4APqwghEhHlY2U1wNCsYFxmceQvyCyAAfZjvugR
-xxw8YnPc3z2M8sriHpnvLEwG84ZGn5VmKAmFlapmpM3SuhT+jg716oB8ZZuB3IRh
-tPrIQXdSEtsL+Ogol+UtbraP1iseSmpFoCNLSpUgsdIf0U4BMXEfVAMv3R1w7elR
-FefUWlzgJ1UG0hSKIZilR8YMI0o3fF9nfMDWkGgyV5+fbnogKVNNQIbiFIIIBdhH
-a9ikla+Yzxv5MqqlRh0dlbjwuPWUEbxzV01N7gjtUp+m3G8HAWe/84bGNzqW5L0J
-ImSwMsvQbjyWBkgs0ruxX7osN1cqyIMRB3KefI7XpBrQXmVqS7IbtGgypYZieVSo
-z8vMYWDvzD5siJ/O46xnsMzwTu2JXhVJpR0jzoADSftjsQe+4wgLXVg+46mapDoc
-f49DvQ516YA=
-</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://local.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://local.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://local.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://local.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://local.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://local.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Cloudmore</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login-dev.du.se-idp-shibboleth.xml b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
deleted file mode 100644
index a5895c5e..00000000
--- a/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login-dev.du.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://login-dev.du.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">du.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Dalarna University (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Högskolan Dalarna (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Högskolan Dalarna (ENDAST TEST)</mdui:Description>
-        <mdui:Description xml:lang="en">Dalarna University (ONLY FOR TESTING)</mdui:Description>
-        <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="146" width="350">https://login.du.se/duse-logo-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="350">https://login.du.se/duse-logo-en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://www.du.se/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.du.se</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.du.se/sv/hjalp/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.du.se/personal-data-protection</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-dev.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-dev.du.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login-dev.du.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-dev.du.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-dev.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-dev.du.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">du.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-dev.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-dev.du.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dalarna University (TEST)</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan Dalarna (TEST)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">du.se (TEST)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">du.se (TEST)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.du.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.du.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login.du.se-idp-shibboleth.xml b/swamid-2.0/login.du.se-idp-shibboleth.xml
deleted file mode 100644
index 9487a60d..00000000
--- a/swamid-2.0/login.du.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login.du.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-17T15:32:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://login.du.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">du.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan Dalarna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="146" width="350">https://login.du.se/duse-logo-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="350">https://login.du.se/duse-logo-en.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.du.se/sv/hjalp/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.du.se/personal-data-protection</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://www.du.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.du.se/en</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>du.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:60.6137,15.6536</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
-MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
-l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
-eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
-8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
-yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
-riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
-9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
-eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
-E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
-KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
-2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
-GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.du.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.du.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">du.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
-MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
-l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
-eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
-8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
-yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
-riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
-9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
-eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
-E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
-KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
-2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
-GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">DU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">DU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Dalarna University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.du.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.du.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Dalarna University Support</md:GivenName>
-    <md:EmailAddress>mailto:support@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
deleted file mode 100644
index 8a1f541a..00000000
--- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login.idp.eduid.se/idp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-25T15:54:30Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://eduid.se/errors?code=ERRORURL_CODE&amp;ts=ERRORURL_TS&amp;rp=ERRORURL_RP&amp;tid=ERRORURL_TID&amp;ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">eduid.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">eduID Sverige</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">eduID Sweden</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">eduID är en gemensam inloggning för din utbildning</mdui:Description>
-        <mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://eduid.se/faq.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://eduid.se/en/faq.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://eduid.se/faq.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://eduid.se/en/faq.html</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
-RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
-MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
-EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
-AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
-eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
-G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
-dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
-F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
-JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
-fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
-Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
-5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
-ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
-cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
-q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
-eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
-FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
-iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
-RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
-MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
-EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
-AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
-eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
-G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
-dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
-F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
-JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
-fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
-Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
-5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
-ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
-cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
-q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
-eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
-FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
-iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.eduid.se/slo/soap"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/slo/post"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/slo/redirect"/>
-    <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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fresia</md:GivenName>
-    <md:SurName>Pérez</md:SurName>
-    <md:EmailAddress>mailto:fresia@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET eduID team</md:GivenName>
-    <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>eduID Support</md:GivenName>
-    <md:EmailAddress>mailto:support@eduid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Sunet CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
deleted file mode 100644
index 390ce2fa..00000000
--- a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login.idp.hhs.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-02-27T16:06:43Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://login.idp.hhs.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Stockholm School of Economics IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IdP for faculty, staff and students</mdui:Description>
-        <mdui:Description xml:lang="sv">IdP för anställda och studenter</mdui:Description>
-        <mdui:Logo xml:lang="en" height="80" width="80">https://login.idp.hhs.se/idp/images/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="80" width="80">https://login.idp.hhs.se/idp/images/logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://www.hhs.se</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ex.hhs.se/SWAMID/doc/PrivacyPolicyEN.htm</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://www.hhs.se/sv</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ex.hhs.se/SWAMID/doc/PrivacyPolicySV.htm</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.10.48.0/24</mdui:IPHint>
-        <mdui:DomainHint>hhs.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.34161,18.05659</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUJAzOpmO2xBQbVQy1TJip/WBcAkswDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQbG9naW4uaWRwLmhocy5zZTAeFw0xNzAzMjgyMDQ2NTBa
-Fw0zNzAzMjgyMTQ2NTBaMBsxGTAXBgNVBAMMEGxvZ2luLmlkcC5oaHMuc2UwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdkYCRoigh32xvgQEsqJNorU3r
-n14CtpCBfEQWkfY8OVvOFCccfnpdVm6bFTg5367D1LtlogNp6kjkGMoMoYOMs6wA
-c+ziDQ5M8UsnI6TMLM5LUr/M6oUIBr5xB/ZrL9TMADc6kmZNjVeovVsuBbkuosw5
-xE0PzRia4n/vnWzmiXvE00FU4c+b05a77kp8P0SivQdfLxL+Oth2Q1qV1wDFlyE7
-BEareYiTZ5LcGbmrkuLZ584kYMr1Vb1t/M4hLXNiW6Xe1fQQ+bzHV0qHKVqcIU3h
-ZPAy2XWz/5AOpQ3RVi0IOBKW0xBoIOOSrok1oMw7g1gQyTMDZPpL+WlqLgZTAgMB
-AAGjZzBlMB0GA1UdDgQWBBSOlOMkIfQHBMPzcvEI4mwXwVPnFzBEBgNVHREEPTA7
-ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xvZ2luLmlkcC5oaHMuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGEfxzD6CZHwpyCTUW6+TaPN
-KJDT8fIBkxtbe6SYx2XHi25ZJyhxLAYePfwMlEkcnSPLxQuidoDwd0oAoweMe0o6
-OUzFeHZfJEdMTnnCsyH3oqj6PMuO3+n1tDFQL4pQAyy1IMECL9LQDCCX57NuzAtA
-5K5EqfvHy2GJ2rBSalWBdSB8bquAiMnlqESrCHy/E7ujWKdnNHpBhhZm6WoLQFnM
-TSSy2e+HiDVEbUGC9Bac3w5rVqWeiqjP138PypLRh/R2Vv2hlJQCPdw3kHrLBqyR
-QpllBNVAn2pqTcSFAvRQgXBMlR9ViRR3aZOzssWyFuL67Gl7Ldu5t3r8wbuWj8o=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAIDhiVejQcRatRQTniI850BDMkdUMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTcwMzI4MjA0NjUw
-WhcNMzcwMzI4MjE0NjUwWjAbMRkwFwYDVQQDDBBsb2dpbi5pZHAuaGhzLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiFEmWF2dWOwlv2JesUYtVQW+
-vwwA4Rgwvn2VUpOEc9F8Gq2VMiAeOEXvHqhc+KjbnBtYMM5IrW2zeRHO9G/JlvFf
-rkTTSVapkKpzpKhRfy3TdmknHYbpafo9GdyeDZCsg36kWLhbd+3jlgbef5Mjfy9r
-qPFDH/7WOHloLBeHAcGs7BOkst6Y7movgYAvTr99UsoCMIn87PECfTYIWHZQeC4j
-aDqTV/EwUOsToV7MgtHO64GJ7rpeymEztdovJbCNdCMPlJhFs1UD7uMQBVbCi9Q4
-v8aETkkQwuBLu1Fa7n6matWpdr3Cx7l1Ein/tSOKITmVFmJUZ+WaotFp0vNVKwID
-AQABo2cwZTAdBgNVHQ4EFgQU1Oa1WuVpep1YuQaeMEWqNENu4jwwRAYDVR0RBD0w
-O4IQbG9naW4uaWRwLmhocy5zZYYnaHR0cHM6Ly9sb2dpbi5pZHAuaGhzLnNlL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCGXNWNNlVTNlKn4GcUPKsf
-B4md2R5TZcSMvtkcPNvx0GJ70AXVeVgSQM0NoKngwctcvrgMB7aiYQllPG7u9MyO
-l49kEhucv7xqqQ28Tz2NQ0gglq4Ksxk9ZsYPT1ecUBQPn7v3fW0H8+FkPWqlhlvk
-NomzNmJo6MrF+4vxTM+HQfY4VbFzFAM+HVMeBWCNRq12xYPz7JXngVK+ODxSq1N4
-DBM626i4mIwyB1PrBNFljTS6AHEcx3YnjQJfhPNnsabiQyqqAcTEGx6xhRKpvm1G
-9Cye0sTM9olfUm5EUbf6TJngTZ2NJlinmddCI3Ov5LvWsB5HviOOyJ5mKH5fyJ2H
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.idp.hhs.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUJAzOpmO2xBQbVQy1TJip/WBcAkswDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQbG9naW4uaWRwLmhocy5zZTAeFw0xNzAzMjgyMDQ2NTBa
-Fw0zNzAzMjgyMTQ2NTBaMBsxGTAXBgNVBAMMEGxvZ2luLmlkcC5oaHMuc2UwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdkYCRoigh32xvgQEsqJNorU3r
-n14CtpCBfEQWkfY8OVvOFCccfnpdVm6bFTg5367D1LtlogNp6kjkGMoMoYOMs6wA
-c+ziDQ5M8UsnI6TMLM5LUr/M6oUIBr5xB/ZrL9TMADc6kmZNjVeovVsuBbkuosw5
-xE0PzRia4n/vnWzmiXvE00FU4c+b05a77kp8P0SivQdfLxL+Oth2Q1qV1wDFlyE7
-BEareYiTZ5LcGbmrkuLZ584kYMr1Vb1t/M4hLXNiW6Xe1fQQ+bzHV0qHKVqcIU3h
-ZPAy2XWz/5AOpQ3RVi0IOBKW0xBoIOOSrok1oMw7g1gQyTMDZPpL+WlqLgZTAgMB
-AAGjZzBlMB0GA1UdDgQWBBSOlOMkIfQHBMPzcvEI4mwXwVPnFzBEBgNVHREEPTA7
-ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xvZ2luLmlkcC5oaHMuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGEfxzD6CZHwpyCTUW6+TaPN
-KJDT8fIBkxtbe6SYx2XHi25ZJyhxLAYePfwMlEkcnSPLxQuidoDwd0oAoweMe0o6
-OUzFeHZfJEdMTnnCsyH3oqj6PMuO3+n1tDFQL4pQAyy1IMECL9LQDCCX57NuzAtA
-5K5EqfvHy2GJ2rBSalWBdSB8bquAiMnlqESrCHy/E7ujWKdnNHpBhhZm6WoLQFnM
-TSSy2e+HiDVEbUGC9Bac3w5rVqWeiqjP138PypLRh/R2Vv2hlJQCPdw3kHrLBqyR
-QpllBNVAn2pqTcSFAvRQgXBMlR9ViRR3aZOzssWyFuL67Gl7Ldu5t3r8wbuWj8o=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAIDhiVejQcRatRQTniI850BDMkdUMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTcwMzI4MjA0NjUw
-WhcNMzcwMzI4MjE0NjUwWjAbMRkwFwYDVQQDDBBsb2dpbi5pZHAuaGhzLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiFEmWF2dWOwlv2JesUYtVQW+
-vwwA4Rgwvn2VUpOEc9F8Gq2VMiAeOEXvHqhc+KjbnBtYMM5IrW2zeRHO9G/JlvFf
-rkTTSVapkKpzpKhRfy3TdmknHYbpafo9GdyeDZCsg36kWLhbd+3jlgbef5Mjfy9r
-qPFDH/7WOHloLBeHAcGs7BOkst6Y7movgYAvTr99UsoCMIn87PECfTYIWHZQeC4j
-aDqTV/EwUOsToV7MgtHO64GJ7rpeymEztdovJbCNdCMPlJhFs1UD7uMQBVbCi9Q4
-v8aETkkQwuBLu1Fa7n6matWpdr3Cx7l1Ein/tSOKITmVFmJUZ+WaotFp0vNVKwID
-AQABo2cwZTAdBgNVHQ4EFgQU1Oa1WuVpep1YuQaeMEWqNENu4jwwRAYDVR0RBD0w
-O4IQbG9naW4uaWRwLmhocy5zZYYnaHR0cHM6Ly9sb2dpbi5pZHAuaGhzLnNlL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCGXNWNNlVTNlKn4GcUPKsf
-B4md2R5TZcSMvtkcPNvx0GJ70AXVeVgSQM0NoKngwctcvrgMB7aiYQllPG7u9MyO
-l49kEhucv7xqqQ28Tz2NQ0gglq4Ksxk9ZsYPT1ecUBQPn7v3fW0H8+FkPWqlhlvk
-NomzNmJo6MrF+4vxTM+HQfY4VbFzFAM+HVMeBWCNRq12xYPz7JXngVK+ODxSq1N4
-DBM626i4mIwyB1PrBNFljTS6AHEcx3YnjQJfhPNnsabiQyqqAcTEGx6xhRKpvm1G
-9Cye0sTM9olfUm5EUbf6TJngTZ2NJlinmddCI3Ov5LvWsB5HviOOyJ5mKH5fyJ2H
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stockholm School of Economics</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics IdP</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm IdP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.hhs.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:swamid.tech@hhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+4687369409</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:swamid.support@hhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+4687369400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:swamid.admins@hhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+4687369417</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SSE Federation Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:its.security@hhs.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login.ki.se-idp-shibboleth.xml b/swamid-2.0/login.ki.se-idp-shibboleth.xml
deleted file mode 100644
index 8a6c727e..00000000
--- a/swamid-2.0/login.ki.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login.ki.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-11-11T16:03:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://login.ki.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karolinska Institutet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="146" width="292">https://login.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="292">https://login.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://medarbetare.ki.se/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-identity-provider-idp</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://medarbetare.ki.se/tjanstebeskrivning-saml2-websso-identitetsutgivare</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://staff.ki.se/rules-and-regulations-for-the-management-of-personal-information-within-the-identity-provider-idp</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://staff.ki.se/service-definition-saml2-websso-identity-provider</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>ki.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
-        <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
-        <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
-        <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
-        <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
-        <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
-        <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
-        <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
-9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
-n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
-OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
-gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
-0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
-VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
-R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
-nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
-wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
-Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
-GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
-0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
-NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
-iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
-HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
-ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
-VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
-TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
-03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
-247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
-Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
-kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
-reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
-RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
-ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
-i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
-HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
-VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
-xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
-T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
-fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
-rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
-BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ki.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ki.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
-9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
-n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
-OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
-gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
-0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
-VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
-R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
-nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
-wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
-Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
-GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
-0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
-NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
-iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
-HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
-ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
-VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
-TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
-03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
-247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
-Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
-kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
-reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
-RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
-ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
-i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
-HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
-VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
-xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
-T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
-fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
-rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
-BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml b/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
deleted file mode 100644
index 702189b6..00000000
--- a/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://login.temp1235.hhs.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-10T12:41:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC7DCCAdSgAwIBAgIQcXfC7I8AAZVDQZlpS80QEDANBgkqhkiG9w0BAQsFADAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE3WhcNMTgwMTIxMjA1MzE3WjAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSO706ECYl5LgivGf++RRzmJCdC6OypGGI1YHiVNeUhNBEE2pJ2IFr0ZXGpyrx7+bJRGdlZQG75fHsJE+5Fi3+gtNhMbsAnTfvR3PkX4JzAcl32bzxeKKIHQaou6TyPSCVM7hZQ9NnjrKamekIB52hxga7G4lo1tcnVZFYYBXl5CXvfHhnKkVfmUYKQvak8SQCkk7VkbbpFE9zmbpw7TewzWLcOVmHVjqMcMPh8xTwL/uWtiD5nUx43ZKKykXAt8MMutrXVeaXsWz6ii5sls46cfyA79luYnY52UyjLFfAfFJA9PcCg+JucYWkXMtjBzpVFmcUbF2u5NNryvfEC3aLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC0725ACqttJd6WGETAS2legpdN+dB9WIqOWqP8ub1uxyg0cx6aKtmLK2zXt3NGaJm9XmVb+v6uqToFurIAPYaguwABHy3JkTNNnO66BCtgN1CRtRm+fBz2RaEJ2zt4NIswOwsvEl7R6FWOihzQJ6fk4DEXAIhLQrCn/ti0yCFWhHqjd74Dvr2xHzppv9BLhDOn6RwdYj/EzSG1xe9oPvn1jyUUxGZzRro4e+25W/l2X2RDautBAYZq3bV+k5ak489U5EYQgcGrFWSs9DmAKk2qUwW6qvMDppD5kVTMfIEbeMUUftAo2VkG//Ym9Q3+A0/KkkpFmsG3taxLxgtm1VCg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC5jCCAc6gAwIBAgIQFLE+JRWbr6dO/DnzzRd18jANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE4WhcNMTgwMTIxMjA1MzE4WjAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb2zXOedFExa2buAnsMwWosysFcvUISb+hTP7Y7cDfLYLC4HYgeaVl+f0utv9EAKooMKbCOOoqypXfZvR4thEj4nASEd9l1SrK7bfTK21w7bpsgPW1YyLYyMeSWREIm2eB+vD19o8K0zF0bJ68ZjtQp/ZeuCB+UAOmwlcRv36tc4ky/MOgAudjG2nozN2Qol4/bjSpxy9X8Vk2AGLeEusv7U2kFnVUUO8LFSJrSukys7+KRrTJa+NoXQa9EXq1y9yPitLYiIfDu8OV0rJuNkidLkhVRluYlp8wsL5xtAPYMABkUCjejYW7OrGfejYTRSgzwRdUrDW2/003XR8eRvMDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHnffSwWY95Eu+s8rq4Paazq0tfXYVxkqfRcFFEOeI1Gyq7OGe2YSRTw8dW6/2wsQOZrbLsgRoLhn04B1+gt2wpP29JsKJwVjeKCEtXEqEIm6gmetPCW27pbkLMTUeMYan6jkI9jww7zR8nrwtulBlmzrAcivcNTDiSTq/W+3ec8wg2KPoY0ie5bk3XI5dhrYFzzb6XzVamGvUKYYx6DqOIP/nsTZy21y+4mOoo8bS0snippT2rUlbrFwn8fneuHv7NzEvp0bOSd78ke+hnEQDd44R9XhBU5RT5zvB24Tv6+dUXoSJN6TbauPgtUtGdEV/euSkTlkJoU1Ejbh5qupWY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.temp1235.hhs.se/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/" index="2"/>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://login.temp1235.hhs.se/adfs/services/trust">
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC7DCCAdSgAwIBAgIQcXfC7I8AAZVDQZlpS80QEDANBgkqhkiG9w0BAQsFADAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE3WhcNMTgwMTIxMjA1MzE3WjAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSO706ECYl5LgivGf++RRzmJCdC6OypGGI1YHiVNeUhNBEE2pJ2IFr0ZXGpyrx7+bJRGdlZQG75fHsJE+5Fi3+gtNhMbsAnTfvR3PkX4JzAcl32bzxeKKIHQaou6TyPSCVM7hZQ9NnjrKamekIB52hxga7G4lo1tcnVZFYYBXl5CXvfHhnKkVfmUYKQvak8SQCkk7VkbbpFE9zmbpw7TewzWLcOVmHVjqMcMPh8xTwL/uWtiD5nUx43ZKKykXAt8MMutrXVeaXsWz6ii5sls46cfyA79luYnY52UyjLFfAfFJA9PcCg+JucYWkXMtjBzpVFmcUbF2u5NNryvfEC3aLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC0725ACqttJd6WGETAS2legpdN+dB9WIqOWqP8ub1uxyg0cx6aKtmLK2zXt3NGaJm9XmVb+v6uqToFurIAPYaguwABHy3JkTNNnO66BCtgN1CRtRm+fBz2RaEJ2zt4NIswOwsvEl7R6FWOihzQJ6fk4DEXAIhLQrCn/ti0yCFWhHqjd74Dvr2xHzppv9BLhDOn6RwdYj/EzSG1xe9oPvn1jyUUxGZzRro4e+25W/l2X2RDautBAYZq3bV+k5ak489U5EYQgcGrFWSs9DmAKk2qUwW6qvMDppD5kVTMfIEbeMUUftAo2VkG//Ym9Q3+A0/KkkpFmsG3taxLxgtm1VCg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC5jCCAc6gAwIBAgIQFLE+JRWbr6dO/DnzzRd18jANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE4WhcNMTgwMTIxMjA1MzE4WjAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb2zXOedFExa2buAnsMwWosysFcvUISb+hTP7Y7cDfLYLC4HYgeaVl+f0utv9EAKooMKbCOOoqypXfZvR4thEj4nASEd9l1SrK7bfTK21w7bpsgPW1YyLYyMeSWREIm2eB+vD19o8K0zF0bJ68ZjtQp/ZeuCB+UAOmwlcRv36tc4ky/MOgAudjG2nozN2Qol4/bjSpxy9X8Vk2AGLeEusv7U2kFnVUUO8LFSJrSukys7+KRrTJa+NoXQa9EXq1y9yPitLYiIfDu8OV0rJuNkidLkhVRluYlp8wsL5xtAPYMABkUCjejYW7OrGfejYTRSgzwRdUrDW2/003XR8eRvMDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHnffSwWY95Eu+s8rq4Paazq0tfXYVxkqfRcFFEOeI1Gyq7OGe2YSRTw8dW6/2wsQOZrbLsgRoLhn04B1+gt2wpP29JsKJwVjeKCEtXEqEIm6gmetPCW27pbkLMTUeMYan6jkI9jww7zR8nrwtulBlmzrAcivcNTDiSTq/W+3ec8wg2KPoY0ie5bk3XI5dhrYFzzb6XzVamGvUKYYx6DqOIP/nsTZy21y+4mOoo8bS0snippT2rUlbrFwn8fneuHv7NzEvp0bOSd78ke+hnEQDd44R9XhBU5RT5zvB24Tv6+dUXoSJN6TbauPgtUtGdEV/euSkTlkJoU1Ejbh5qupWY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.temp1235.hhs.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 7369400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login.tst.ki.se-idp-shibboleth.xml b/swamid-2.0/login.tst.ki.se-idp-shibboleth.xml
deleted file mode 100644
index b6d3c3d0..00000000
--- a/swamid-2.0/login.tst.ki.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login.tst.ki.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-11-11T16:03:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://login.tst.ki.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karolinska Institutet (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karolinska Institutet (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test Identity Provider för Karolinska Institutet.</mdui:Description>
-        <mdui:Description xml:lang="en">Test Identity Provider for Karolinska Institutet.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="146" width="292">https://login.tst.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="292">https://login.tst.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://staff.ki.se/service-definition-saml2-websso-identity-provider</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://staff.ki.se/rules-and-regulations-for-the-management-of-personal-information-within-the-identity-provider-idp</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://medarbetare.ki.se/tjanstebeskrivning-saml2-websso-identitetsutgivare</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://medarbetare.ki.se/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-identity-provider-idp</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>ki.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
-        <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
-        <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
-        <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
-        <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
-        <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
-        <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
-        <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
-Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
-V8gzg8MFWL9vwAyTmg9prTkOzHxVSXpvrXz+Sr9OvAcpG7Qcia7+rS+raRMqaiG+
-+3tF932XgCZmq532oSYxFLk/ZssmyHQiUYY/tzC832yoiM8vIHYuQeyaD2i9HdhH
-vS4FLLcP5k4H166wW/uUkRDs/pG2e7uiT6RIhavV3sUIPlzRdkkuYhURcGjpTCsb
-5DRb+FmkRHH61OdLJMkqi7c8z3jmRXBZn+FsENElQPySzaiWJI+XKS8Mn36sFrTM
-gOXEYC3u9H6k3ZdXYVq+Brh0dwaQi7waPt3FJpfYPIDwxOYKtLHrgoS0MzECAwEA
-AaNlMGMwHQYDVR0OBBYEFMi5T4diS2VMxS0jWp5BszYiV96bMEIGA1UdEQQ7MDmC
-D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
-+JZ/VvmJJXF7t/YADLYQEhU4ybZOc0MRvGV6IKrmEwXHOpIcD7Uf+T1rvyIKQ24l
-a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
-s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
-WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
-n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
-DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
-tE4BnM29l3kUIPO17FPURUkhbrl86SeWHE6xPRATi9XHG44o9ACsLyR85FWkeGnj
-o26QqovXOxFn+YDEXIFu2Ier2YxJiL8MWte5n41Wf1poZQb0Sf4o+LOSrVZxd98n
-xzEuCJ93Luf4RxB9l+dfoVK4EDp6AAIJO/sxBmeEYfvNFukp+duyDFdQV1oSWaWg
-TMIqmaPevF4t39YwGCutFpZJyp++jfkixbNHzC75xiFyWfdumMcOs5FYA70rPUEl
-ZgQs1pUZv4qP7VeNNS6QXQyQl86kxMN7XfymgoqLQdHN2e1+JiEsk95kmwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUTvEk7OlxQx65QaRT+nO7cuOY71wwQgYDVR0RBDswOYIP
-bG9naW4udHN0LmtpLnNlhiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATSLgQWRc05CI6vkw8fCaC4pAYKmu
-uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
-EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
-N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
-fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
-MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
-Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
-DV2qXwakGUN8o2tdxn+zXKcrN0QN1CUsHkQlZ2m3PEEZlpgsp618SBGJVOHsLea8
-v3UxoEtw9BSGWip8xyWKMAhRh7KRmq4K4OqdNlo6M30KuPpPe0ZkI7gA2qR2lVv6
-ybR97uc9DrM8wKJjwYJKaYFeePdU99H4l2bzR6Au3mJ8Dd4Vq4wIPhC0ADvvDzU4
-UfZY/YkqAyroiwPZsaM2o8mspDqnbTOu6lPM4XeKFYKNdDamFVimnYLDKgM81/Ne
-IMv/7Klx5zt1Tf5NZaxgZ/xSXdQQAgQe/emteLIV5bdtIWlmT6O7WUI5QiUCAwEA
-AaNlMGMwHQYDVR0OBBYEFF7LNVAsmm6yfKeW7ViJuMrPTWfHMEIGA1UdEQQ7MDmC
-D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACYeLTIPNFIMCey2yr95YxXdZTzB
-wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
-l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
-xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
-U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
-jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.tst.ki.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.tst.ki.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.tst.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
-Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
-V8gzg8MFWL9vwAyTmg9prTkOzHxVSXpvrXz+Sr9OvAcpG7Qcia7+rS+raRMqaiG+
-+3tF932XgCZmq532oSYxFLk/ZssmyHQiUYY/tzC832yoiM8vIHYuQeyaD2i9HdhH
-vS4FLLcP5k4H166wW/uUkRDs/pG2e7uiT6RIhavV3sUIPlzRdkkuYhURcGjpTCsb
-5DRb+FmkRHH61OdLJMkqi7c8z3jmRXBZn+FsENElQPySzaiWJI+XKS8Mn36sFrTM
-gOXEYC3u9H6k3ZdXYVq+Brh0dwaQi7waPt3FJpfYPIDwxOYKtLHrgoS0MzECAwEA
-AaNlMGMwHQYDVR0OBBYEFMi5T4diS2VMxS0jWp5BszYiV96bMEIGA1UdEQQ7MDmC
-D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
-+JZ/VvmJJXF7t/YADLYQEhU4ybZOc0MRvGV6IKrmEwXHOpIcD7Uf+T1rvyIKQ24l
-a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
-s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
-WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
-n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
-DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
-tE4BnM29l3kUIPO17FPURUkhbrl86SeWHE6xPRATi9XHG44o9ACsLyR85FWkeGnj
-o26QqovXOxFn+YDEXIFu2Ier2YxJiL8MWte5n41Wf1poZQb0Sf4o+LOSrVZxd98n
-xzEuCJ93Luf4RxB9l+dfoVK4EDp6AAIJO/sxBmeEYfvNFukp+duyDFdQV1oSWaWg
-TMIqmaPevF4t39YwGCutFpZJyp++jfkixbNHzC75xiFyWfdumMcOs5FYA70rPUEl
-ZgQs1pUZv4qP7VeNNS6QXQyQl86kxMN7XfymgoqLQdHN2e1+JiEsk95kmwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUTvEk7OlxQx65QaRT+nO7cuOY71wwQgYDVR0RBDswOYIP
-bG9naW4udHN0LmtpLnNlhiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATSLgQWRc05CI6vkw8fCaC4pAYKmu
-uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
-EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
-N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
-fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
-MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
-Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
-DV2qXwakGUN8o2tdxn+zXKcrN0QN1CUsHkQlZ2m3PEEZlpgsp618SBGJVOHsLea8
-v3UxoEtw9BSGWip8xyWKMAhRh7KRmq4K4OqdNlo6M30KuPpPe0ZkI7gA2qR2lVv6
-ybR97uc9DrM8wKJjwYJKaYFeePdU99H4l2bzR6Au3mJ8Dd4Vq4wIPhC0ADvvDzU4
-UfZY/YkqAyroiwPZsaM2o8mspDqnbTOu6lPM4XeKFYKNdDamFVimnYLDKgM81/Ne
-IMv/7Klx5zt1Tf5NZaxgZ/xSXdQQAgQe/emteLIV5bdtIWlmT6O7WUI5QiUCAwEA
-AaNlMGMwHQYDVR0OBBYEFF7LNVAsmm6yfKeW7ViJuMrPTWfHMEIGA1UdEQQ7MDmC
-D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACYeLTIPNFIMCey2yr95YxXdZTzB
-wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
-l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
-xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
-U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
-jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login2.fhs.se-adfs-services-trust.xml b/swamid-2.0/login2.fhs.se-adfs-services-trust.xml
deleted file mode 100644
index 147d3d89..00000000
--- a/swamid-2.0/login2.fhs.se-adfs-services-trust.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://login2.fhs.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-08-27T17:14:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://login2.fhs.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">fhs.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">student.fhs.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">op.fhs.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Försvarshögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Defence University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan - NEW</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Swedish Defence University - NEW</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.fhs.se/om-forsvarshogskolan/kontakta-oss/om-webbplatsen/swamid-service-definition.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university/about-sedu/contact-us/swamid-service-definition.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="671" width="2494">https://login2.fhs.se/adfs/portal/logo/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="671" width="2494">https://login2.fhs.se/adfs/portal/logo/logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">fhs</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">fhs</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university/about-sedu/contact-us/identity-provider-policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.fhs.se/om-forsvarshogskolan/kontakta-oss/om-webbplatsen/identity-provider-policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>fhs.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQRBjHJZJ1L7ZL2Lqhx4XGfzANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBsb2dpbjIuZmhzLnNlMB4XDTIxMDIwODEzNTEyN1oXDTI0MDIwODEzNTEyN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gbG9naW4yLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6CvoZweCA/01FxYUPFPslb/ifhi4Mkh842rUrPX7Iy6GOwG1cgx0NruHR7cDVzteVJoOnhMcewr8Kw2Qz6+wjEq9Q5KsWmJ/ijqhMMTnl6Ku6W6aiB+WyeM3+o/cHor40rQTXWdnPBOJ/SxQufvmQtkTTPZpXmYKPzY12m5cLXlDMWhMBXj0psYFt/RmfkdMcQ15ZioMVTybTIQ2AvCtyP1tOZcouYaueGRa0X1aEa2abVY8RBzHyfhNgH9Ondt48qG4NXQX78iNWEENGTxNGX1qsSCZ9OncGd/zV7UT8q0JPjcfl4WYd4aaWQSGL1n7iL0rUcWvOj6XbUJZCsPVkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAnRGUTC6JbHljdWDhJO8y+S0PXdMbZuIgnaSmQl50sU95tfwCH9JGTMGsS5XdysZdI8bCRhJ019XxVoyfA45PgsdIpg+tcBvBxL31OddPb/n6HLY/EhJSL15W9zphStWZkOSzoC+VBt10tBCQCpa8MCq0YQwFKh4PwdSXESkSvQ+ASpCZ0ALim5tg10tAwNIW5M98+GGTwc+Tv2c8iPs9bKQVkwyYzn53x9bplUOCt5AL2oVZnBHFiOPk+j10gDhu+aR8Ypzw7I8XwRI3xG2x1tVDUB5vVEBgG3usA+HD83KA+a9yRZNYjkpG9bouCAD/rrij9qN6u7molHCeXs/pNA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQYnPZf3L0p6tGprT1WfSxmjANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBsb2dpbjIuZmhzLnNlMB4XDTIxMDIwODEzNTEyOFoXDTI0MDIwODEzNTEyOFowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gbG9naW4yLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ20nabKcaYpTMWJEajE6w0iVAbjvnQhTfKDpYTloXlJfaDt4ucZeAJsnwlVVay9InLKBwAwkBTVcOHc52PCCrwkuLP+sYIuinQp6DKH4O357aJ8TqPqiaazRNPJF10t/ZcXzZTEfzdyDAi29clPDdkn9rB0fp0i2qc72JivWGktijfILpushuav8We1sx2HXr54h5+SutUAefn1Nptz56/Ia0bVbl388OzNoiP+PLGx+XeE2Fe764FaaG/bkTiuw8iLF+r88nAfZ3nQI2rsENc7/3TRtxLopkuwZqkUd/fyiSrzAUyWTe62P7tTftIAJoivHqCpQQAs1Xb7MdlgN0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAHICgyoj1m9TBTRi5JO3ZQBUH7+T+XNtEIX7FZ+jnpTT7H2Ap7YkRXmZvVAKsdVvkng5y0KxY4sMl8rzbe1ByQsYMObG8nM33flcbXfXOT1KyVUI7E+O176LjeIQUxRoMnUBFyKe8uStjmTMeqnkFU1+U++37dBAMiOn65J3w6gs2VeGCAqz5e+3W1EEotPMjhpvJ/GjxAGEgP742aRzslO8Pz/kO6NpWEZWBCulJCwwfcOd8A4HN2DNviVOY7+ddz2dRa4NRvlPKFvEMH3URbYlLguiqmbn1ylRojOy+e/E3FllOzPsOuybzqbruzxd1tXpsx83cciQhtSq9CXVtng==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.fhs.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.fhs.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.fhs.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.fhs.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.fhs.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish Defence University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Försvarshögskolan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Defence University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Försvarshögskolan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.fhs.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Swedish Defence University</md:Company>
-    <md:SurName>FHS IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@fhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 55342545</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Swedish Defence University</md:Company>
-    <md:SurName>FHS IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:driften@fhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 55342545</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Swedish Defence University</md:Company>
-    <md:SurName>FHS IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:driften@fhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 55342545</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Swedish Defence University</md:Company>
-    <md:GivenName>Christian</md:GivenName>
-    <md:SurName>Johansson</md:SurName>
-    <md:EmailAddress>mailto:irt@fhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+46702124314</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml b/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
deleted file mode 100644
index 474c715e..00000000
--- a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login2.temp1235.hhs.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-05T09:41:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://login2.temp1235.hhs.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Stockholm School of Economics -- TEST ONLY</mdui:DisplayName>
-        <mdui:Description xml:lang="en">For testing only</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm -- ENDAST TEST</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Endast TEST</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVANboDpiChpZce1QQ5dpyWf/W0JF9MA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUxWhcNMzcwNDAzMTMyNDUxWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjL3UUdDF
-MG+LpPoNtCylTQLQEF9V1lpKa36haGhDnbpDlfY5jMR+u/SYqZDm4XK+03CgSSFp
-d6bKDpQJdXRCE1e3+zLG70nHYVYr4xJRLYXnYqOTIzHyW5Scod469j7KQX3ZJqor
-VF/2I1b34S5IhvIPWcwpFCbPsy0Y0JA9u5bI60qN7WI2AvfHjSRNEyLYy26I21uO
-VxWBosQOOuWJWM5u9nxxsDgx/7mXjNgG9MNndU3/asSt3gxMDWBIR8HnGRVEIpRt
-Ix4osEhEv6cCvC3KW5ivWxLYjYfVf74X6110jnyFmimchjihncCg2dhFar3evBL0
-WDl+KqHw5Iq6ZQIDAQABo3MwcTAdBgNVHQ4EFgQU9dV+CoGic2FD/Qfb00dscI1d
-J00wUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQBPzRpf9a96dgiCaLUBbJ8VfuKUtmsXoO71hmLpwWobv8v9d5HK03iY
-Kqm52vYm/GVlTTpar6Xg4icGLuGOvdB0/Ux0fdK9XebD9Qi0OBvD/5fD+TAbGoML
-bnkT4zr2+87txGEjLtmcT47Fu2dM58UArtLSvu7cGhh50P+LD7a6Ip6KxM35X94v
-m/hq55Kozrie6cB5vxSP8Kx/n5RKrLQBRedUaKNkfAacYXYKcFeWvwecnZz5Ezbs
-kL8+nsk2L2EWP+5Gdvlj7Og4ZmMW3WCV5VrAcn0aknUTyguUU3iPSzDqHG+s1Woh
-B90rsNE83YT8g731/6Y6sLC841F5HGNO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAJJaCEFsKewXEyQNmm3HxyP8WG0oMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUwWhcNMzcwNDAzMTMyNDUwWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxcuBujdK
-EIL3/PLAo6iFzVsBBtHKjdcmW0BKuvLqq2xXPeXzcCWtwV06BHTRbu1lLS/VUWQb
-hv7Y16DBSPyxyJbYiugN8WqgqGUaSCLnAhlm0owX59f6uEnpCfgkS87Km5S1KeD6
-KDUA8OOdoRSjG+mFVBSlC4nvYJjB+9eideAtW5TxUgGqp9lG4aLLMAUuPzOX3imH
-Vf04mNKFk2OQ3Mq20Ri8KewOpYHSXjfIPNAuxJ8mVndQ4RFazaxFmwvgD35uBN8f
-jfwVFKmjPFYU/DmxMisui/6JMkur/PQyr7n1Z/WVSHphkwzunj1EkYTvxWLZSDc1
-Spn+IhjnfLVoSwIDAQABo3MwcTAdBgNVHQ4EFgQUnKKAxcCkmcDnyFi37n82nNDA
-o9swUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCd1hisMfUZEpqKyizswbtkxLNIU1Yp4NbkNtKt2HgK8FSZHyx7bgEB
-zhg7BVetgrnfeRm8bBm0MBdxXt1aQSmLv0AxhwvgPv+W4oYtQacuG8MLTXop4y4A
-0libaM0vUQjJ6wniI+hZMpitaH/Q0vlO2Tq87Bg4n/cqXxBvwotBpf/R1RJXJ76y
-P1J973eOl+PqoVp6sSaNKlnoGi3oSu3yC6qKN1bLtT73UJQQTrJMK71psOTTTb78
-Z/tJfXfrAU6clq8BzV9tPrGaNh8Vc8fCafyosAyIggbyGuKbnoTBSk7X1+dKFcCL
-dKJkzuygfKebul7JLITyh1taLtz86Wrq
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAJFFeRTPSw5r8Nr1ASE+SxUO9SXqMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUxWhcNMzcwNDAzMTMyNDUxWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhWNQvzJ
-HpTZuSkaVsPbE4S0W2MfnV2RzNzdqg8vjeWILJrrLs5oJZHfK7xxcnsiLsTRIAaW
-rbeGFW2cy9fCTOJqPtG6vWuQz40qUAn0gJHGKYk/bXFpt5OkiR2XLwwtBoRO1tFz
-FTCYh/S+sB38km/RLu0MWD6Gzxta3H9+eU2zVepYopAU5UCRskytEHCpGeml0w8z
-oaw8mCf/8upkXsaKeH7VbTXhyS22rvqT/aTyxQMhbmVtNg7LtnJzZh+s4dYKiNAY
-59Tp8hhKFonLKD705BJoDYVZpl6LJI5lsn1L3xImSamVt6QFkf1H6oUTg7V+T0uw
-PJrbxtfPOVD0vwIDAQABo3MwcTAdBgNVHQ4EFgQUYSvnk/lbI16l/EDD6F7+1dSy
-xSEwUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA+WDOAP8fltDJLtOxdVjQ9QwiPffz6CyjKIGYuXouTBKeIP0FdbFvh
-Z8Cq51VyHqSOx3b5vVi9COT5LjOsz/Bo+SPGzBRAT+NjfJDvqjpXC4C8VZp7LuNJ
-w0mxQqp7BHnWHsDfT/oNHnsJOM5kT0knq6h7YDL05Tm2rzy//OsrA66EYaKsycnR
-PFEyLgZ0Ls+MUQgQzZDow4UHpfFwPnx/4CHQImB+aOiPvKAzbCf6S29z8BPxJta6
-ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
-1tAPLutBQ/nXr5SzoF4sUipVZGCI/nJy
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login2.temp1235.hhs.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVANboDpiChpZce1QQ5dpyWf/W0JF9MA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUxWhcNMzcwNDAzMTMyNDUxWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjL3UUdDF
-MG+LpPoNtCylTQLQEF9V1lpKa36haGhDnbpDlfY5jMR+u/SYqZDm4XK+03CgSSFp
-d6bKDpQJdXRCE1e3+zLG70nHYVYr4xJRLYXnYqOTIzHyW5Scod469j7KQX3ZJqor
-VF/2I1b34S5IhvIPWcwpFCbPsy0Y0JA9u5bI60qN7WI2AvfHjSRNEyLYy26I21uO
-VxWBosQOOuWJWM5u9nxxsDgx/7mXjNgG9MNndU3/asSt3gxMDWBIR8HnGRVEIpRt
-Ix4osEhEv6cCvC3KW5ivWxLYjYfVf74X6110jnyFmimchjihncCg2dhFar3evBL0
-WDl+KqHw5Iq6ZQIDAQABo3MwcTAdBgNVHQ4EFgQU9dV+CoGic2FD/Qfb00dscI1d
-J00wUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQBPzRpf9a96dgiCaLUBbJ8VfuKUtmsXoO71hmLpwWobv8v9d5HK03iY
-Kqm52vYm/GVlTTpar6Xg4icGLuGOvdB0/Ux0fdK9XebD9Qi0OBvD/5fD+TAbGoML
-bnkT4zr2+87txGEjLtmcT47Fu2dM58UArtLSvu7cGhh50P+LD7a6Ip6KxM35X94v
-m/hq55Kozrie6cB5vxSP8Kx/n5RKrLQBRedUaKNkfAacYXYKcFeWvwecnZz5Ezbs
-kL8+nsk2L2EWP+5Gdvlj7Og4ZmMW3WCV5VrAcn0aknUTyguUU3iPSzDqHG+s1Woh
-B90rsNE83YT8g731/6Y6sLC841F5HGNO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAJJaCEFsKewXEyQNmm3HxyP8WG0oMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUwWhcNMzcwNDAzMTMyNDUwWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxcuBujdK
-EIL3/PLAo6iFzVsBBtHKjdcmW0BKuvLqq2xXPeXzcCWtwV06BHTRbu1lLS/VUWQb
-hv7Y16DBSPyxyJbYiugN8WqgqGUaSCLnAhlm0owX59f6uEnpCfgkS87Km5S1KeD6
-KDUA8OOdoRSjG+mFVBSlC4nvYJjB+9eideAtW5TxUgGqp9lG4aLLMAUuPzOX3imH
-Vf04mNKFk2OQ3Mq20Ri8KewOpYHSXjfIPNAuxJ8mVndQ4RFazaxFmwvgD35uBN8f
-jfwVFKmjPFYU/DmxMisui/6JMkur/PQyr7n1Z/WVSHphkwzunj1EkYTvxWLZSDc1
-Spn+IhjnfLVoSwIDAQABo3MwcTAdBgNVHQ4EFgQUnKKAxcCkmcDnyFi37n82nNDA
-o9swUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCd1hisMfUZEpqKyizswbtkxLNIU1Yp4NbkNtKt2HgK8FSZHyx7bgEB
-zhg7BVetgrnfeRm8bBm0MBdxXt1aQSmLv0AxhwvgPv+W4oYtQacuG8MLTXop4y4A
-0libaM0vUQjJ6wniI+hZMpitaH/Q0vlO2Tq87Bg4n/cqXxBvwotBpf/R1RJXJ76y
-P1J973eOl+PqoVp6sSaNKlnoGi3oSu3yC6qKN1bLtT73UJQQTrJMK71psOTTTb78
-Z/tJfXfrAU6clq8BzV9tPrGaNh8Vc8fCafyosAyIggbyGuKbnoTBSk7X1+dKFcCL
-dKJkzuygfKebul7JLITyh1taLtz86Wrq
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAJFFeRTPSw5r8Nr1ASE+SxUO9SXqMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUxWhcNMzcwNDAzMTMyNDUxWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhWNQvzJ
-HpTZuSkaVsPbE4S0W2MfnV2RzNzdqg8vjeWILJrrLs5oJZHfK7xxcnsiLsTRIAaW
-rbeGFW2cy9fCTOJqPtG6vWuQz40qUAn0gJHGKYk/bXFpt5OkiR2XLwwtBoRO1tFz
-FTCYh/S+sB38km/RLu0MWD6Gzxta3H9+eU2zVepYopAU5UCRskytEHCpGeml0w8z
-oaw8mCf/8upkXsaKeH7VbTXhyS22rvqT/aTyxQMhbmVtNg7LtnJzZh+s4dYKiNAY
-59Tp8hhKFonLKD705BJoDYVZpl6LJI5lsn1L3xImSamVt6QFkf1H6oUTg7V+T0uw
-PJrbxtfPOVD0vwIDAQABo3MwcTAdBgNVHQ4EFgQUYSvnk/lbI16l/EDD6F7+1dSy
-xSEwUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA+WDOAP8fltDJLtOxdVjQ9QwiPffz6CyjKIGYuXouTBKeIP0FdbFvh
-Z8Cq51VyHqSOx3b5vVi9COT5LjOsz/Bo+SPGzBRAT+NjfJDvqjpXC4C8VZp7LuNJ
-w0mxQqp7BHnWHsDfT/oNHnsJOM5kT0knq6h7YDL05Tm2rzy//OsrA66EYaKsycnR
-PFEyLgZ0Ls+MUQgQzZDow4UHpfFwPnx/4CHQImB+aOiPvKAzbCf6S29z8BPxJta6
-ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
-1tAPLutBQ/nXr5SzoF4sUipVZGCI/nJy
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stockholm School of Economics</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics -- TEST ONLY</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm -- ENDAST TEST</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.hhs.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:gregor.borgstrand@hhs.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mfa-check.test.uu.se-Shibboleth.sso-Metadata.xml b/swamid-2.0/mfa-check.test.uu.se-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index ec7080c8..00000000
--- a/swamid-2.0/mfa-check.test.uu.se-Shibboleth.sso-Metadata.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mfa-check.test.uu.se/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-10T16:41:38Z">
-      <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"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">MFA-testverktyg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">MFA Testing Tool</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ett verktyg för att testa multifaktorautentisering (MFA).</mdui:Description>
-        <mdui:Description xml:lang="en">A tool for testing multi-factor authentication (MFA).</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uu.se/om-uu/dataskyddspolicy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.uu.se/en/about-uu/data-protection-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.test.uu.se/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.test.uu.se/Shibboleth.sso/JWL-TEST/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.test.uu.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.test.uu.se/Shibboleth.sso/DS/Login" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.test.uu.se/Shibboleth.sso/DS-TEST/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.test.uu.se/Shibboleth.sso/DS-TEST/Login" index="2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.test.uu.se/Shibboleth.sso/DS-SA/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.test.uu.se/Shibboleth.sso/DS-SA/Login" index="3"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>springboothotell-test.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=springboothotell-test.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMTCCAxmgAwIBAgIUXnmDMP8UDEYJi1alFTFbq4sFVNMwDQYJKoZIhvcNAQEL
-BQAwKjEoMCYGA1UEAxMfc3ByaW5nYm9vdGhvdGVsbC10ZXN0Lml0cy51dS5zZTAg
-Fw0yMjAyMDExMzAwMTRaGA8yMTIyMDEwODEzMDAxNFowKjEoMCYGA1UEAxMfc3By
-aW5nYm9vdGhvdGVsbC10ZXN0Lml0cy51dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJZdI/M9RH5Ax/0cEQc+P9aemcKFhWrwKN41q0sddlU9DMnU
-FtpfqL3kJQhMiXkPvSOHbot+BocXz2Hip8rR/sZlLV/qz57KgflYzxXqfRwdz2M8
-vs2XPMAFxFP1LiXcsxMH7refrRxSB6GAdcx7OMlcoIj1nKGETcETI0WXpAfr6Gpz
-GGA1h1CWPmdPcNoGS1Ib9MS1ecl20/1kLPlbzq9v0VHz4wbhcw6VvQw4O8rJ88wy
-FcBlAMgkI6NeaGcKMf0j+gewTpvc0nxiR4j0Nw2kNai0s6IXJku1jw/1j2h0PAf2
-vMKJ16dQvVpINgm0/HUQuULnG3GahrJY+NGRzQlsHjH6O3UYslLTHaUpafJ+Yoq+
-KtYPsV3CqKsBqKf8+qkvpJztudWO5m90cF2uZlg3ISwvMi2JIG5lOGwQ4Bkd/5yq
-sQEidpmWhaMx6LkgHrCz/1kmKtbs3eufG5QhNm/32Q76YeXV5nnRbTfKWMYTAiWY
-Fma8B5YfR5c5obFlr1CJfxKNnSd/XewXdhnRhHRsS96Nwdg8n1qS6wqqMrLpLnIr
-/7xIZtqq3hlqnlXmVFizk4mJj2WofFqs5YQ2Ul4vCpQ8+iqBd+fVtizorPVx8cer
-9zDsVCMUnnnI/QIveedp1VXlxNpvyafHMtqKRVbYKyqBHDe1tvi8AkC7acnDAgMB
-AAGjTTBLMCoGA1UdEQQjMCGCH3NwcmluZ2Jvb3Rob3RlbGwtdGVzdC5pdHMudXUu
-c2UwHQYDVR0OBBYEFEhnJDNvueXaoCpNSCwh2f1/QrUwMA0GCSqGSIb3DQEBCwUA
-A4ICAQBvbrOIOoJYM9RTxu/lsoDDMglLKvmWr8nNu5GIJ+1Ka+5O0DINpdTm2Jjo
-2zF+dI4gjEtKJ8Qf8geJAaTsPO/yNPTiT4H0jJtWE1A6TSwrDTw06SAx8aTArKFi
-/u8ePZi4ZtsscXvudqO6zgaDJsxmKjtkwqW51BIGQu0BM0orRNwiMDCaJdnlaZcV
-qvM5G5Lm7TFmbgV7x1kWED/yy5v4mac7bGoeXnhLr9fawv7ZjsFfXcbkXYZzQZum
-gKoqwgP3yMPBbqKe33FCa/wqo5hMMWHgdO8GorNUG7dfzKamUxrUsAnTiFYZjub8
-t03InlttMCpOBNDOi8HzG74olyhM3wGAIKv7PDm84pADxfdv2XlT2rDvQeSbvb0D
-E9oVTjN39FgrAIdpH5vwArZ5ppgmq6dk1v+rdoCjTy/BAKj3DCV3tJJqGId9dP86
-il20ocEAcHAic7jQd5bJzOeNLA7+ToJ8hFqzAUKUQOSYFjOgDbroODeQ4JWtVRcQ
-ogZZovdUqBDvdTFbULZwB9+RMCVewR1Nn99IAIUUI0N199CPbVFjD8gqXW+1VU2O
-KZJJMnUYbbvmonVdeAlHtPusBV+WmzAmsojgv3PHCx6kgZk0Z4uAj3PPUdGy69RQ
-Xs4LjyriOoZCPtM+uMltJ/9nEIgmSzQOCp81mpZXwd1FoTZH4g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>springboothotell-test.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=springboothotell-test.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMTCCAxmgAwIBAgIUbDcI7Ue/o2E//+vq5MMuDwMyLqcwDQYJKoZIhvcNAQEL
-BQAwKjEoMCYGA1UEAxMfc3ByaW5nYm9vdGhvdGVsbC10ZXN0Lml0cy51dS5zZTAg
-Fw0yMjAyMDExMzAwMTNaGA8yMTIyMDEwODEzMDAxM1owKjEoMCYGA1UEAxMfc3By
-aW5nYm9vdGhvdGVsbC10ZXN0Lml0cy51dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMhrc2YRzkJkBDcCO7dcPjR106BxAjONbtNPMO6V7aAe5fTC
-T9k8L//0kAA2DP9iIjoFhXpxIog5GC0j1+Iuoca9Ecgr0gXNyZ6o7+SCIKgg1XDI
-ZIn+6du1nfdhmigYN702aelBpAb9K+a+UgVPiZm/wum4VmDsX2nPpnehdFNnSntr
-ujgFnVn4hAM6KK3J0z4u0VRXfkUjUGnYBC8bcI2mae+cGp5E623lUo0JiM89F7vc
-xDm+t6foCf8RZknnAkgZS4sKN66eEetpvIykpfsFL4S1tyfrKvJJRpFIw0j4ghsI
-H0wiMwNd2VuqzrMxxHTTiXTrQTNG7xvxRkW7mgrrjXyQF9E7+TkeKV3+uObuaKhY
-Jv9JYtZ/uKe0W6J+oqUo66UpcokiOmfb+YWtO2Ud9y5gpFH3W1lN0+4VJqx+1OT5
-ph9XLm/RhgHtunQuHv32sxj7MNOcQm12AhTAn/03GCzoNT9d7f6yOZ7ZGbOY3cVf
-71Ndi7yDoHB6R4VRAeNBYFql5EVExGWF+X3cshqvPYdCf3vgGsgGRyecXopeJDLK
-UCous6x9bVOHfEMrVeMEpqGh129Z5wCojDF05rosikHdVPe9v+OfVBrOUhnS1V7q
-IjQ3kBFsGEcwXSNVPIbVYApW9q0c27VDBPKbF44Y2o3BoX+wb/f6SvUZekwZAgMB
-AAGjTTBLMCoGA1UdEQQjMCGCH3NwcmluZ2Jvb3Rob3RlbGwtdGVzdC5pdHMudXUu
-c2UwHQYDVR0OBBYEFJ2c6kUuOwHUm2iON5hLKBe16+I+MA0GCSqGSIb3DQEBCwUA
-A4ICAQAWblO1XJnHV4eqrSSZHXQQvvmpkXb5FpH4MCEzzEvpptBH3ufnMlzD4B8L
-fyeard1dK2AfQNfFvlofaZUAxmG4ug57Ar5HvoB/puYDoZga79P3MJwV0P3CbkXO
-4rjT0Hq8lXoJKosft0+PBrbOG7szkkNraw456W1JNxYhsa9zGCUnB7/fivkM0zo8
-CSqcRc5/r2B8UZYczy915JiGkQncY82r5V0hGh8IbekGKtNgt+eTQujXak9ZtR3W
-o1tYc+mb+0EShKeumSwwThicIck19lZsS1EpMqfokz0LGO6+6eFSGaf/C+wCKdri
-RhsQXnzV5Rc40ZqgYHx/qQidHbNrhFQsa5z2KRi4juP2qVTzYEtmBS85hou7A4lt
-/wyJuFdbdYXe7WQ3706cT7OgTdVVzC33YynemEFOhPcn6sYmBkIApP2LdMxpJyPh
-Ou17YeutZAluQnPXg6Fexnc81AEz0scTgRNMbz1uUjc5KbeRle1CcM9y8fAbWIo7
-A6nYR9HNCHTusLuJp9KztnwTNlaC7bFdKjIM1FxS3ZHeB+uAJ1SKQf0AQA2putJG
-Kx7SJj50ryX4tPp8RtKixIFXK5UmGuiHay0d183Iq2MIG7LT3CmkTeaEH5tNVN0g
-N3TaL36eL8QAIIDX0qq6FGMf5AG8mdJ1Sew/dOXmkw6LgIrjIw==
-</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://mfa-check.test.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mfa-check.test.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mfa-check.test.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mfa-check.test.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mfa-check.test.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mfa-check.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mfa-check.test.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mfa-check.test.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>IT Support</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Operations</md:GivenName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>IT Support</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
deleted file mode 100644
index 3c458dc0..00000000
--- a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://miunidp.miun.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-05-17T10:14:42Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://miunidp.miun.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Mittuniversitetet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">IDP på Mittuniversitetet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Mid Sweden University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IDP at Mid Sweden University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://miun.se/personuppgifterIdP</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="146" width="260">https://miunidp.miun.se/idp/images/miun-logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="146" width="260">https://miunidp.miun.se/idp/images/miun-logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://miun.se/en/personuppgifterIdP</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>miun.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:63.176762,14.651352</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:62.394626,17.284259</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:62.630989,17.946473</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAK0GHqJdjNOXLPkNDJPLpMCOlHwvMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD21pdW5pZHAubWl1bi5zZTAeFw0xNjA1MTYxMzAzNTNa
-Fw0zNjA1MTYxMzAzNTNaMBoxGDAWBgNVBAMMD21pdW5pZHAubWl1bi5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2yl6Dgyl0bcqFmqOIPw77Zv0o6
-tFxkzx6DiugGu555W5bdbFwkuLB22zQu3xMHjENiBM0ExwKsgRpeQed2KKynEI3D
-XNWxHwyGkHd+cPUBqAaPGPmm1/AsQNlFjKjOFamITqlvpyU4jnjJ8Th1D4DQvJ4H
-4+Zui/aNfvFxXJYRtJ3CjDVQ5vGKHk35hRX5gJwhNvXw+6Z8QWguU92wb5+x/Cn4
-rK+vhvGRXYtkB59hoqLsfRijnbGlz7CqAY1Td0o31C8PiUwxQtMne9xH44+jAdvB
-vi2q+eQgl8NvnzCwOi3cKyiIqpLSIgpXq2X3lKFTzDXH2f0JkUFLUfWPbbUCAwEA
-AaNlMGMwHQYDVR0OBBYEFBfB8hp3P27MZ/n5HHYCTTxOFCLMMEIGA1UdEQQ7MDmC
-D21pdW5pZHAubWl1bi5zZYYmaHR0cHM6Ly9taXVuaWRwLm1pdW4uc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFIpo8D0H2q4GiIOZiH7cvJqvezU
-l7h6tax6W5iZXaKULCThYNvhySmu6Mi6LemeMrK0z41D0LcIcfpkCBq0lR9SwPOt
-3L936OXDmmEDNtEjn0LWiMYIdwCbwIVZ0qrqgqjryyLv37dGxM4puoNVcCCXYpvL
-dyLskVivO9t2sZPrK/m9XdklqwyxfRk6lQxKsHZ2zo4rKIP0H19ZxTYGUsxO2EJW
-v4JiWygCcvQLG07TOeX/1sjsTTznbxfuAQzYA/Y/Z4nQAzQBmxO6aITFYmntRfJq
-8OIllKmrYxi/EKs35nex351u6O1Cj2yE4qH1MxRHsqEHGZIs1zBKISPECRI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANTldoWAC1XSKYGImaf8XtzWQk4gMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD21pdW5pZHAubWl1bi5zZTAeFw0xNjA1MTYxMzAzNTFa
-Fw0zNjA1MTYxMzAzNTFaMBoxGDAWBgNVBAMMD21pdW5pZHAubWl1bi5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfEZ/qx3T5cRJucOskmk1k4372R
-7VDMB65xaIo6MkD4kBoRJ1/8aOyTiP9jxLap0OB26i4CjoKlsYrAt+YixspQEcdv
-HPtTSyQ7XlKDFRQVv/vs2kCS5G5CpAe34ObfWWxlO8sIJZIzO2qtpC657g9z3UCW
-2zSOdluzOWXOb5OVi5eYBZvhBmO1bLE+HZHl4/+3H9TGCBFNBS5HP+xKuu2waM9F
-oQWrpyiVcGjbhnDjKBG2x7PYd3fxszZ9+4LyDJGrF11OMx0tMNzYjbvQ2g80fVCF
-HnMAbPUsuKHb5HxOhr5vlJhqZg9iE40xETKE9TY5R3z7Yy38jjGaINvC2LcCAwEA
-AaNlMGMwHQYDVR0OBBYEFNdW37ZSjqfnR3eNk3IKbX8wbB8hMEIGA1UdEQQ7MDmC
-D21pdW5pZHAubWl1bi5zZYYmaHR0cHM6Ly9taXVuaWRwLm1pdW4uc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBABr4JqKdTd9yQ9qaM4FuBjOHZtcp
-KWzh9DfitrZwQF9nlTuP93y9C0LVMMqw7+/dCiCrCvnD0D14V6i48mkJmKG2JD6V
-bO8S1GfagZ2M20mm0j+Tr0aNbMw+BN3iwP1zzVb5teeRSOyStuswNp992WCODsIs
-SsOga0oD+yTCiQEe/ZZd8wKRA9goCCdPoZtLwk+BR2cwIsne8Vp7R07lColNkqKL
-EG/v5gRSA2mw7Vj1rgff24ChZrzAGXBfT5fn9pzQ/raSRTbZWg21xlWqUsvhKRMq
-jjpzv0O7rvAVIaAJLA2wpt8fTSWnvRKac6E4AwjhTA3/w3HKA4LF5MgHASU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUVbHl8qzxWVVv9w8C3j5N2B8JIB8wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbWl1bmlkcC5taXVuLnNlMB4XDTE2MDUxNjEzMDM1MloX
-DTM2MDUxNjEzMDM1MlowGjEYMBYGA1UEAwwPbWl1bmlkcC5taXVuLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwvas5g8AlLNEnnw2dzthBfurtV0G
-amCpyvrL7xbx7OOLppfo87kyQ3xMu6WZIvil/vsfy5ULCp+/oIxrVLQQbULTkUql
-hbpJoOAZEKujKu9ss7JWX2E43GWrTaiFrp9qz9C3KoP+9SnZayom4tBup1X92FVX
-HzA5QGFzQ0FkjAYD5EBHf67BGS4H+lgqRUDBd28NYwDAfrBK3FKh569/ZzKW36o2
-AVxM4n1YEYSvYf+bIFi7dklgTngjnW3ZH8U/OgO3+MPopI1pZJDRSvuPBzVeRwqx
-QXfJeWTD0jc7DSDpElD5ZdAcxpZFhleH5Kwar2zsAlsKdwnsdO1/5WWClwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUVeVw9b3LJ6IV3F20uFWO8XiDYT4wQgYDVR0RBDswOYIP
-bWl1bmlkcC5taXVuLnNlhiZodHRwczovL21pdW5pZHAubWl1bi5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAEKDl5yiPAhrx2GwmkuN3skW4C93o
-TXBUjft9GUKUT+6RU3nUHjrvrPCyJQrYkf4m+JTERykbrZHkkd5Ml3+9eKz52Dn5
-tEJz16BMfohLrRCZxFwaB5wKievVbhlsiE7/dWcN2d51Nyixc/hHfwJM4MREupAa
-kjbgh2zPxih0P4JMIwQye9vb1AatfEx1EK4TT5bQ+IzcljHQk/nIENj2lM/IDxgk
-2mdHlIKv+edxjXpZmNyibP3m7TAOa1qoasjasUCGqM9C0FPob6h72D8d87sa9590
-B9F/wgJ22q78SOeLzik0JTCya18K9vjuod/q7n5tM1zDi/pDyT2Fy/s+pw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidp.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidp.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://miunidp.miun.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidp.miun.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidp.miun.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAK0GHqJdjNOXLPkNDJPLpMCOlHwvMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD21pdW5pZHAubWl1bi5zZTAeFw0xNjA1MTYxMzAzNTNa
-Fw0zNjA1MTYxMzAzNTNaMBoxGDAWBgNVBAMMD21pdW5pZHAubWl1bi5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2yl6Dgyl0bcqFmqOIPw77Zv0o6
-tFxkzx6DiugGu555W5bdbFwkuLB22zQu3xMHjENiBM0ExwKsgRpeQed2KKynEI3D
-XNWxHwyGkHd+cPUBqAaPGPmm1/AsQNlFjKjOFamITqlvpyU4jnjJ8Th1D4DQvJ4H
-4+Zui/aNfvFxXJYRtJ3CjDVQ5vGKHk35hRX5gJwhNvXw+6Z8QWguU92wb5+x/Cn4
-rK+vhvGRXYtkB59hoqLsfRijnbGlz7CqAY1Td0o31C8PiUwxQtMne9xH44+jAdvB
-vi2q+eQgl8NvnzCwOi3cKyiIqpLSIgpXq2X3lKFTzDXH2f0JkUFLUfWPbbUCAwEA
-AaNlMGMwHQYDVR0OBBYEFBfB8hp3P27MZ/n5HHYCTTxOFCLMMEIGA1UdEQQ7MDmC
-D21pdW5pZHAubWl1bi5zZYYmaHR0cHM6Ly9taXVuaWRwLm1pdW4uc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFIpo8D0H2q4GiIOZiH7cvJqvezU
-l7h6tax6W5iZXaKULCThYNvhySmu6Mi6LemeMrK0z41D0LcIcfpkCBq0lR9SwPOt
-3L936OXDmmEDNtEjn0LWiMYIdwCbwIVZ0qrqgqjryyLv37dGxM4puoNVcCCXYpvL
-dyLskVivO9t2sZPrK/m9XdklqwyxfRk6lQxKsHZ2zo4rKIP0H19ZxTYGUsxO2EJW
-v4JiWygCcvQLG07TOeX/1sjsTTznbxfuAQzYA/Y/Z4nQAzQBmxO6aITFYmntRfJq
-8OIllKmrYxi/EKs35nex351u6O1Cj2yE4qH1MxRHsqEHGZIs1zBKISPECRI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANTldoWAC1XSKYGImaf8XtzWQk4gMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD21pdW5pZHAubWl1bi5zZTAeFw0xNjA1MTYxMzAzNTFa
-Fw0zNjA1MTYxMzAzNTFaMBoxGDAWBgNVBAMMD21pdW5pZHAubWl1bi5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfEZ/qx3T5cRJucOskmk1k4372R
-7VDMB65xaIo6MkD4kBoRJ1/8aOyTiP9jxLap0OB26i4CjoKlsYrAt+YixspQEcdv
-HPtTSyQ7XlKDFRQVv/vs2kCS5G5CpAe34ObfWWxlO8sIJZIzO2qtpC657g9z3UCW
-2zSOdluzOWXOb5OVi5eYBZvhBmO1bLE+HZHl4/+3H9TGCBFNBS5HP+xKuu2waM9F
-oQWrpyiVcGjbhnDjKBG2x7PYd3fxszZ9+4LyDJGrF11OMx0tMNzYjbvQ2g80fVCF
-HnMAbPUsuKHb5HxOhr5vlJhqZg9iE40xETKE9TY5R3z7Yy38jjGaINvC2LcCAwEA
-AaNlMGMwHQYDVR0OBBYEFNdW37ZSjqfnR3eNk3IKbX8wbB8hMEIGA1UdEQQ7MDmC
-D21pdW5pZHAubWl1bi5zZYYmaHR0cHM6Ly9taXVuaWRwLm1pdW4uc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBABr4JqKdTd9yQ9qaM4FuBjOHZtcp
-KWzh9DfitrZwQF9nlTuP93y9C0LVMMqw7+/dCiCrCvnD0D14V6i48mkJmKG2JD6V
-bO8S1GfagZ2M20mm0j+Tr0aNbMw+BN3iwP1zzVb5teeRSOyStuswNp992WCODsIs
-SsOga0oD+yTCiQEe/ZZd8wKRA9goCCdPoZtLwk+BR2cwIsne8Vp7R07lColNkqKL
-EG/v5gRSA2mw7Vj1rgff24ChZrzAGXBfT5fn9pzQ/raSRTbZWg21xlWqUsvhKRMq
-jjpzv0O7rvAVIaAJLA2wpt8fTSWnvRKac6E4AwjhTA3/w3HKA4LF5MgHASU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUVbHl8qzxWVVv9w8C3j5N2B8JIB8wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbWl1bmlkcC5taXVuLnNlMB4XDTE2MDUxNjEzMDM1MloX
-DTM2MDUxNjEzMDM1MlowGjEYMBYGA1UEAwwPbWl1bmlkcC5taXVuLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwvas5g8AlLNEnnw2dzthBfurtV0G
-amCpyvrL7xbx7OOLppfo87kyQ3xMu6WZIvil/vsfy5ULCp+/oIxrVLQQbULTkUql
-hbpJoOAZEKujKu9ss7JWX2E43GWrTaiFrp9qz9C3KoP+9SnZayom4tBup1X92FVX
-HzA5QGFzQ0FkjAYD5EBHf67BGS4H+lgqRUDBd28NYwDAfrBK3FKh569/ZzKW36o2
-AVxM4n1YEYSvYf+bIFi7dklgTngjnW3ZH8U/OgO3+MPopI1pZJDRSvuPBzVeRwqx
-QXfJeWTD0jc7DSDpElD5ZdAcxpZFhleH5Kwar2zsAlsKdwnsdO1/5WWClwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUVeVw9b3LJ6IV3F20uFWO8XiDYT4wQgYDVR0RBDswOYIP
-bWl1bmlkcC5taXVuLnNlhiZodHRwczovL21pdW5pZHAubWl1bi5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAEKDl5yiPAhrx2GwmkuN3skW4C93o
-TXBUjft9GUKUT+6RU3nUHjrvrPCyJQrYkf4m+JTERykbrZHkkd5Ml3+9eKz52Dn5
-tEJz16BMfohLrRCZxFwaB5wKievVbhlsiE7/dWcN2d51Nyixc/hHfwJM4MREupAa
-kjbgh2zPxih0P4JMIwQye9vb1AatfEx1EK4TT5bQ+IzcljHQk/nIENj2lM/IDxgk
-2mdHlIKv+edxjXpZmNyibP3m7TAOa1qoasjasUCGqM9C0FPob6h72D8d87sa9590
-B9F/wgJ22q78SOeLzik0JTCya18K9vjuod/q7n5tM1zDi/pDyT2Fy/s+pw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidp.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.miun.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.miun.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INRA Department</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA Department</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:GivenName>Incident Manager</md:GivenName>
-    <md:SurName>Mid Sweden University Incident Manager</md:SurName>
-    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
deleted file mode 100644
index 0d802fee..00000000
--- a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://miunidptest.miun.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:27:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://miunidptest.miun.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Mittuniversitetet (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">IDP för test på Mittuniversitetet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Mid Sweden University (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IDP for testing at Mid Sweden University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://miun.se/personuppgifterIdP</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://miun.se/en/personuppgifterIdP</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="146" width="260">https://miunidptest.miun.se/idp/images/miun-logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="146" width="260">https://miunidptest.miun.se/idp/images/miun-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>miun.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:63.176762,14.651352</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:62.394626,17.284259</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:62.630989,17.946473</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUDopqrwr+8ysNjsx8WcAQU0xgFqYwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
-MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSfUra2csPm7zfml2+
-+FLWgZ3C3W7V77ogOuOd/5+79XywWdtHD1WrJntmL4eGvytW8vU6/DOo0c4UVKxt
-DKB2LSIy6uwd+OPbnWl6IQbk2ylb0UOIMV1pLMgBmrBoKt2dtpUH0T3Oqg2D7r9r
-CH8nk7rgrT5INIQDCS1NNVWEgRqltMH1Mmn90J2XzoGZrl6ZmEZ8uWURcypuPZcT
-QY9VvbVP8PKz1Bo9Qhh0LjXOumIGCdQoH0sQytePjcroLpL1HSAvX7DDsPNl4/Qh
-snILrHdK2z601oN1Ngu1rxrqWz0H2j9Z8U+zYjxdGOpvjXPg8iOIZJW0YM36SbcB
-SfKZAgMBAAGjbTBrMB0GA1UdDgQWBBQC5zJpccPPIWSbMiJAkQHQ39PBNTBKBgNV
-HREEQzBBghNtaXVuaWRwdGVzdC5taXVuLnNlhipodHRwczovL21pdW5pZHB0ZXN0
-Lm1pdW4uc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACdM6Gcf
-mHA0Hr1zC4T18vXqj2todlOm/wBoisGcJ8Yvz5YDozE0Ginn1RpjaUab/v10s8BK
-xBwVnyzTupIJMl0pW7XEHzVEWStpn69m+iNFtDuCe8gVvILI0dRt1NVUD/+b3d1U
-/QePhM43hJVGWi7/yyP12INV98P4HdZ91VMxafGzFVCh/cgLjYxwVaAYt0kCzZqE
-oAK9ajxQTMEz7h5ebJDfi+eydnDmzUFuFYzjB4CIPs0YLvyr5R1wXOxzZcpPE7c5
-qjqmAlpXZIozlPXNuM5NG2qX5fs+okW0ZvDzp7uGthyxxTchBR8PxTfSnE2ImX2a
-Q2DB2f7ifMpnsvw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIVAPRwsS0jawwgnaLnIOydT5jeXjVhMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4uc2UwHhcNMTYwMzE0MTA0
-ODMyWhcNMzYwMzE0MTA0ODMyWjAeMRwwGgYDVQQDDBNtaXVuaWRwdGVzdC5taXVu
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4EPO2E98M79WKFHy
-APjeQALlMgPuAkrVa9aiC84V7q3hgfdbD0wbNJTGA9uj7an2Fz5uNfUWS1Rg/7DT
-uEjrGpsWXn3mlBuH2wOZe9wHqFwVf5NUos/00gLxs6WIjaNv6gxnbnVss0pKURTL
-+bl4mn7XSPpbNosWlHkn4IbnXBi8zTwQ7Us2+klu15YfAPnlkMYgzOl1YkxqB3cM
-zxnejzBjzpG1VJWkLUOEFxlFYUwEsn5aOMpT4DXEq1PSSZfDmtz6tN+WQiV8W1rt
-QYyThOUwvF+L6Z9N960IFfiirCVk30doFfu5P/KmzciFWKcRHH2Jce3R/pC0SVNs
-56Z63QIDAQABo20wazAdBgNVHQ4EFgQUhtV3ZMcE4JWqlNJJVYkqB5inKUEwSgYD
-VR0RBEMwQYITbWl1bmlkcHRlc3QubWl1bi5zZYYqaHR0cHM6Ly9taXVuaWRwdGVz
-dC5taXVuLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCKf/Z8
-m1RMKsiP56XEBD/KlZToM23WF+i3xw7IPlo6a+bMT2emxKBCVv3CU6oMe55TMUeu
-RHzNHB3g0oa/xH+APxLbP64FMvDrJAPFDsltRX97C9UyO47rBL983Jcjo20fjCt1
-03xMipYa9aYc6miUSXKSP0zLu8XoyRo8Vlx0+4y1hI1B/vfgw2I850thSfM/TepO
-eHLpC5j1cjhz+omgj8KtOu4iwRShXmOTb3/MPKYQ0BezIuI99QfavE3jkdVg4+bb
-sEjpTEgCNeNotsnug8EzSf3jMac7QVsKk/ZUjpMUiH1QWeXQSzpkT+BfEjcXUm23
-p8Zy6HNa1RvGgW8P</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUPMQjIIrMt+goB+uHSwi2oO14KAgwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
-MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgqMKF+EDtjw74HWSy
-t2SU4fV4734PyV9gsPBJph8VQ32cAB7tqkqhIQbkHJKhJ4XeladH+ifk+BOdje9n
-EwIKIehxdujW832NAlMkEXfo3M2wt8UCBATCoWsxexkFUtNhZQnvtUm7dW0GuDYE
-NaZd0W6JMz0vBl83+JatCHu30kHu6CDgo/D6S9RL4pj3KiN08oR5Rjn5jHdNgMTf
-dNuYn2jsvKiR9EtcXC2KgvtYwqzGpjmcFxthBPBF3lzAza8ES16UVCPxVuH9DSJ5
-gB20wTMzP9xKSWQ/NKjh4AqEZ0hLH4dXGDzA3G3h/IkSgfaB+XalZDC6vzfuXXnv
-dE2HAgMBAAGjbTBrMB0GA1UdDgQWBBREfhKvA2DRE1mKkZfCgjAyiwegWzBKBgNV
-HREEQzBBghNtaXVuaWRwdGVzdC5taXVuLnNlhipodHRwczovL21pdW5pZHB0ZXN0
-Lm1pdW4uc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGl9GoKC
-gm7ywKn8I5eAF+MEUkDPPPt5KMSfIe7SZmI975vceeCDaPOZ8gvKuAHHC3yG6fgf
-FLqNffN26y4k6EYg4XVGq5u8SmEwDktTn4wRJyj4NN9cqg3EZbw7wa10jTVTGEWm
-13Hf0TEi2qAkU3Xb8K7hHDy//BnKHo1FZLcIPMUGrIpaCl32klb5fAwvE+E6QgCB
-aFup4A/f+gTnofyIo1gi8TmMs/7v+A5Ty39VdmU15eXvA2TBhGEDFmVAQWnZvSQ2
-YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
-7RI4YGkyabhUuiM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidptest.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://miunidptest.miun.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidptest.miun.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidptest.miun.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUDopqrwr+8ysNjsx8WcAQU0xgFqYwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
-MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSfUra2csPm7zfml2+
-+FLWgZ3C3W7V77ogOuOd/5+79XywWdtHD1WrJntmL4eGvytW8vU6/DOo0c4UVKxt
-DKB2LSIy6uwd+OPbnWl6IQbk2ylb0UOIMV1pLMgBmrBoKt2dtpUH0T3Oqg2D7r9r
-CH8nk7rgrT5INIQDCS1NNVWEgRqltMH1Mmn90J2XzoGZrl6ZmEZ8uWURcypuPZcT
-QY9VvbVP8PKz1Bo9Qhh0LjXOumIGCdQoH0sQytePjcroLpL1HSAvX7DDsPNl4/Qh
-snILrHdK2z601oN1Ngu1rxrqWz0H2j9Z8U+zYjxdGOpvjXPg8iOIZJW0YM36SbcB
-SfKZAgMBAAGjbTBrMB0GA1UdDgQWBBQC5zJpccPPIWSbMiJAkQHQ39PBNTBKBgNV
-HREEQzBBghNtaXVuaWRwdGVzdC5taXVuLnNlhipodHRwczovL21pdW5pZHB0ZXN0
-Lm1pdW4uc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACdM6Gcf
-mHA0Hr1zC4T18vXqj2todlOm/wBoisGcJ8Yvz5YDozE0Ginn1RpjaUab/v10s8BK
-xBwVnyzTupIJMl0pW7XEHzVEWStpn69m+iNFtDuCe8gVvILI0dRt1NVUD/+b3d1U
-/QePhM43hJVGWi7/yyP12INV98P4HdZ91VMxafGzFVCh/cgLjYxwVaAYt0kCzZqE
-oAK9ajxQTMEz7h5ebJDfi+eydnDmzUFuFYzjB4CIPs0YLvyr5R1wXOxzZcpPE7c5
-qjqmAlpXZIozlPXNuM5NG2qX5fs+okW0ZvDzp7uGthyxxTchBR8PxTfSnE2ImX2a
-Q2DB2f7ifMpnsvw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIVAPRwsS0jawwgnaLnIOydT5jeXjVhMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4uc2UwHhcNMTYwMzE0MTA0
-ODMyWhcNMzYwMzE0MTA0ODMyWjAeMRwwGgYDVQQDDBNtaXVuaWRwdGVzdC5taXVu
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4EPO2E98M79WKFHy
-APjeQALlMgPuAkrVa9aiC84V7q3hgfdbD0wbNJTGA9uj7an2Fz5uNfUWS1Rg/7DT
-uEjrGpsWXn3mlBuH2wOZe9wHqFwVf5NUos/00gLxs6WIjaNv6gxnbnVss0pKURTL
-+bl4mn7XSPpbNosWlHkn4IbnXBi8zTwQ7Us2+klu15YfAPnlkMYgzOl1YkxqB3cM
-zxnejzBjzpG1VJWkLUOEFxlFYUwEsn5aOMpT4DXEq1PSSZfDmtz6tN+WQiV8W1rt
-QYyThOUwvF+L6Z9N960IFfiirCVk30doFfu5P/KmzciFWKcRHH2Jce3R/pC0SVNs
-56Z63QIDAQABo20wazAdBgNVHQ4EFgQUhtV3ZMcE4JWqlNJJVYkqB5inKUEwSgYD
-VR0RBEMwQYITbWl1bmlkcHRlc3QubWl1bi5zZYYqaHR0cHM6Ly9taXVuaWRwdGVz
-dC5taXVuLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCKf/Z8
-m1RMKsiP56XEBD/KlZToM23WF+i3xw7IPlo6a+bMT2emxKBCVv3CU6oMe55TMUeu
-RHzNHB3g0oa/xH+APxLbP64FMvDrJAPFDsltRX97C9UyO47rBL983Jcjo20fjCt1
-03xMipYa9aYc6miUSXKSP0zLu8XoyRo8Vlx0+4y1hI1B/vfgw2I850thSfM/TepO
-eHLpC5j1cjhz+omgj8KtOu4iwRShXmOTb3/MPKYQ0BezIuI99QfavE3jkdVg4+bb
-sEjpTEgCNeNotsnug8EzSf3jMac7QVsKk/ZUjpMUiH1QWeXQSzpkT+BfEjcXUm23
-p8Zy6HNa1RvGgW8P</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUPMQjIIrMt+goB+uHSwi2oO14KAgwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
-MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgqMKF+EDtjw74HWSy
-t2SU4fV4734PyV9gsPBJph8VQ32cAB7tqkqhIQbkHJKhJ4XeladH+ifk+BOdje9n
-EwIKIehxdujW832NAlMkEXfo3M2wt8UCBATCoWsxexkFUtNhZQnvtUm7dW0GuDYE
-NaZd0W6JMz0vBl83+JatCHu30kHu6CDgo/D6S9RL4pj3KiN08oR5Rjn5jHdNgMTf
-dNuYn2jsvKiR9EtcXC2KgvtYwqzGpjmcFxthBPBF3lzAza8ES16UVCPxVuH9DSJ5
-gB20wTMzP9xKSWQ/NKjh4AqEZ0hLH4dXGDzA3G3h/IkSgfaB+XalZDC6vzfuXXnv
-dE2HAgMBAAGjbTBrMB0GA1UdDgQWBBREfhKvA2DRE1mKkZfCgjAyiwegWzBKBgNV
-HREEQzBBghNtaXVuaWRwdGVzdC5taXVuLnNlhipodHRwczovL21pdW5pZHB0ZXN0
-Lm1pdW4uc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGl9GoKC
-gm7ywKn8I5eAF+MEUkDPPPt5KMSfIe7SZmI975vceeCDaPOZ8gvKuAHHC3yG6fgf
-FLqNffN26y4k6EYg4XVGq5u8SmEwDktTn4wRJyj4NN9cqg3EZbw7wa10jTVTGEWm
-13Hf0TEi2qAkU3Xb8K7hHDy//BnKHo1FZLcIPMUGrIpaCl32klb5fAwvE+E6QgCB
-aFup4A/f+gTnofyIo1gi8TmMs/7v+A5Ty39VdmU15eXvA2TBhGEDFmVAQWnZvSQ2
-YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
-7RI4YGkyabhUuiM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.miun.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.miun.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA Department</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:GivenName>Incident Manager</md:GivenName>
-    <md:SurName>SystemDrift, INFRA Department</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:GivenName>Incident Manager</md:GivenName>
-    <md:SurName>Mid Sweden University Incident Manager</md:SurName>
-    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/miunidtest.test.miun.se-saml-miun-metadata.xml b/swamid-2.0/miunidtest.test.miun.se-saml-miun-metadata.xml
deleted file mode 100644
index abcb63e1..00000000
--- a/swamid-2.0/miunidtest.test.miun.se-saml-miun-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://miunidtest.test.miun.se/saml/miun/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-12T08:35:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">Studentinformationsverktyg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Student Information Tools</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Tjänster för studenter.</mdui:Description>
-        <mdui:Description xml:lang="en">Services for student.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDZTCCAk2gAwIBAgIUPqt3KoPwgXU1NxKQGo6pC+HBdKEwDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxHjAcBgNVBAoMFU1pZCBTd2VkZW4gVW5pdmVyc2l0eTAeFw0yMDA0MTcxMzU5MDFaFw0zMDA0MTcxMzU5MDFaMEIxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMR4wHAYDVQQKDBVNaWQgU3dlZGVuIFVuaXZlcnNpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY6KIUQNALQPAeBCWbDwVbYY0iFU3Awy59rZx6DNjksqYVnOV6IAgZHc72NSrgk8Hytx1DufoSXVq90PeBAhnQep4bll61oe2Z74KoAbEd8ys+JtvloMZ61V3IeNVria7AgjXyI7AALydiu4GW/H/+eXISjC8gAkSzMpxBmGI4oZdDiKYn16D9vJncQFW7HtR2xKqu4oEeIV1mrUHQ8dhQIgJgeKA3MEdvywC0pQePwkuncWEy2E8syPSWr/+Axtw04CQQGtRGAGk4yGHyRrDWt6zdQ02ayiH8+FsdswjSZUuSii/wuo1GYBnFDbWPO/FM2f+E5Z8EPdPtGCgeBAohAgMBAAGjUzBRMB0GA1UdDgQWBBQPU0Sczduvg9nyck0RhUptiSv8DTAfBgNVHSMEGDAWgBQPU0Sczduvg9nyck0RhUptiSv8DTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCB5ggnFQMmCTgmYP8RXQyVIagTqzS5vHlqcwn86HN00v3ov69C+kNMYCV3e+xTY2HmABGIbh5SiqxHq36A7BPrX7H5c7CuNhDhG6ol+Xeeg/mzbyKD0DbsJ/KmUF6iLICCKiQoJC1hck1ApRJP8F30MW8yeJlJDu9vvefKqbXaTS83uYpzy0yQBk6z+nDLlaU20Hx2sSHqXOQS9i8dxb5TNcZlHS36IEW5I2SgRRJ+SYxFrytI+8TJQkQoueJ7n8SGd+VjyXUcMXx7HsZwgzMyYoJyolMY5Ts6mHr+REn+xk+PB5V5J40WXAMwCQg7OjL0P+yjgFThKvo03etq6xfG</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDZTCCAk2gAwIBAgIUPqt3KoPwgXU1NxKQGo6pC+HBdKEwDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxHjAcBgNVBAoMFU1pZCBTd2VkZW4gVW5pdmVyc2l0eTAeFw0yMDA0MTcxMzU5MDFaFw0zMDA0MTcxMzU5MDFaMEIxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMR4wHAYDVQQKDBVNaWQgU3dlZGVuIFVuaXZlcnNpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY6KIUQNALQPAeBCWbDwVbYY0iFU3Awy59rZx6DNjksqYVnOV6IAgZHc72NSrgk8Hytx1DufoSXVq90PeBAhnQep4bll61oe2Z74KoAbEd8ys+JtvloMZ61V3IeNVria7AgjXyI7AALydiu4GW/H/+eXISjC8gAkSzMpxBmGI4oZdDiKYn16D9vJncQFW7HtR2xKqu4oEeIV1mrUHQ8dhQIgJgeKA3MEdvywC0pQePwkuncWEy2E8syPSWr/+Axtw04CQQGtRGAGk4yGHyRrDWt6zdQ02ayiH8+FsdswjSZUuSii/wuo1GYBnFDbWPO/FM2f+E5Z8EPdPtGCgeBAohAgMBAAGjUzBRMB0GA1UdDgQWBBQPU0Sczduvg9nyck0RhUptiSv8DTAfBgNVHSMEGDAWgBQPU0Sczduvg9nyck0RhUptiSv8DTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCB5ggnFQMmCTgmYP8RXQyVIagTqzS5vHlqcwn86HN00v3ov69C+kNMYCV3e+xTY2HmABGIbh5SiqxHq36A7BPrX7H5c7CuNhDhG6ol+Xeeg/mzbyKD0DbsJ/KmUF6iLICCKiQoJC1hck1ApRJP8F30MW8yeJlJDu9vvefKqbXaTS83uYpzy0yQBk6z+nDLlaU20Hx2sSHqXOQS9i8dxb5TNcZlHS36IEW5I2SgRRJ+SYxFrytI+8TJQkQoueJ7n8SGd+VjyXUcMXx7HsZwgzMyYoJyolMY5Ts6mHr+REn+xk+PB5V5J40WXAMwCQg7OjL0P+yjgFThKvo03etq6xfG</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidtest.test.miun.se/saml/miun/sls"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidtest.test.miun.se/saml/miun/acs" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Studentinformationsverktyg</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Studentinformationsverktyg</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.miun.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.miun.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Manager</md:GivenName>
-    <md:SurName>Mid Sweden University Icident Manager</md:SurName>
-    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml b/swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml
deleted file mode 100644
index 3ca2568f..00000000
--- a/swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://miunidutv.test.miun.se/saml/miun/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-12T08:35:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">Studentinformationsverktyg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Student Information Tools</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Tjänster för studenter.</mdui:Description>
-        <mdui:Description xml:lang="en">Services for student.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEoTCCAwmgAwIBAgIJALr6KmPgG+ebMA0GCSqGSIb3DQEBCwUAMGcxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxIDAeBgNVBAMMF21pdW5pZHB1dHYudGVzdC5taXVuLnNlMB4XDTIwMDkyMjA4MjY0N1oXDTMwMDkyMjA4MjY0N1owZzELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEgMB4GA1UEAwwXbWl1bmlkcHV0di50ZXN0Lm1pdW4uc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDG6ZhVyA1nYDkcjSOWTBHSVUWwo0ku36oZ/+KWo4KHK9PaA66FpQc0iisOO7aXXFFbtR2WS3dkymUp4wGiOCuda/omF1SMTmYyYKAcPXAei+dsVxNsJ+5notWj5JRKnRQxJ4TnS7GJiS1pK2JBAifx4ssPZCIa5F941iQDiJk6r3/S9C4+AxCkQej7zrNr9AzFYksNSOzLcOxZatG6X+L6EV+ujAtIiwtiJ8rnh4jFyY33LrXuVWty3fGPBn4HG7NiCnjRt+MopEPc0TAM0XX+5xY6TTEYwQASK66ScypIfSBuhTiVixpRcKcMcAENHKQJTNueS+f0w23ESKpGgKGn98MwIy93PzEgX3T9f3wefKLVSxHuPizOs5tWPoGEtzT1RDqYR7gZxkKw0vz8fFmt/JQPOvX0xTZzxomaiFCgyyZsHk6gtlYnTtFZf4ULI/NiK8mC9oQA6VR3FqOAsYpV3i6atVl55g4gUs4lXuRKFW2HbNrarDhZ2IEvLHrzCasCAwEAAaNQME4wHQYDVR0OBBYEFChMG93llg10eQb2YkbVrxb9k5ZpMB8GA1UdIwQYMBaAFChMG93llg10eQb2YkbVrxb9k5ZpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggGBABz2u3FfSXJyLyMpuTdGV2H0G1t2hRQi6F+uMdCQEwZ5dXbX5sutEl5JzKR57amtNfXodeCQck1pgXDoT3dM8lgi8f4Oz1tKo0PZQfXL+zQiev0/9X6iC1cXWqjuMw28c4o0YYz+j+8WFdaNjW4zxYNBay9hBsPoofxWZeaTGV5Y93svy4xe+9G0Mbo42LOUDXEhOnHMip3TdBMGsNu2VEcUzLiKjKZBmzUtqISofD61fdI8d22je/bRim7MV69i9uGHw4pmbWEd3OAmMGFIIyOZOM/fPAIxLKV7kZs11xVBL14ViHFBKklQcYqZ1ws+N0fUhwaBzQzzUzaPz9wN4X0ixvr0wNM9M3Sv/dM4Cfq7fkvp5qJBuj+nIX7YgBPllMwUtf9XddGYxZJZrkpjNlt03WPTmPU3wZDiR125442ANoPZZ1TAC5W3z7Q+5SKCSMaZxNRagwwr5oeA3iLdfaJsHEln6f215KAMTisHCVuscmX0kA/YwWTkIMztb5JUcg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEoTCCAwmgAwIBAgIJALr6KmPgG+ebMA0GCSqGSIb3DQEBCwUAMGcxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxIDAeBgNVBAMMF21pdW5pZHB1dHYudGVzdC5taXVuLnNlMB4XDTIwMDkyMjA4MjY0N1oXDTMwMDkyMjA4MjY0N1owZzELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEgMB4GA1UEAwwXbWl1bmlkcHV0di50ZXN0Lm1pdW4uc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDG6ZhVyA1nYDkcjSOWTBHSVUWwo0ku36oZ/+KWo4KHK9PaA66FpQc0iisOO7aXXFFbtR2WS3dkymUp4wGiOCuda/omF1SMTmYyYKAcPXAei+dsVxNsJ+5notWj5JRKnRQxJ4TnS7GJiS1pK2JBAifx4ssPZCIa5F941iQDiJk6r3/S9C4+AxCkQej7zrNr9AzFYksNSOzLcOxZatG6X+L6EV+ujAtIiwtiJ8rnh4jFyY33LrXuVWty3fGPBn4HG7NiCnjRt+MopEPc0TAM0XX+5xY6TTEYwQASK66ScypIfSBuhTiVixpRcKcMcAENHKQJTNueS+f0w23ESKpGgKGn98MwIy93PzEgX3T9f3wefKLVSxHuPizOs5tWPoGEtzT1RDqYR7gZxkKw0vz8fFmt/JQPOvX0xTZzxomaiFCgyyZsHk6gtlYnTtFZf4ULI/NiK8mC9oQA6VR3FqOAsYpV3i6atVl55g4gUs4lXuRKFW2HbNrarDhZ2IEvLHrzCasCAwEAAaNQME4wHQYDVR0OBBYEFChMG93llg10eQb2YkbVrxb9k5ZpMB8GA1UdIwQYMBaAFChMG93llg10eQb2YkbVrxb9k5ZpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggGBABz2u3FfSXJyLyMpuTdGV2H0G1t2hRQi6F+uMdCQEwZ5dXbX5sutEl5JzKR57amtNfXodeCQck1pgXDoT3dM8lgi8f4Oz1tKo0PZQfXL+zQiev0/9X6iC1cXWqjuMw28c4o0YYz+j+8WFdaNjW4zxYNBay9hBsPoofxWZeaTGV5Y93svy4xe+9G0Mbo42LOUDXEhOnHMip3TdBMGsNu2VEcUzLiKjKZBmzUtqISofD61fdI8d22je/bRim7MV69i9uGHw4pmbWEd3OAmMGFIIyOZOM/fPAIxLKV7kZs11xVBL14ViHFBKklQcYqZ1ws+N0fUhwaBzQzzUzaPz9wN4X0ixvr0wNM9M3Sv/dM4Cfq7fkvp5qJBuj+nIX7YgBPllMwUtf9XddGYxZJZrkpjNlt03WPTmPU3wZDiR125442ANoPZZ1TAC5W3z7Q+5SKCSMaZxNRagwwr5oeA3iLdfaJsHEln6f215KAMTisHCVuscmX0kA/YwWTkIMztb5JUcg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidutv.test.miun.se/saml/miun/sls"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidutv.test.miun.se/saml/miun/acs" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Student Information Tools</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Studentinformationsverktyg</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.miun.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.miun.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Manager</md:GivenName>
-    <md:SurName>Mid Sweden University Icident Manager</md:SurName>
-    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mp.uu.se-Shibboleth.sso.xml b/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
deleted file mode 100644
index ba58f45e..00000000
--- a/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mp.uu.se/Shibboleth.sso">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-08-27T14:32:49Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mp.uu.se/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mp.uu.se/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mp.uu.se/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medarbetarportalen är ett intranät för anställda vid Uppsala universitet, men är även åtkomlig för studenter och externa användare.</mdui:Description>
-        <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/sv/web/support/om-mp</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/en/web/support/om-mp</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/en/web/support/behandlingpersonuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/sv/web/support/behandlingpersonuppgifter</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE4TCCAsmgAwIBAgIJAI0x6wTI/Lj2MA0GCSqGSIb3DQEBCwUAMBMxETAPBgNV
-BAMTCG1wLnV1LnNlMCAXDTIyMTAxNDA3MDYxNloYDzIxMjIwOTIwMDcwNjE2WjAT
-MREwDwYDVQQDEwhtcC51dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALz3r5VkxvRWQLkIgFkAnm0ZDxwcGkWVngtQaxZZoXke2c64f2ojAxJDsigF
-bv/+INsgbrKEqH8VbrBIWY62MFvgOxCX1qdKu8qy2iu8Jc7hAeuTO2rbIhUb2fjk
-wECeEFc+09hA9lnYnaVzfl4sNw1YvfBZzzeo7R5/CBpW82MAMnKrdqsORI2Kuhoc
-Wc1WcNcB7F3kIPh+6LeeGNLmtSmQZG5GcL1OfZjCMfCUPyJd1lHKQT5OhtjZY5Zv
-lFBWd1n1G8DV6cJYx5l+S5eswCdPCjj5aYkLuQqKFfzsELQbeyjSjmXVUbqFzU82
-clWIbmnVVDPQyBsSTWtdYmAc7gpu510Vfg1eI6OSyv3yYj0R1ItFe0DfHX7CKgh9
-/dguIPpjW5OJ3aFsU1PYgAgymxSQGVacUpY+uORTBiR7Rh7dm3etwE59HXZnad+y
-ISwyDU5wyteV45imwzKXTRlhHoAa+kMFFaXGAZIz7dLoedbK2296VN4dZSEksFo/
-ioxoiQGesCEmEYeiQieWNowaYmn4TQ1BqzYA4OF1+r3HWiths2/18sMlnBho5J7m
-Q+n1A4zR89tgtaI1ip7Pc/IfP1Aocq8QNVkHy7Ex8u8N2ObOc8bH9W64XELKNgWS
-6zzbXeIrbW3ynhvxSjvM3pgHNN5w0vD/TJdAAVywm3+SkYQXAgMBAAGjNjA0MBMG
-A1UdEQQMMAqCCG1wLnV1LnNlMB0GA1UdDgQWBBT6e9kD4l2/lLj3jdE92cBb62+O
-VjANBgkqhkiG9w0BAQsFAAOCAgEAmv7nye4Q7fdV/OyVNySuAWIHCTKMX/2sMI5I
-+E20r5bd9/3EV+Be4gAPoU4k8XInk/lqvPJ+3mouCmq/efGoLdlPCLB++W8JzkAg
-lMLEKJRpzUh7gTX6DNigS7yL1ylgYaBF2KRpDLI82OS4pZrw5uDEJOh+yy55DIJL
-CF7d3xGwwF9mhs7awfs7WHWgEXeFLkzk3/BRQ4+xesiZrig/YMXXsItyWu8VTp6w
-59M6Zy+QdsnBOHYbvwB36C7+H/G6pSV9S7koCJZDLixrIEx2pOMibSqySVWkKoHy
-nYlB3ayNSICuFY1pgpV+sWb16cAwYwFCeFS1cmiLcGUqs/3dpiHqbdzdxFEsKYVh
-7J05VKQq0lyQaOsD6ZW9VSxX0imh21a0A9h9s92zr2HzwdHVcTXHuRuP9ysg/Ggg
-PsHPVqD5goO/nOogVXyyH6oMKGVkWKb2SZ5w6RJBFV7Hh92pPbOJFH9IpIZB6KYI
-SHm6nw6N74AYqMzlo+w64RuZN6+MX2Pnfjh1U9/Q2enbuVhrWbfdeVF5DPRGfwu1
-D4mIDeqSOix+Op/B2prMrBSX8wZ4z32Oc9mmIxoWxoi8OhtkAUtbqmvqEWc62NnS
-5RR9ubD00b64K0ab5utvIexMO0v8LctZRFnxMErlRYzisOZcjEjK7TuI0rj8RjM5
-A2fBr5E=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mp.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mp.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mp.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mp.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mp.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mp.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mp.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mp.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mp.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mp.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mp.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</md:ServiceName>
-      <md:ServiceName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala University</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml b/swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
deleted file mode 100644
index 2a187d4f..00000000
--- a/swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://nextcloud.fysik.su.se/swamidproxy/nextcloud.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-05T08:58:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nextcloud.fysik.su.se/swamidproxy/disco" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Fysikum Nextcloud</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Fysikum Nextcloud</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/nextcloud-storage-backup</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/nextcloud-storage-backup</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIULOMzxx3eC1JPmsnSkAiDyv8BV40wDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVbmV4dGNsb3VkLmZ5c2lrLnN1LnNlMB4XDTE5MTEwNDA4
-NTIxMFoXDTI5MTEwMTA4NTIxMFowIDEeMBwGA1UEAwwVbmV4dGNsb3VkLmZ5c2lr
-LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4b5SfEBujPbm
-VjILrhDEFcbCm3m8YGrMKA1/kX1CWfaO6kz93Sms5qbFCvBsZQ1l9mdYDqiJMnPD
-mVNex06dpDQvJ7Rm/VOlPOYzXECca1HnDQl2RI/G2GF/55nSqeeqrL5L8otGC1Dr
-DVwkcANczO8nwF8uG49nYCoQnXQUHaQkZlhkKCADtfH49l5NYCGaMmkDOyXUKLOU
-9hGkGfp04EnxlCz3WtooUWxki6Kgr3AIKeLOTT5jG2I4Lu1E8kxt4eYROqt2teM8
-KJ2qtZEPhP3qZuCfH6ttymc1UI+JGzkcVrAAfpZ8ETvprCxHFEF/OIBamOTiHLrk
-Fve4MyJDQQIDAQABo1MwUTAdBgNVHQ4EFgQU8wc9OWV5I5dYu4mv0WwBC6Vd2L8w
-HwYDVR0jBBgwFoAU8wc9OWV5I5dYu4mv0WwBC6Vd2L8wDwYDVR0TAQH/BAUwAwEB
-/zANBgkqhkiG9w0BAQsFAAOCAQEAYEE1j/hk33ffBPXagSkMhGNnn2II7R4G8TdD
-9k+PFc5ZN5iccdyKledJQuyZ6/2fxIMyvAj3/BI+nhyUDMt2CfJ4BuGguvrJh8jm
-n34gM6hYC13gs4hlCjNyxo0ABwb3BrHLdUp3851YRfBKYa5IcPqnQz96Th+OkUnQ
-xGQuNFs58JjHcdc0MsnCE5urIPo5np5Z8k/2f4h1M49iNYtfz8gdhqaWGBLtY1IF
-dwfO9Ln4KIh7foGimbAF2y7ekk7Wl4suyyFDBfcGLOdACk/9rog/YMvkv8jXKyg5
-sE6WTDYtmjbeP1uUWRiDjM1LChB3r+JC18BYVVpXXzF6opaiEw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID5DCCAkygAwIBAgIUTo+7ru5RRb7n0UwBzVP/naj8dJUwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAxMGbGFwdG9yMB4XDTIwMTAxOTIwMTAyNloXDTMwMTAxNzIw
-MTAyNlowETEPMA0GA1UEAxMGbGFwdG9yMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A
-MIIBigKCAYEAsxFQyn+LOE53TgAjeTrYp08HB7rynUWn4an4fGyNIRmy6ePxQLzo
-T8KFWQFcLgKlYxxxpkhLq+LE3ELt/sOxUw43Q1vSbXX6eyE+n0ft1oWkPNnV83WP
-muWHDT8a1vrulAaS4zns1vbSYat7trrS0MYyzUaHkjE+j2A4U6x1nR+YdkjZWMZR
-Fm6wxs+gdepcnWbrAuGFDsPcYTrHXei2jLRIt9rhgHAhFq7FXGiKl5uh+MKH7FUY
-c62tQA4cAuWTUZL/1osrrrEy8COVYkgyckdf9mczfs+ipPoY/BPiITdX/CFXld3e
-VfKMaXzK+odfpZGi3HBuyepX725CnnO0kMtANOZ3Z+ElySQOaStbaPjNzmGHtiiD
-wQOYg6aFeVvKKuVuFUCa3ulDc5mNCH/hz640+rAzTVp9s9t/mF5vDyq+H+exsoSV
-oDz8k6OQz5zB0rEJecbmQO1f8b3P1Oxq5Y63IUUaloiNxIJGxMdKUfsHNv/Zbh9Y
-jUfafT9SSyRrAgMBAAGjNDAyMBEGA1UdEQQKMAiCBmxhcHRvcjAdBgNVHQ4EFgQU
-KC1RzMnMhY+iXBMPkHZL/BQVMsEwDQYJKoZIhvcNAQELBQADggGBAJf2vYjK9lWa
-zFKw2vu9oFGGugHmPYzuiiFCfWO8lPtlSvocKNFdOfu9Ge8O054Wee5v6div0o3e
-5QfIO2/EicwwyQPVH7R35rXiVkgodCB2b/CkZa+40MmF4mX9Psd6QwhbDwq7w/9V
-2Zf8tdh+zBkv2bgzzgSBeD9LFqgs1NkIKrPiaf13HbJH0NQPNwkEMnFwtElTTdtb
-FbkXIvULADzafkfHb3NnwF/e3foe0EqbNnRZ0n3yDvqlopGtdU/0PwXXv2l81IUM
-hlDdvgrL5oC4FooDRHhsgWZcZGr571CpNfAcMlPn7ZA/GoN+aUKAIfmP6Jtzo9JW
-dMoXJHtQtBWO+heairETbNW0vCaeXaij6bRqnM6XbQMD8k1iN2NtdEnT5D+g/ce/
-QttmrlLeSQIypcO15eEesYK/no3Gm1CEy0G5jwwajDN4JApjEIpdd0SkUVnCJkWV
-ZvXfxWm8pZrfPFiZV0nY3FZ8Qwz/T1Ne4pdqZV7vR1Wbgetamv0ocA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcloud.fysik.su.se/swamidproxy/acs/post" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Fysikum</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fysikum</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://fysik.su.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://fysik.su.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alex Kastanas</md:GivenName>
-    <md:EmailAddress>mailto:kastanas@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Support at Fysikum</md:GivenName>
-    <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-00.its.umu.se-aws-idp.xml b/swamid-2.0/nya-00.its.umu.se-aws-idp.xml
deleted file mode 100644
index 23702110..00000000
--- a/swamid-2.0/nya-00.its.umu.se-aws-idp.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://nya-00.its.umu.se/aws-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-04T13:59:17Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://nya-00.its.umu.se/aws-idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">nya-00 Test IdP antagning.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">nya-00 Test IdP universityadmissions.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">An IdP in the development environment of NyA</mdui:Description>
-        <mdui:Description xml:lang="en">An IdP in the development environment of NyA</mdui:Description>
-        <mdui:Keywords xml:lang="sv">antagning.se universityadmissions.se</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">antagning.se universityadmissions.se</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.umu.se/om-webbplatsen/juridisk-information/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.umu.se/en/about-the-website/legal-information/processing-of-personal-data/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDCzCCAfOgAwIBAgIJAMOqLrsG9SMvMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMMEW55YS0wMC5pdHMudW11LnNlMB4XDTE3MTAwMzEwMzQyMloXDTE3MTAwODEwMzQyMlowHDEaMBgGA1UEAwwRbnlhLTAwLml0cy51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNJgptpHFQ7rbatj2nL8DBKIHNCtJe1k1siw4BPAfK//CuHPVk52EkYwS43BArWDGRYnBsQGmMzCJCESgY4yMjG4ZRTn58oL8ZcJV97OcuQQHqZZ54q21RxM8QGarwDrhS0Xl6G4wcPgXfWrJzzz10b905OI3cVzgHOMB6MHhlfUW0Af+kFeZLXURDEvNXAgsSMzIpDvShNNHcDh6ECK3L8FCMUxKql4vK/3QxNz/w6bfd0hcn0YPsyPtYvLiOo/10uF1cAS57iCmdi0NjFxHdN/3la/toXDs3kF/ic+OMnnT8tyWEo1AH3qZkrrYJvBW1Zb2+v4/RiysVEXZuv9TJAgMBAAGjUDBOMB0GA1UdDgQWBBRXZaVRn3RW9pZSsrOMTC3LyapgFjAfBgNVHSMEGDAWgBRXZaVRn3RW9pZSsrOMTC3LyapgFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBccVp+e9555c/wKzDeetuwSm4exsGShcZ2xDgY+HSi2qv4e34t1cPBM4yfm88tf3GEHYkGclFRIsO+V3wmYNQWBfY/M8YTE7cg6+T4bUG0S4/oDNkc9KCDJi0CUlOL5ML2E0x2pQSmqJShMQYxmS4HKeDMkeLaFNRGw9xOm2XQmWONfhQcbR33d6BeAenkQJOnlfOeC22ThAQ+zgGbVz0+DdSQOiDoDNlSxGe/RFlx2QaA7k0yrtLkSHllrGENeNzk84qsjFkwxVSko94VmqkOe9T+bvtPY6ta2vO7LKDmSSi90MrCvuLvLQTrOvwHnCijmPIxgLgkjm3oH+owyS6l
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.its.umu.se:8442/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.its.umu.se:8442/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.its.umu.se:442/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.its.umu.se:442/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.its.umu.se:442/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.its.umu.se:442/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDCzCCAfOgAwIBAgIJAMOqLrsG9SMvMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMMEW55YS0wMC5pdHMudW11LnNlMB4XDTE3MTAwMzEwMzQyMloXDTE3MTAwODEwMzQyMlowHDEaMBgGA1UEAwwRbnlhLTAwLml0cy51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNJgptpHFQ7rbatj2nL8DBKIHNCtJe1k1siw4BPAfK//CuHPVk52EkYwS43BArWDGRYnBsQGmMzCJCESgY4yMjG4ZRTn58oL8ZcJV97OcuQQHqZZ54q21RxM8QGarwDrhS0Xl6G4wcPgXfWrJzzz10b905OI3cVzgHOMB6MHhlfUW0Af+kFeZLXURDEvNXAgsSMzIpDvShNNHcDh6ECK3L8FCMUxKql4vK/3QxNz/w6bfd0hcn0YPsyPtYvLiOo/10uF1cAS57iCmdi0NjFxHdN/3la/toXDs3kF/ic+OMnnT8tyWEo1AH3qZkrrYJvBW1Zb2+v4/RiysVEXZuv9TJAgMBAAGjUDBOMB0GA1UdDgQWBBRXZaVRn3RW9pZSsrOMTC3LyapgFjAfBgNVHSMEGDAWgBRXZaVRn3RW9pZSsrOMTC3LyapgFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBccVp+e9555c/wKzDeetuwSm4exsGShcZ2xDgY+HSi2qv4e34t1cPBM4yfm88tf3GEHYkGclFRIsO+V3wmYNQWBfY/M8YTE7cg6+T4bUG0S4/oDNkc9KCDJi0CUlOL5ML2E0x2pQSmqJShMQYxmS4HKeDMkeLaFNRGw9xOm2XQmWONfhQcbR33d6BeAenkQJOnlfOeC22ThAQ+zgGbVz0+DdSQOiDoDNlSxGe/RFlx2QaA7k0yrtLkSHllrGENeNzk84qsjFkwxVSko94VmqkOe9T+bvtPY6ta2vO7LKDmSSi90MrCvuLvLQTrOvwHnCijmPIxgLgkjm3oH+owyS6l
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.its.umu.se:8442/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.its.umu.se:8442/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">UmU-ITS-NyA-dev</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">UmU-ITS-NyA-dev</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">ITS, it-stod-och-systemutveckling</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ICT, Services and System Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/it-stod-och-systemutveckling/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/ict-services-and-system-development/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Umea University</md:Company>
-    <md:SurName>Mikael Lindmark</md:SurName>
-    <md:EmailAddress>mailto:mikael.lindmark@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/openidp.feide.no.xml b/swamid-2.0/openidp.feide.no.xml
deleted file mode 100644
index 1f146aff..00000000
--- a/swamid-2.0/openidp.feide.no.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://openidp.feide.no">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://openidp.feide.no">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICizCCAfQCCQCY8tKaMc0BMjANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTEQMA4GA1UEChMHVU5JTkVUVDEOMAwGA1UECxMFRmVpZGUxGTAXBgNVBAMTEG9wZW5pZHAuZmVpZGUubm8xKTAnBgkqhkiG9w0BCQEWGmFuZHJlYXMuc29sYmVyZ0B1bmluZXR0Lm5vMB4XDTA4MDUwODA5MjI0OFoXDTM1MDkyMzA5MjI0OFowgYkxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxDjAMBgNVBAsTBUZlaWRlMRkwFwYDVQQDExBvcGVuaWRwLmZlaWRlLm5vMSkwJwYJKoZIhvcNAQkBFhphbmRyZWFzLnNvbGJlcmdAdW5pbmV0dC5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAt8jLoqI1VTlxAZ2axiDIThWcAOXdu8KkVUWaN/SooO9O0QQ7KRUjSGKN9JK65AFRDXQkWPAu4HlnO4noYlFSLnYyDxI66LCr71x4lgFJjqLeAvB/GqBqFfIZ3YK/NrhnUqFwZu63nLrZjcUZxNaPjOOSRSDaXpv1kb5k3jOiSGECAwEAATANBgkqhkiG9w0BAQUFAAOBgQBQYj4cAafWaYfjBU2zi1ElwStIaJ5nyp/s/8B8SAPK2T79McMyccP3wSW13LHkmM1jwKe3ACFXBvqGQN0IbcH49hu0FKhYFM/GPDJcIHFBsiyMBXChpye9vBaTNEBCtU3KjjyG0hRT2mAQ9h+bkPmOvlEo/aH0xR68Z9hw4PF13w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICizCCAfQCCQCY8tKaMc0BMjANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTEQMA4GA1UEChMHVU5JTkVUVDEOMAwGA1UECxMFRmVpZGUxGTAXBgNVBAMTEG9wZW5pZHAuZmVpZGUubm8xKTAnBgkqhkiG9w0BCQEWGmFuZHJlYXMuc29sYmVyZ0B1bmluZXR0Lm5vMB4XDTA4MDUwODA5MjI0OFoXDTM1MDkyMzA5MjI0OFowgYkxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxDjAMBgNVBAsTBUZlaWRlMRkwFwYDVQQDExBvcGVuaWRwLmZlaWRlLm5vMSkwJwYJKoZIhvcNAQkBFhphbmRyZWFzLnNvbGJlcmdAdW5pbmV0dC5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAt8jLoqI1VTlxAZ2axiDIThWcAOXdu8KkVUWaN/SooO9O0QQ7KRUjSGKN9JK65AFRDXQkWPAu4HlnO4noYlFSLnYyDxI66LCr71x4lgFJjqLeAvB/GqBqFfIZ3YK/NrhnUqFwZu63nLrZjcUZxNaPjOOSRSDaXpv1kb5k3jOiSGECAwEAATANBgkqhkiG9w0BAQUFAAOBgQBQYj4cAafWaYfjBU2zi1ElwStIaJ5nyp/s/8B8SAPK2T79McMyccP3wSW13LHkmM1jwKe3ACFXBvqGQN0IbcH49hu0FKhYFM/GPDJcIHFBsiyMBXChpye9vBaTNEBCtU3KjjyG0hRT2mAQ9h+bkPmOvlEo/aH0xR68Z9hw4PF13w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openidp.feide.no/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openidp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andreas</md:GivenName>
-    <md:SurName>Åkre Solberg</md:SurName>
-    <md:EmailAddress>mailto:andreas@uninett.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/permitwinstaging1.caleaccess.com.xml b/swamid-2.0/permitwinstaging1.caleaccess.com.xml
deleted file mode 100644
index fd35829d..00000000
--- a/swamid-2.0/permitwinstaging1.caleaccess.com.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://permitwinstaging1.caleaccess.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-07-04T11:36: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: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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/Login/Lund_University"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Flowbird Parking Services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Flowbird Parking Services</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Webbaserat system för parkeringstillstånd</mdui:Description>
-        <mdui:Description xml:lang="en">A web based parking solution</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://calepermit.com/customer/swamid/privacypolicy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>caleaccess.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=caleaccess.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/DCCAmSgAwIBAgIUZQq7U9ElqvROzxsBFSVGCFylSp4wDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAxMOY2FsZWFjY2Vzcy5jb20wHhcNMjAwNjI1MDgzNDQxWhcN
-MzAwNjIzMDgzNDQxWjAZMRcwFQYDVQQDEw5jYWxlYWNjZXNzLmNvbTCCAaIwDQYJ
-KoZIhvcNAQEBBQADggGPADCCAYoCggGBAKvksESS+EIF5od1vgwxRfR6m4qat1VB
-tnFJEO7hEiUrBlWwjiHcGQC6fg337aEGzh4g+dNBOeJRST+8ZmgbGc6R7O6gAQfT
-qtAaJAcfSzYl3Q6dXMU0ziQMtsZcJdIIbrMOF6eEsbK311wcZx+2g5nKIa280Bhg
-ZZI4fO0FBamBl4SEXzIxZ/7E+TtQjJDUTqJ5OuHF+BxG4awEVaIKfdseLHcbsIoM
-l6rNiSVd+/X6YD0dEhgWWd4aZxhgS4JOXOcPb6ztbF7EaM8z93ImRaHI9z2WO5Tw
-u3Wf/lNPaV71lmyZid9r29WEdiMdKe1aEokrhQJVF0Wz4YMlCwVIpAMKbOUTBDHR
-gli8QPyCYHw5SywxLwkZaVSb1ipba0nUbtNRDdtPezAXZvj3h1NyIoD+7ihTkIMd
-MuaTrXYrpW3RxqmdeNC3/yJJ+7PTkKa1VyYkJ5IoHJHS1aWMkgwsY/KmpUKuYtUN
-R0jNXMJTwOWCOMHTXSEmEPhhiemggU5k9wIDAQABozwwOjAZBgNVHREEEjAQgg5j
-YWxlYWNjZXNzLmNvbTAdBgNVHQ4EFgQUdAqevqVWsBzQHNJ63IKrJwRTaS8wDQYJ
-KoZIhvcNAQELBQADggGBAB2F7f11FaCRhVIgI5V6aWWsnK1nNw80V6O8STQdiHXX
-VnKGF+mkJmtoeNe0hJKptqQatheFzagBlzSrmvUI4FUkx5yI/0apl19402niRg/G
-+7BMlR4KtHSDFdT6NqMMnBixU0ozFE/caeLN1RP7bZHXfP9pmz/pp6s/n85UvKhu
-ZekcmCF4Gr8t0/DyalRojDmAz9g2JCJIHUzctzhUM2bpWk6pbo0VDihL2YLSQSXc
-BqOYWfgAl40ktDOZlviwhNKOAV6SNBe9xMFW/DqiKgggOQzCKMHsKvUYSuV4ALWe
-JR5RtUCyxnGYSKsCabD6V0PsL8rObVdC4PDwfv/TFRpS8Y5VDAO3j9/h1blS108d
-k1DhoZaPeEIHa97F5j6qXpFqadLLjV1O8Ph1q/EFkbAS0MYtMyRTOlxy4qypSIaO
-32l60CiSDNoQfgD0ey5ENM3vau/GSQd/ylBD1717hLEjNA4+kl2AFNPJ6r19ZNpQ
-tt8Ph0n7cMJdPPS6TcNfEA==
-</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://permitwinstaging1.caleaccess.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="en">Flowbird Parking Services</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Flowbird Sverige AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Flowbird Sverige AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.caleaccess.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Zoran Ivic</md:SurName>
-    <md:EmailAddress>mailto:zoran.ivic@service.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Flowbird Sverige AB</md:Company>
-    <md:GivenName>Stefan</md:GivenName>
-    <md:SurName>Belkot</md:SurName>
-    <md:EmailAddress>mailto:stefan.belkot@flowbird.group</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Flowbird Sverige AB</md:Company>
-    <md:GivenName>Stefan</md:GivenName>
-    <md:SurName>Belkot</md:SurName>
-    <md:EmailAddress>mailto:stefan.belkot@flowbird.group</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
deleted file mode 100644
index 3afb324d..00000000
--- a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://prestaging.cloudmore.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-09-14T09:45:38Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://prestaging.cloudmore.com/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://prestaging.cloudmore.com/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://prestaging.cloudmore.com/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="240" width="180">https://www.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://web.cloudmore.com/privacy/cloudmore-data-processing-terms</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>stoprvfe01.domain01.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=stoprvfe01.domain01.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAJOLmVdtpocoMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
-BAMTF3N0b3BydmZlMDEuZG9tYWluMDEubmV0MB4XDTE3MDkwNTE5MDYyN1oXDTI3
-MDkwMzE5MDYyN1owIjEgMB4GA1UEAxMXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQw
-ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4YLswQuTzT9JcYWFe8PFZ
-oR/liIkoELde+7fJquGIUps2PflaSFcb8qf8LFik8OqB/WI3d1+ORN6S7TDrXbUN
-S+TNz4ngmc+qw3FQrHooleAgciPUpvA68g7qHGEjqqC4MggOWf31da7ICgpl+j8L
-rCdGWk0ea4rgH9KT9iercYdJfk41dS6VkwT2ARQVignuDMkqOV9BlR3fEyKFz7VL
-Kc+zYz0vtcSMIx85BffZ24oMbETeJkRCFUMqGkagsf/KKeTVRCbEnOosWYsac/Lj
-xQxFD+aKaKP5z6Wvd9EDKAa5egS5m556z58LUiUXT4QcRqc43OTcoI1OefeQT+B7
-0chHWZRXGzZWxNsDgbjUhBLcELh1H9ehc99TaNIXeIyYJgfZp2zXAsE8UGUqpL5p
-JI+OG/7au2kVipcQqbiMxYm+FhyLqzgRhNQrP4wXPee9Psyvy0ylIwveUY83uwBV
-EsAiyg6LD3KnYC4sZlr80GJ4l1Cp+4Q0101q6WeZRjMCAwEAAaNFMEMwIgYDVR0R
-BBswGYIXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQwHQYDVR0OBBYEFHzZ8nn/1Zj8
-kxrK0kLw3RlA/t9hMA0GCSqGSIb3DQEBCwUAA4IBgQCAOrmhhFLsfqYx6K+wKt7I
-HCqbsB0bhM8pccqWmUaUWP1WlRJOupIpOmP5FvIgvVtXsuEzUKd1voPF4DMfzaV6
-ACU6DxLf0lZ/3NrwM9ipVEE/zpXMHvBTn5802wcOIIm7hF+If83QM79ogex6b7gW
-oLhWfu1yz+2La4twB+6zkcz9THgkgSn0UtUNwd0HzyyHZ3SZuOMCGUIuyz+19c1n
-+KX6CjsXpMcJ4Oc1HsbtCKNkvEwNudxeiXWSWzj5MQHMcALE/ybOiQ/NMmj5SUzt
-oySXpA6JvX5PwGbuyuy1j4u6gwunYWXWzA0/bEyYADM47ZfNhzD+52b3sVaM1ROB
-TFv0Jq/k9XzQGKyrxphatYKLFZZ92DBDrtnwE3YsIXYc8qzWV7fDbSdvJe6eRBJV
-nnp6KW+OGs5W4irV/BM+AE0LMh7hb4xWfN1xO8Z2nrgAWHNJUkFw74FkEa94t9Y4
-KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
-</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://prestaging.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Cloudmore</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml b/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
deleted file mode 100644
index 85d816f5..00000000
--- a/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://referens-idp.skolfederation.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://referens-idp.skolfederation.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDZTCCAk2gAwIBAgIUKPuSVuIjr2FbDlWqGOFy0ApB/O0wDQYJKoZIhvcNAQEF
-BQAwKTEnMCUGA1UEAxMecmVmZXJlbnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTEyMDUwMjA5MDI1MVoXDTMyMDUwMjA5MDI1MVowKTEnMCUGA1UEAxMecmVmZXJl
-bnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAinya2PnreUkOXyDvS4Vaooc0cmBlsRHsJ8DWxhuNA0LiUI+MDBPs
-5OC71rmTXzg3ePZVrAsmQiy+vCA5hsWsYDMH5rVHlHWvtojxyS+AGbNgbaWkX+l9
-GWfDAGvs93nfeFhDU8sLScjCnDwwcaCfLj26OHeRv8bkuNFdE4Cm4/bQOn1DwhqK
-PM/za1N7yBDX98apeNidbqCknlL9G/O0MYvuMv0hTWJcEclIy78olLzecPPQ+Ymj
-1sWj0xT1nVbgUz5xcV1p9KMs9+uzOFuS4vDAh8RI/kj4oZkvYm5eUviSqbtAvCuc
-gIkrnAHpsVJeKwvfE1t6KMAGAg8nmPfG+QIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-HnJlZmVyZW5zLWlkcC5za29sZmVkZXJhdGlvbi5zZYY1aHR0cHM6Ly9yZWZlcmVu
-cy1pZHAuc2tvbGZlZGVyYXRpb24uc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-FDGYGEoW6StQ2y1uiHAO4kbWKEzXMA0GCSqGSIb3DQEBBQUAA4IBAQARTJuCZOLb
-zxV5XFjBaPtWdEeZbYqYrItX5BeAPQ/M0hnyYeU3bU3ytfWGyT5m7Ff8aQcRM8Xe
-EBW7oTSurHCVO1joCXzI46tsq/71Enq+IFhhWMjHt12MopjsKRC7y6GcbjrTjA8o
-NERsWm/h0CKeBv0vn2tmGHjcKF6nI+sZfiVsOufnFvfjO3r2laPz2XsTNwPs3HlQ
-l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
-73JJwci3n22fBYfUAIPYzjETa0mJ0zg18NGK90yXH7d786hUvxsn0h/b8GBUyiZb
-1d+aL8hqHTd2
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://referens-idp.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDZTCCAk2gAwIBAgIUKPuSVuIjr2FbDlWqGOFy0ApB/O0wDQYJKoZIhvcNAQEF
-BQAwKTEnMCUGA1UEAxMecmVmZXJlbnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTEyMDUwMjA5MDI1MVoXDTMyMDUwMjA5MDI1MVowKTEnMCUGA1UEAxMecmVmZXJl
-bnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAinya2PnreUkOXyDvS4Vaooc0cmBlsRHsJ8DWxhuNA0LiUI+MDBPs
-5OC71rmTXzg3ePZVrAsmQiy+vCA5hsWsYDMH5rVHlHWvtojxyS+AGbNgbaWkX+l9
-GWfDAGvs93nfeFhDU8sLScjCnDwwcaCfLj26OHeRv8bkuNFdE4Cm4/bQOn1DwhqK
-PM/za1N7yBDX98apeNidbqCknlL9G/O0MYvuMv0hTWJcEclIy78olLzecPPQ+Ymj
-1sWj0xT1nVbgUz5xcV1p9KMs9+uzOFuS4vDAh8RI/kj4oZkvYm5eUviSqbtAvCuc
-gIkrnAHpsVJeKwvfE1t6KMAGAg8nmPfG+QIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-HnJlZmVyZW5zLWlkcC5za29sZmVkZXJhdGlvbi5zZYY1aHR0cHM6Ly9yZWZlcmVu
-cy1pZHAuc2tvbGZlZGVyYXRpb24uc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-FDGYGEoW6StQ2y1uiHAO4kbWKEzXMA0GCSqGSIb3DQEBBQUAA4IBAQARTJuCZOLb
-zxV5XFjBaPtWdEeZbYqYrItX5BeAPQ/M0hnyYeU3bU3ytfWGyT5m7Ff8aQcRM8Xe
-EBW7oTSurHCVO1joCXzI46tsq/71Enq+IFhhWMjHt12MopjsKRC7y6GcbjrTjA8o
-NERsWm/h0CKeBv0vn2tmGHjcKF6nI+sZfiVsOufnFvfjO3r2laPz2XsTNwPs3HlQ
-l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
-73JJwci3n22fBYfUAIPYzjETa0mJ0zg18NGK90yXH7d786hUvxsn0h/b8GBUyiZb
-1d+aL8hqHTd2
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ReferensIdP</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Skolfederation.SE Referens-IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://skolfederation.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SUNET</md:Company>
-    <md:EmailAddress>mailto:operations@skolfederation.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
deleted file mode 100644
index fe7687b1..00000000
--- a/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://s2s.ifmsa.se/Saml2/proxy_saml2_backend.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-05T14:34:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://s2s.ifmsa.se/Saml2/disco" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDZDCCAkwCCQC/CkAr6rf3djANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJT
-RTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNV
-BAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxGTAXBgNVBAMMEHMycy5jbG91
-ZGFwcC5uZXQwHhcNMTcwOTE2MjMwMTQ0WhcNMjcwOTE0MjMwMTQ0WjB0MQswCQYD
-VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
-FTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxGTAXBgNVBAMMEHMy
-cy5jbG91ZGFwcC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8
-Avq0plP8TbRCesOX3ZdBtUySWjiXGolOP+YFWvkF1DKyqLsttiYCUelKng+bNvWH
-xwRvFp/+LIfObeOOgDyzz+MJq8y5NaJNM9ZDErT2jLI533VIC3GYnmMu0D/FLG+N
-wzXf7B3w35APuy0UhamKxLIyZSaAAXctNeGyzM5QU1jC+ylgkW0swMG2u4F45Ufd
-MvpfMfHqpg1rVYDWSBOz8fLLh1FXgzjU3OvGjeYHTEusRdiY5ff+uzDNPmt8SWvY
-GK3LIEHNkP2VAG2AfQ21v32BMWtSTqG+vqcsgaivqwo2Gt+d8WuZgVCmV4XzFHdI
-C6U7lnojlRmPbxia4QlTAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEAimvY/Xyn9
-GSrN3Fpu4eWffDocY/OAeLknsokv5fRrE3DfUYC1akwW5GMha6hQcc5DNt3F5O0z
-9FeUFLoEGjmavVL5kFDnkQcxBxDQMx2i3hfdd4Ji2c2yZf66xNot54/L5Ha25Gcl
-dwQ0t8n66d+IXLLvg2KtyWJjfycEgsbrV76b6L71t+iTbFh/ZsfvmEePYJlwOZ7q
-l88ZeHMBKnOdDANm1jTZTD2DjpwjO2Qy4Ng8gIXQola1O/gG/LaLfu7Fxk/8T9TE
-r5EPe+L5117kzDaDZtqV6H4q24B2mhguRNUCN2ZkonPPEvkhdgcokV7qffRDkwXu
-zJkE6G+EYWU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://s2s.ifmsa.se/Saml2/acs/post" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://s2s.ifmsa.se/Saml2/acs/redirect" index="2"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IFMSA-Sweden</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.ifmsa.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Admin</md:GivenName>
-    <md:EmailAddress>mailto:admin@ifmsa.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Admin</md:GivenName>
-    <md:EmailAddress>mailto:admin@ifmsa.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
deleted file mode 100644
index ff84e0fb..00000000
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://saml.sys.kth.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-24T15:15:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://saml.sys.kth.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kth.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="225" width="225">https://saml-5.sys.kth.se/idp/images/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="225" width="225">https://saml-5.sys.kth.se/idp/images/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://intra.kth.se/it/natverk/regler-policys/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-identity-provider-idp-som-faststallts-av-kungliga-tekniska-hogskolan</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://intra.kth.se/en/it/natverk/regler-policys/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-identity-provider-idp-som-faststallts-av-kungliga-tekniska-hogskolan</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">stockholm</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">stockholm</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kth.se</mdui:DomainHint>
-        <mdui:IPHint>130.237.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.237.64.0/20</mdui:IPHint>
-        <mdui:IPHint>130.237.80.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.84.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.202.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.206.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.209.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.210.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.212.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.216.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.218.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.220.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.224.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.228.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.232.0/21</mdui:IPHint>
-        <mdui:IPHint>130.237.249.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.250.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.255.0/24</mdui:IPHint>
-        <mdui:IPHint>130.229.128.0/18</mdui:IPHint>
-        <mdui:IPHint>193.10.37.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.38.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.39.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:1::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.34698,18.07213</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAOmaIGGXK/JbzXedtKY0l3Vp34hRMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEXNhbWwtNS5zeXMua3RoLnNlMB4XDTE3MTAwMjE0MDIw
-M1oXDTM3MTAwMjE0MDIwM1owHDEaMBgGA1UEAwwRc2FtbC01LnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMHtOcs0ZEBqSTA0AqMyyc
-1Hhjq41rLAF+xk9LJVTVmiEzKZqbFbnFXeh4A50R0qXdWg+ZRS+57D3tIJbM4sNk
-IeOS7IDFdkk3h/t7lqWrIyxrK6dHN5awqquchyjzQVZ/+tSge5iA04WYf1YqqYBl
-Cdn38JoyRIIS5bS5Xo4iyrh0RE1NpNBVwL3+m6XQyDZwy/9uilAZChydlZeKkTXW
-wUBPNksose/M1cbWlw3e43EC4/WViayErTijXZmp3ZFlJCL1EKPURVjeEX1AXkpM
-6OaL5S7PwdrAqg9qPhEDdYYRHxEDuM8iRoAmzPCwStOo1gS6mWQqBrXvQE2ojwdH
-AgMBAAGjaTBnMB0GA1UdDgQWBBTZyigFF2hva2NdXhtibyWmqToY8TBGBgNVHREE
-PzA9ghFzYW1sLTUuc3lzLmt0aC5zZYYoaHR0cHM6Ly9zYW1sLTUuc3lzLmt0aC5z
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAGtvAY2a6PpljlGHO
-J60hymreWhvUEwq1XA3IX3+ox85mnNiDGbyIM6kCQMuMXeK/wectNMDRxqPTmsLY
-s7LrnP0IESqU0fJh8csy6h1bS9m5CbN1D3Frv2JS28jCUjousUrH6DDV75w2xbWb
-U2trtXVk5XyBas4JdnxBSTgIRe9C26ALN2IJ4YdGwLaZbA74y0Ehcf09NSNiwrvl
-O0Q8q5FCN5Zuog/y6Q8PSFLgXEo/lx2JufAFeQrLaKyJRy0sXLlXdVtdOfm6DLcW
-/xpqhC24xIistMSyj3WcnUt8yWezp4xKuxzAg/A7QHJWWsmxwX5+YHYdmL9bCPYW
-sIsQIQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUH2oX7WISLlGweMWZtSzUAdE7fT0wDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRc2FtbC01LnN5cy5rdGguc2UwHhcNMTcxMDAyMTQwMjAz
-WhcNMzcxMDAyMTQwMjAzWjAcMRowGAYDVQQDDBFzYW1sLTUuc3lzLmt0aC5zZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8fvkm0hukgNA45Ct1EqkA1
-Qfl9+yYMawO7XuKUdWXfsHFUEwi2fMaLBQbDlGzugyAqs+VL44Ladq6jNmU0ICGv
-dABuqQ1/mikC93yCn2Fyr+L8Pb6ooQva5sG1FxiSo5ODgKxUw/NJOPO3jD8oafXZ
-KMe7bziyEsdK6FJQvnSKTEi/uKgoyggQaPQKhN/n9+8S7xfbKt6SElhqndNDLJO2
-+rLznWzDDiVq4cYSrmvkTrOdEXge9IRw0C/fAS45pbfrrrv5p3uhoSrnGqgbmUnO
-zzxtyaTMgtr8ymUg8Sg3lM1vugxMjV2iQXrcTUEpS88SJZSSZ55CKmCnbLFlT9kC
-AwEAAaNpMGcwHQYDVR0OBBYEFC64tqUGgzV0tBPjchpcAKIANSurMEYGA1UdEQQ/
-MD2CEXNhbWwtNS5zeXMua3RoLnNlhihodHRwczovL3NhbWwtNS5zeXMua3RoLnNl
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBoSSeExvS4jh469mls
-f4+oXwOx8pimcxp4qjuuikdmMF+WiiCOto+36ZkG8X6cx6SRZYavetLMXoQdwkHn
-3OiaJmK/kvG+0KlaSYq68p9u6ddKQgjWPy9JbZlW0uZQaFPg2/5O4acukImkHR/q
-v7uPLS6CRVWMflLpTxZjFBnkafsw3bGjqCAh8zh7afGgmAVZjrRfcmuj6GeEc+0R
-6+X1G5kC1FdSnzY6CTSxf2M4Imgy0iU1QNnby7Pqm+pxWhvPW9+x4DDCOQiZquyw
-EoqFRoJQqVekIFRBNnL10DpDCIogHXd7I49hPQf35/LkZmcqvEJuGSaSVOvmFTR6
-OmTq
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVANDcvLv9oyCzfWKoZ4qwITR137mFMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEXNhbWwtNS5zeXMua3RoLnNlMB4XDTE3MTAwMjE0MDIw
-M1oXDTM3MTAwMjE0MDIwM1owHDEaMBgGA1UEAwwRc2FtbC01LnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMnoOf28PBhne05cuoe0hk
-qVkDPgIur8K4R1zvGJZXrl6xBQ8Cf5x2/71OoOh/toRtGRR5mx/0D6zTiHqwZCXF
-alo0URcej5C2S4Cjit5bcG/M9WimsC34whCwHxvYWXzN7S6GcGuh3NFPH+kxllSh
-2oZ+uEACggBAHFuUQBXBsj060376EB7ZaGivXfmVYWYJzEMvAQLHq3QbtxMwAUu5
-ZcjX226/HuV53O8mpueWEb7dNDiufFU+TFe+nSqFAZss0fGYos1szfXXkDwn7l82
-PVGc1TsGTZKlRtWfhfxe+9AYebeLDsci0o5NkR86AsDBOMxbeB1+/kyu3i1KabMT
-AgMBAAGjaTBnMB0GA1UdDgQWBBQVSJgAJOeU3VlroaBurkCV9L9tVjBGBgNVHREE
-PzA9ghFzYW1sLTUuc3lzLmt0aC5zZYYoaHR0cHM6Ly9zYW1sLTUuc3lzLmt0aC5z
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAfUOEEkcQ32GF3BBB
-g1qjGfqgC3/wVzOkqR3OpklHLZ8CAn0rdD18kH3FBbs0u3Xn+Si6aVdVCgECuu9l
-UZhenuGVLwBlLUO5wyfhZcmu9obqj/Kng8gBVJ0c+qcDQyPjj13vAPxdmrUaZegL
-rlQAkWXnxjp+EZs2LOhALLTYSFVnxsecS3jdDNQv5eg3TVn1y47c84mKqTVblYbr
-d+sCpD2C/PTTwyGJ+dlImbq5mucUT8skolnF6oZiLRnNEU0dOQbW+p0yDzqBLujT
-/PP9U1EgkVs4BHeaAQYOlQNBh+DwA3Ak9bVRW+A6DWv3bD5/slnfcy+yhjeRjCKc
-jmufPg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml-5.sys.kth.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-5.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-5.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-5.sys.kth.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.kth.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.kth.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>KTH Royal Institute of Technology</md:Company>
-    <md:SurName>GVS IT</md:SurName>
-    <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>KTH Royal Institute of Technology</md:Company>
-    <md:SurName>GVS IT</md:SurName>
-    <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>KTH Royal Institute of Technology</md:Company>
-    <md:SurName>KTH IT-Support</md:SurName>
-    <md:EmailAddress>mailto:it-support@kth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 790 6600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@kth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/secure.ouriginal.com.xml b/swamid-2.0/secure.ouriginal.com.xml
deleted file mode 100644
index 1676b5fe..00000000
--- a/swamid-2.0/secure.ouriginal.com.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://secure.ouriginal.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-03-26T12:00:23Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.ouriginal.com/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ouriginal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ouriginal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ouriginal is a similarity detection solution that combines text-matching with writing-style analysis to promote academic integrity and help combat plagiarism.</mdui:Description>
-        <mdui:Description xml:lang="en">Ouriginal is a similarity detection solution that combines text-matching with writing-style analysis to promote academic integrity and help combat plagiarism.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.ouriginal.com/sv/var-berattelse-2/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.ouriginal.com/our-company/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ouriginal.com/privacy-and-personal-data-protection-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>secure.ouriginal.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.ouriginal.com</ds:X509SubjectName>
-          <ds:X509Certificate>
-            MIIEGTCCAoGgAwIBAgIJAPuiM7HVLa95MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-            BAMTFHNlY3VyZS5vdXJpZ2luYWwuY29tMB4XDTIxMDMyMjE0NDkzOVoXDTI0MDMy
-            MTE0NDkzOVowHzEdMBsGA1UEAxMUc2VjdXJlLm91cmlnaW5hbC5jb20wggGiMA0G
-            CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC550nQZxq1RT2zjHgVbuNSKhwO9ZV3
-            2/0vJg+X9S1K7r8DUnuuIludj8Ms0X5DZbx8z4bHlC+N3x0Xb0dNGSqieTJEuUho
-            qY6+IzQ+Hc7Sn4EDkBQ23NeLrxGbqaA3rMVoM72p4ponGUj9uNjTHQyz6kAveKUM
-            sEQPGbfvO21YR8X/RnrC54DNwHAhJT2YhqJTjJV2UlajCuc8S5e7GkGLF9nZn8re
-            0f1CsLgk2ecpN0g87yO21xS86MW/y8Etx0Suu1zzCliop2hw6UZqXvubEqS90fEm
-            lMiJsSOTjaUscLBbBxmzeEdW7dJ8kFOlW/EsP9sX3QubNFg400Dxrx8T8zW5vRQI
-            ypBRflZPh8JXiBNSOnMDvROjQ0DjXh0KlLZjuk8CnYzpmdXxwhaYY3Zo1b6Cn7Ip
-            C/BCqHuqZ3j7vGR6DgthqB+ycRcaOZPdk/1X1KVD1Sgn1c8qVmdMszP1QFPDAjzm
-            /vVHAZrD4A/+4+X7p9GGrAVfvOk1HOygMBsCAwEAAaNYMFYwNQYDVR0RBC4wLIIU
-            c2VjdXJlLm91cmlnaW5hbC5jb22GFHNlY3VyZS5vdXJpZ2luYWwuY29tMB0GA1Ud
-            DgQWBBT19RHub8VeWlx16G3IOGsK97RHuDANBgkqhkiG9w0BAQsFAAOCAYEAk8ET
-            IQyRaTUqfG7fcG4L3HhPcz1Go6C8XWqnM5Foo6sTeW8U4fJ3MLF3MeQOxRp02rUd
-            ZU7F/e3yoiYZKHMAz20naSdY6BCmYLjhO7wyUMzz7OUVUGc5HI1fpgrzAFojLfl9
-            zwJHGRzylqnQuA81sqs4MEJ4iJTCFXthVvxHvsDaf6SV60e9gNtHQjkaEvRrDX69
-            IiV481MIpwfwtmzHnBr52QwUy1j2z1jhTV2ldl5nJo94mzCKHR0fKd+vcaT989q8
-            113AdDFEaRq2x/l1vmU2D/w8+4XelzVun/SnFAJzErAazeIc2Nz41VZebMkuPFPZ
-            IACDq/DGqFrAC7kNLyJFLlWmGGx+w3Fpc+FHR+EVrGo02SMI/psoBHpWzW+fWMYj
-            GkfCrw/lhLj11MulWcRDXUHFBTtPXQndPlSAzieUMDivAa/5Fv8zwN18S0PSYYKW
-            nNaWqKa98JgdG4fsjLwlCWdmMobwZyIpiNTX1nMgfIx5UQWOLihgbMzoM8m5
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>secure.ouriginal.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.ouriginal.com</ds:X509SubjectName>
-          <ds:X509Certificate>
-            MIIEGTCCAoGgAwIBAgIJAPuiM7HVLa95MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-            BAMTFHNlY3VyZS5vdXJpZ2luYWwuY29tMB4XDTIxMDMyMjE0NDkzOVoXDTI0MDMy
-            MTE0NDkzOVowHzEdMBsGA1UEAxMUc2VjdXJlLm91cmlnaW5hbC5jb20wggGiMA0G
-            CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC550nQZxq1RT2zjHgVbuNSKhwO9ZV3
-            2/0vJg+X9S1K7r8DUnuuIludj8Ms0X5DZbx8z4bHlC+N3x0Xb0dNGSqieTJEuUho
-            qY6+IzQ+Hc7Sn4EDkBQ23NeLrxGbqaA3rMVoM72p4ponGUj9uNjTHQyz6kAveKUM
-            sEQPGbfvO21YR8X/RnrC54DNwHAhJT2YhqJTjJV2UlajCuc8S5e7GkGLF9nZn8re
-            0f1CsLgk2ecpN0g87yO21xS86MW/y8Etx0Suu1zzCliop2hw6UZqXvubEqS90fEm
-            lMiJsSOTjaUscLBbBxmzeEdW7dJ8kFOlW/EsP9sX3QubNFg400Dxrx8T8zW5vRQI
-            ypBRflZPh8JXiBNSOnMDvROjQ0DjXh0KlLZjuk8CnYzpmdXxwhaYY3Zo1b6Cn7Ip
-            C/BCqHuqZ3j7vGR6DgthqB+ycRcaOZPdk/1X1KVD1Sgn1c8qVmdMszP1QFPDAjzm
-            /vVHAZrD4A/+4+X7p9GGrAVfvOk1HOygMBsCAwEAAaNYMFYwNQYDVR0RBC4wLIIU
-            c2VjdXJlLm91cmlnaW5hbC5jb22GFHNlY3VyZS5vdXJpZ2luYWwuY29tMB0GA1Ud
-            DgQWBBT19RHub8VeWlx16G3IOGsK97RHuDANBgkqhkiG9w0BAQsFAAOCAYEAk8ET
-            IQyRaTUqfG7fcG4L3HhPcz1Go6C8XWqnM5Foo6sTeW8U4fJ3MLF3MeQOxRp02rUd
-            ZU7F/e3yoiYZKHMAz20naSdY6BCmYLjhO7wyUMzz7OUVUGc5HI1fpgrzAFojLfl9
-            zwJHGRzylqnQuA81sqs4MEJ4iJTCFXthVvxHvsDaf6SV60e9gNtHQjkaEvRrDX69
-            IiV481MIpwfwtmzHnBr52QwUy1j2z1jhTV2ldl5nJo94mzCKHR0fKd+vcaT989q8
-            113AdDFEaRq2x/l1vmU2D/w8+4XelzVun/SnFAJzErAazeIc2Nz41VZebMkuPFPZ
-            IACDq/DGqFrAC7kNLyJFLlWmGGx+w3Fpc+FHR+EVrGo02SMI/psoBHpWzW+fWMYj
-            GkfCrw/lhLj11MulWcRDXUHFBTtPXQndPlSAzieUMDivAa/5Fv8zwN18S0PSYYKW
-            nNaWqKa98JgdG4fsjLwlCWdmMobwZyIpiNTX1nMgfIx5UQWOLihgbMzoM8m5
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ouriginal.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.ouriginal.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ouriginal.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ouriginal.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ouriginal.com/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.ouriginal.com/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ouriginal.com/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ouriginal.com/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Ouriginal</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Prio Infocenter AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Prio Infocenter AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ouriginal Group AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Ouriginal Group AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.ouriginal.com/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.ouriginal.com/sv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Witasp</md:SurName>
-    <md:EmailAddress>mailto:peter.witasp@ouriginal.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Simon</md:GivenName>
-    <md:SurName>Forsberg</md:SurName>
-    <md:EmailAddress>mailto:simon.forsberg@ouriginal.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johannes</md:GivenName>
-    <md:SurName>Knabe</md:SurName>
-    <md:EmailAddress>mailto:johannes.knabe@ouriginal.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/secure.urkund.com-shibboleth.xml b/swamid-2.0/secure.urkund.com-shibboleth.xml
deleted file mode 100644
index 5fe95bc4..00000000
--- a/swamid-2.0/secure.urkund.com-shibboleth.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://secure.urkund.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-05-28T11:37:42Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.urkund.com/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">URKUND</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">URKUND</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
-        <mdui:Description xml:lang="en">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.ouriginal.com/sv/var-berattelse/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.ouriginal.com/our-company</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ouriginal.com/privacy-and-personal-data-protection-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ouriginal.com/privacy-and-personal-data-protection-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>secure.urkund.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.urkund.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEIDCCAoigAwIBAgIJAM175O3X56OxMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXNlY3VyZS51cmt1bmQuY29tMB4XDTE5MDQyMzEwNDYxN1oXDTIyMDQyMjEw
-NDYxN1owHDEaMBgGA1UEAxMRc2VjdXJlLnVya3VuZC5jb20wggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDBOhMVU9W8PqL0WRYycNeV6cKAnstbxvFxCFSl
-rFhIMTHH+QENslh9vpaKMF5eNzkab9aWly5vJyc9V9WfmJHOaraJNvfOkZSeYIAy
-7P/X6V0oNS764MqtuNePspxO56uKf/d2TSeX1melQrmVHhQVoVHYSfrVbpIjRGtm
-muETsg/z/+oPUYSzWlC9ZtNzm+fif3rdn+XVN0X06UweuVkkK6TShrD56nJusn6K
-G4v7xgYIrLNxNJ+hgW7nsvZMqr0v0j7a7Ck13IvRAaDSsCtp8KP1hW+EQafIVt5h
-xsQGy8q3i1xCTt3YUlbvI5/2euZY7pdlGEAKaYjXqueSWI3CJwHkERyQV/R7s3lE
-dQdcLCRX+aJl1JnVuYhxmP87mSy87en0wNjJCTk6cRKh+i1PUA2oRYxChydAiy9Y
-kMwDVbP6+fLeXaprTXflusCde121jHFsXe89SnEThTpQRp9e8PTW4KG1PL23PNnY
-XZeze7khuE7GrqbaPFxJ9IQEFqcCAwEAAaNlMGMwQgYDVR0RBDswOYIRc2VjdXJl
-LnVya3VuZC5jb22GJGh0dHBzOi8vc2VjdXJlLnVya3VuZC5jb20vc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU9AUCbUiSJrIeQSo11qfGWdIWCfwwDQYJKoZIhvcNAQELBQAD
-ggGBAKsD2nA9ojwAv59oknvK7pIie0ZO+ZfQkPvkb5U+72s8hdiViCf3V/Z26uqx
-j/fuJocSGeci+32BGNqamjluR08N29tWVHUCsZHLQ363LL5EVIcgLyvH80Cg+wkC
-TWhQ/Kh9WpANIIWvjX6Yil4V7/vvqgPawDUU7zpiGqmKzUkU5O4C/THyWp/3MfBg
-PmmNtcQDUMjaHanVn/AaSyrDFSG/Fd5in3SmdVG2VJa3v2ZLARC2xcVNIWJ5Lcjx
-URXagp+xe4NIuGNlJI2C1EFZmcTPCi9iNpZrhiBXu3s2gTudju+nY3wQknIAGuha
-UueOkrrTpSEE3EpSJ3pRkDllE0AGfh/j9dCYQmabEXyYn2DV5JhYlCzWR+8FwVdU
-73IySbHpmS3JDuGNR71sVp7iBBruoxv0FTd4RYC5e/tBE73yUyQhX88A1BgkmFRN
-umOzMtf3gLrdIED3P+ylShHK0kAr3pTW1qhTH9EsLlPJw1+QE5CgBRmFvkjsqJrY
-Qkn4OQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>secure.urkund.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.urkund.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEIDCCAoigAwIBAgIJAM175O3X56OxMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXNlY3VyZS51cmt1bmQuY29tMB4XDTE5MDQyMzEwNDYxN1oXDTIyMDQyMjEw
-NDYxN1owHDEaMBgGA1UEAxMRc2VjdXJlLnVya3VuZC5jb20wggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDBOhMVU9W8PqL0WRYycNeV6cKAnstbxvFxCFSl
-rFhIMTHH+QENslh9vpaKMF5eNzkab9aWly5vJyc9V9WfmJHOaraJNvfOkZSeYIAy
-7P/X6V0oNS764MqtuNePspxO56uKf/d2TSeX1melQrmVHhQVoVHYSfrVbpIjRGtm
-muETsg/z/+oPUYSzWlC9ZtNzm+fif3rdn+XVN0X06UweuVkkK6TShrD56nJusn6K
-G4v7xgYIrLNxNJ+hgW7nsvZMqr0v0j7a7Ck13IvRAaDSsCtp8KP1hW+EQafIVt5h
-xsQGy8q3i1xCTt3YUlbvI5/2euZY7pdlGEAKaYjXqueSWI3CJwHkERyQV/R7s3lE
-dQdcLCRX+aJl1JnVuYhxmP87mSy87en0wNjJCTk6cRKh+i1PUA2oRYxChydAiy9Y
-kMwDVbP6+fLeXaprTXflusCde121jHFsXe89SnEThTpQRp9e8PTW4KG1PL23PNnY
-XZeze7khuE7GrqbaPFxJ9IQEFqcCAwEAAaNlMGMwQgYDVR0RBDswOYIRc2VjdXJl
-LnVya3VuZC5jb22GJGh0dHBzOi8vc2VjdXJlLnVya3VuZC5jb20vc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU9AUCbUiSJrIeQSo11qfGWdIWCfwwDQYJKoZIhvcNAQELBQAD
-ggGBAKsD2nA9ojwAv59oknvK7pIie0ZO+ZfQkPvkb5U+72s8hdiViCf3V/Z26uqx
-j/fuJocSGeci+32BGNqamjluR08N29tWVHUCsZHLQ363LL5EVIcgLyvH80Cg+wkC
-TWhQ/Kh9WpANIIWvjX6Yil4V7/vvqgPawDUU7zpiGqmKzUkU5O4C/THyWp/3MfBg
-PmmNtcQDUMjaHanVn/AaSyrDFSG/Fd5in3SmdVG2VJa3v2ZLARC2xcVNIWJ5Lcjx
-URXagp+xe4NIuGNlJI2C1EFZmcTPCi9iNpZrhiBXu3s2gTudju+nY3wQknIAGuha
-UueOkrrTpSEE3EpSJ3pRkDllE0AGfh/j9dCYQmabEXyYn2DV5JhYlCzWR+8FwVdU
-73IySbHpmS3JDuGNR71sVp7iBBruoxv0FTd4RYC5e/tBE73yUyQhX88A1BgkmFRN
-umOzMtf3gLrdIED3P+ylShHK0kAr3pTW1qhTH9EsLlPJw1+QE5CgBRmFvkjsqJrY
-Qkn4OQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>secure.ouriginal.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.ouriginal.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIJAPGJdndIAxUWMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFHNlY3VyZS5vdXJpZ2luYWwuY29tMB4XDTIyMDMxNTEzNDIyMFoXDTI0MDMx
-NDEzNDIyMFowHzEdMBsGA1UEAxMUc2VjdXJlLm91cmlnaW5hbC5jb20wggGiMA0G
-CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDM4XBbSvLCcEIS9F/UwoTbAviTbZQ+
-R/nG2HP+XPRrLMiOcZI2bkH7IPJeeXr/trubNl6QaExqErGOY4CI2vpqUxgHNHA2
-YvXijbjSugkfhWjyUckK3Enoa5AzLL7QjYCmXZI8dzKjpUHaE6U6TbS/N0TYyOa4
-1NTJMaYiMatAs55COM/crtPtS7zRrw77i6gMTOBsH5D4n+jmT2gJDI06D5tSK81B
-FRe3lkzdgFpt1eDXnqcvvTVNrv7LaT70CufJFJJCa3RA4DDtgN40+7WScM3xB1Zw
-JecnU2CBgtUNZTl4nmS30nU+LjEzKezCVgfXaYfma+g6gsD7FYJI52gpygO87ujE
-KAUvhLX1Tg2q2eBRuqHSKhkUaVdT9ny+/mBMBtgYeE5QWDwCsEy5oQbhwxDSkui8
-wVkIOj9BRyZdZyUqA+kNcmi21Vm3ETdijr45/yirbG0/J2ZVYalEaNyvodgA1bn5
-OKh6YFKTxlbgjH8l7yDlVXgCmgmsO1WWcM8CAwEAAaNoMGYwRQYDVR0RBD4wPIIU
-c2VjdXJlLm91cmlnaW5hbC5jb22GJGh0dHBzOi8vc2VjdXJlLnVya3VuZC5jb20v
-c2hpYmJvbGV0aDAdBgNVHQ4EFgQUX52K898j2CweDOXXG6Wi8dEa9NwwDQYJKoZI
-hvcNAQELBQADggGBAAuy4V95f9Jgxsq7bfnaxI3i16/LOeyxlang4iliDjRXcfMS
-x2tM0fUX48Jz84+hpehQ+3Y89Sg2cWFj0URsZkMnVQYqubZZwCr2I1Cgu+wbmFYX
-ZMojDI9XGrqTmd1Khe/taFXa3JjEYI1IhRAaceyS1O/yIcvHCKKYgh4Ab5ONGLZX
-s1hsuawxlj8cReEs2xaRrA7oroC50EXdpxRn92th81W9AqHGGTSvotfqdRdHm8t+
-N1flf4PDMcwy0/dfsIo0HHxEBmvFXHM/Qf3qzTP07Mc8P9chJbeTKDQYMwB4mpaW
-dbuRnwpr95gHgf7iEsnUMI8bIMEeVfplz5XYvbSCCVbHHYSrlZHrSfm/9GmkSEwl
-zJimvo+O7RBJGFRgL39mTIVaJugQxDsA0gt8xJ/s1VAws7Fdci/LydoHwLKh4sKX
-SjR0JMXpw1VGuEcbAipJR5DLZcHmAUL/CnC4H6VMBk3YcWbDMrXBp6lMYBZ+jUMG
-78yMn9OWBIA8z6yRtw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>secure.ouriginal.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.ouriginal.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIJAPGJdndIAxUWMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFHNlY3VyZS5vdXJpZ2luYWwuY29tMB4XDTIyMDMxNTEzNDIyMFoXDTI0MDMx
-NDEzNDIyMFowHzEdMBsGA1UEAxMUc2VjdXJlLm91cmlnaW5hbC5jb20wggGiMA0G
-CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDM4XBbSvLCcEIS9F/UwoTbAviTbZQ+
-R/nG2HP+XPRrLMiOcZI2bkH7IPJeeXr/trubNl6QaExqErGOY4CI2vpqUxgHNHA2
-YvXijbjSugkfhWjyUckK3Enoa5AzLL7QjYCmXZI8dzKjpUHaE6U6TbS/N0TYyOa4
-1NTJMaYiMatAs55COM/crtPtS7zRrw77i6gMTOBsH5D4n+jmT2gJDI06D5tSK81B
-FRe3lkzdgFpt1eDXnqcvvTVNrv7LaT70CufJFJJCa3RA4DDtgN40+7WScM3xB1Zw
-JecnU2CBgtUNZTl4nmS30nU+LjEzKezCVgfXaYfma+g6gsD7FYJI52gpygO87ujE
-KAUvhLX1Tg2q2eBRuqHSKhkUaVdT9ny+/mBMBtgYeE5QWDwCsEy5oQbhwxDSkui8
-wVkIOj9BRyZdZyUqA+kNcmi21Vm3ETdijr45/yirbG0/J2ZVYalEaNyvodgA1bn5
-OKh6YFKTxlbgjH8l7yDlVXgCmgmsO1WWcM8CAwEAAaNoMGYwRQYDVR0RBD4wPIIU
-c2VjdXJlLm91cmlnaW5hbC5jb22GJGh0dHBzOi8vc2VjdXJlLnVya3VuZC5jb20v
-c2hpYmJvbGV0aDAdBgNVHQ4EFgQUX52K898j2CweDOXXG6Wi8dEa9NwwDQYJKoZI
-hvcNAQELBQADggGBAAuy4V95f9Jgxsq7bfnaxI3i16/LOeyxlang4iliDjRXcfMS
-x2tM0fUX48Jz84+hpehQ+3Y89Sg2cWFj0URsZkMnVQYqubZZwCr2I1Cgu+wbmFYX
-ZMojDI9XGrqTmd1Khe/taFXa3JjEYI1IhRAaceyS1O/yIcvHCKKYgh4Ab5ONGLZX
-s1hsuawxlj8cReEs2xaRrA7oroC50EXdpxRn92th81W9AqHGGTSvotfqdRdHm8t+
-N1flf4PDMcwy0/dfsIo0HHxEBmvFXHM/Qf3qzTP07Mc8P9chJbeTKDQYMwB4mpaW
-dbuRnwpr95gHgf7iEsnUMI8bIMEeVfplz5XYvbSCCVbHHYSrlZHrSfm/9GmkSEwl
-zJimvo+O7RBJGFRgL39mTIVaJugQxDsA0gt8xJ/s1VAws7Fdci/LydoHwLKh4sKX
-SjR0JMXpw1VGuEcbAipJR5DLZcHmAUL/CnC4H6VMBk3YcWbDMrXBp6lMYBZ+jUMG
-78yMn9OWBIA8z6yRtw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.urkund.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.urkund.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.urkund.com/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.urkund.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.urkund.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">URKUND</md:ServiceName>
-      <md:ServiceName xml:lang="sv">URKUND</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Prio Infocenter AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Prio Infocenter AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">URKUND / Prio Infocenter AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">URKUND / Prio Infocenter AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.ouriginal.com/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.ouriginal.com/sv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Witasp</md:SurName>
-    <md:EmailAddress>mailto:peter.witasp@ouriginal.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Simon</md:GivenName>
-    <md:SurName>Forsberg</md:SurName>
-    <md:EmailAddress>mailto:simon.forsberg@ouriginal.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/selfservice-test.test.hb.se-Shibboleth.xml b/swamid-2.0/selfservice-test.test.hb.se-Shibboleth.xml
deleted file mode 100644
index ef378f6c..00000000
--- a/swamid-2.0/selfservice-test.test.hb.se-Shibboleth.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://selfservice-test.test.hb.se/Shibboleth">
-  <md:Extensions>
-    <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"/>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-01T11:11:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/DS/ds-test.swamid.se"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/DS/ds-test.swamid.se" index="2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/WAYF/shibboleth.antagning.se"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/WAYF/login.idp.eduid.se"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https:/selfservice-test.test.hb.se//Shibboleth.sso/https://hbidp-test.hb.se/idp/profile/Shibboleth/SSO"/>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">SelfService Test application.</mdui:Description>
-        <mdui:Description xml:lang="sv">SelfService Test applikation.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">SelfService Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SelfService Test</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="100" width="100">https://selfservice.hb.se/images/s2logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="100" width="100">https://selfservice.hb.se/images/s2logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://selfservice.hb.se/PrivacyStatement.aspx</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://selfservice.hb.se/PrivacyStatement.aspx</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp-test.ad.hb.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp-test.ad.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/TCCAmWgAwIBAgIJAJXxIZ8hzubRMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMTEmhic3AtdGVzdC5hZC5oYi5zZTAeFw0xODA4MTUxMDAzMDRaFw0yODA4MTIx
-MDAzMDRaMB0xGzAZBgNVBAMTEmhic3AtdGVzdC5hZC5oYi5zZTCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBAKpwRrE5j42Jku0JU5hbk/GISqjlSmZ5c5Xq
-a0zYBlZPdmYf4K3hVqeUZtK+f2MHE+RZ/M8Xe4ujBvi+KAebSK1f43b/A1+sTQ3Q
-VNuKHu2wNMOy/f/F5IOHaU3H97TG2dirI2hNasG/lQjheIzcrqPAZAlak+CbjAQe
-WNPuyeHtdab9yNllo51zefOt57e3+DfQRY5JOSasmEzhn7BD7Io6P8T4IqDE3viN
-j7uJDmjuEoMHQfXqXuBkNmdbpC/x43u9zOi6FLqjuLlUNNXeYbe6+JGWPHIZZWpw
-10EE52VUo/DqvUFLpW8DQx8dTTTuDVfpkWlNobY7DG6uMVz7KxlPPkzRojZdaU+Z
-IzeAoLgAMnLLf18hBkKdx6Kq/RDH5+4pJCo9y1os1o5tljH80p2+03+Z0rFkApnH
-4G3hnoXaDXnGfm3n0sSMjpvSQ3xhPH1fLHTfJD9IOYgNufWQqrX//61t/HVmoJZZ
-d0RPjU+uL2ahfVQNN4wZkFAYgSudLQIDAQABo0AwPjAdBgNVHREEFjAUghJoYnNw
-LXRlc3QuYWQuaGIuc2UwHQYDVR0OBBYEFETbzt7ILuBVhr6N12meu0FA6OrnMA0G
-CSqGSIb3DQEBCwUAA4IBgQAwjkyU1ADuMjfRiIfF2oHhKghlYyNyWI+UopYkuFS9
-QK+446eydGTRH+sp5LIoB6ylcm588Mn5uVmgNBNkqrEMXYOtbtN8hugfSAMuJTJj
-HEazh3eKpa/PYArmFotw4kLtgtVtYk6gRo6ZKtKXe+Vmgf+eFEbHMTn2i6fsDu7t
-9aDtZNzt1beSdU51awn8wn9jdD7aN9iT9GZ4RNAXU93UaFE+dy9EpC0nd0NNxsLn
-AJnEYrFEZus4XFG0aUGzcZReWQi5C/ryUmXeq93H/Dt82rKfWn/Jg4dKg33vu0Ol
-49WDxOfjUNFXTckw7SmDm2iKNwUZns7/E11Pvt/Sa/Kzo/xccO3dZ0ESLbhlL0sd
-cDAenuSelj4GWkExkn8JJu+Gf4tF454KHdjGHNv4760astFtWDLMcQwFgVW0CDXq
-9z5dsTa3vVJHsD7aUAtDd8TIECi1QmsknXZPEN9kyCYLN1b4+THk8NPw8lfeMA44
-WBZx2UHH2lrrPqfxaKVb5Hg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp-test01.test.hb.se</ds:KeyName>
-        <ds:KeyName>https://hbsp-test01.test.hb.se/idp/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp-test01.test.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCAyugAwIBAgIUbv+kwfKXyZfZfHE3c5/5BL6IMtcwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAxMWaGJzcC10ZXN0MDEudGVzdC5oYi5zZTAeFw0yMjEwMjEw
-ODM1MDdaFw0zMjEwMTgwODM1MDdaMCExHzAdBgNVBAMTFmhic3AtdGVzdDAxLnRl
-c3QuaGIuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCySumGjhEp
-jeo97oOk65Y8BvLQiIAULnd0fYwdvyxzAD8O7sM+DIJTevouyjVZoKv24D1s+L7r
-C6fnwoNNvisSm0QhLTzSoLb5awNlvXCOVQtr62pdfIHRzM9O3GZK5BegzdVzoE+t
-hv7DmupbT5rxwTvfnhm9VVcjWWtcNcQki1KGPplhTD/hWa9t/YesMV5jqiw0AHpO
-HrYRhDmrvgeLtSgEbPfrowmG1p8EDxgMdHWMxLvuY2W6gnPUoPCVW4pRFSEjd9i8
-rxpPArptnA19HWvxt2ff83WgNvJOG7QIkDhmIdfwjnWivVgcKRBo1ee7HF28oKNG
-H/oBrpWukNnSSEobViBaF4dAVxE4A6XOjiQ+fBXx/7jGLdL3S3fag5K2rds2N854
-m1MyYdkihnWk2G1qVHlotnaKiy3UY4KyUwV35J4IvpbQqLLZjxoeCoyCrhEQuy/S
-pTi/Ov2Ctwhb2Iy9Syo90yEEShFM+yud4/APOT/xkBummhWLmAR27isNOydK5LgN
-AWrVecFwmtaL9L8wKIxoeD6wMCO7jhvyHkAUUH6k036OToEebKGNyCpV2504aUuB
-qOby+uLtuZtuDxiy+RaQU27k+MnK/zaZIpgr0cUnAuo5/vX27P1tACQMpDPiBnV+
-F4HlS5O4XWWJY6yyP8qpMd1l/N+iw2ht4QIDAQABo3MwcTBQBgNVHREESTBHghZo
-YnNwLXRlc3QwMS50ZXN0LmhiLnNlhi1odHRwczovL2hic3AtdGVzdDAxLnRlc3Qu
-aGIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHeD7XcxviVnS3tGQaASdHts
-YjIrMA0GCSqGSIb3DQEBCwUAA4ICAQA9PBA8YElA0mYtS935zpEsN60CX3Tu0upe
-4aDoDYZhNH/V1PqDHJPVCTZmYuLOVQw/0qWvHe6IZgWEPjM4Xm+erqOf3x84iVLA
-my2CpSR11sfshCtkW6vUAGYniXglS6KvtHH518cqboQoCJPX/yWOvNtily2DB81E
-dhBZcvn0nEQFwRs504B0BL8jqiwfSto9M/yYR+UCh/3X6fsbvbL/3TrakXNsxrnk
-ajLG1hiopmVyk+sW9VojfDk7vV0UfKlbK0pc/cWWiRUCYY4Xy+yN8kn1xQWLtlKI
-Gze3r2cOqU+loP/7lub7coZyrM9PefU3/kEOIEe/eCfReGnE4tPYAF15zxQzOmvw
-lxDrHYDcP+WGKAz1rl2ltxK8XN0F+a6zxmWMjStK2dE1P7C9eqMIUlYKCRCz83Vn
-Ej/HK8kQih9KAgLxMzD5hKzEvGNcY2giGOek5UnQQcKoKYoKkn3sK5jAj2xRsG9H
-Zmvyp0w98SE4XztFQuXnOGbUsx213dBt07X0roYX2vJgBrIrXmZM53iOMiPYSL0Q
-esgKmZIr47ANPQyW8fR/Kzge8rVplf+YNcBqoQfFoLFujtUWYefNEDAy/h3rcE0b
-pSSKWfSGRNR1HV2zAlx0IcJxHz1Jw1s/6Mx7x96UnApvatqqg0BNuPFu1tbDtmOi
-MCmP/gJ2aw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp-test01.test.hb.se</ds:KeyName>
-        <ds:KeyName>https://hbsp-test01.test.hb.se/idp/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp-test01.test.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCAyugAwIBAgIUQT9mO0y6y74DTDhnpeyyTQFN4DYwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAxMWaGJzcC10ZXN0MDEudGVzdC5oYi5zZTAeFw0yMjEwMjEw
-ODM1MDFaFw0zMjEwMTgwODM1MDFaMCExHzAdBgNVBAMTFmhic3AtdGVzdDAxLnRl
-c3QuaGIuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC1DPXnpgcI
-9DTH4RiPGUJ1gCi9GmU+5Hr5Mal1XhunszKXuC/RcAlrC65pvyfuyG9MLT/C6CsD
-hXJSySOIDkk1GfU+rYZpjxoVG/Yh7Gb8wyD4jId2mPt7H3TqE6Q295gbQNuEURkF
-EPVgBoMWBXxMeqLqOaume0maFyWJx9au/MHNP/o47JfCrmYe2ZOlrKjd8x/vp1gc
-zWpwgi2+p2r7QfqfGytHydxdWg0iOOz9pZZ0DUvxXZfFLSOs+cCcJKGtCbr11Wf2
-D0oJSF2pQoU+ZZJKVmy1SHmeiXOVYzPcr7hrvX0mDOdWnt3ZHn9f4z/x9r4DIQVa
-zmPC/SQhRIHsalyHgR7cs1ohwXX3EwzlUsgW/FduPKclyPgeytOf+do2U+y5/GaW
-4L9wK4w9Z+p+mRsjK2s4kjmlHOoSyRLQDWudN04W/nhkPdp1j8juVWzi7jsfi1DU
-WROABtH1iqGyP5S+iLpSzJA/CJdMuj7ZPmUwM02lbTtV6DWwKG0dBF3M75VWNbKj
-xFOpDR0NXBCNEzfZmRGUK2Wm2pvyZQ/tpHCyf5ccvnqLeMOLmLgEkjZ0yKS9NZIh
-4FLfo3n7ulXnxx1qzx8DuapTHuw5iCO1bJnB9tuSjjqFbSNl+2qeJtzIPeaz2TjE
-DtcIez7mDyzoKmUpTTH5XQu55bF2HNhbDQIDAQABo3MwcTBQBgNVHREESTBHghZo
-YnNwLXRlc3QwMS50ZXN0LmhiLnNlhi1odHRwczovL2hic3AtdGVzdDAxLnRlc3Qu
-aGIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFP6FQ0cu4eKmlm2fovXPJ0J5
-IUeeMA0GCSqGSIb3DQEBCwUAA4ICAQA8x0aoai18EVqOpDXQ8QTdLwqYw7ccmeI3
-401NLQFN3BoUK3katpuGbF/x2RH7QSDaHFemp7eJOZpKABWa3lMo66jTlzYLVPQi
-cR1r0Cb5sgy4D4x8ImlX0h3yG6zTvrCv0S9EnbqXVX8R6bNZ8OXi7gCpfsEVCso0
-qy0ynK/ieTontHmbUy+m9GdKhvEKmyfS2g0fubyC+uhUiOj5IExIJhpXZhyA/7Ht
-j4PxxmfoeI6LyUGFxew6DbBlrMLhtCM/uXqAd/A5a2cfzJaRG62j6Et6vFt//VEb
-UEWIJfSjEnMB7C/sK+ANwEZncqQL17UasgRjcjP+O21ZCcxQqBsaI7cJEd5t6Du1
-FgSd79XjMC//M7Ocuy7Uqb0tFRiVEyXFLIQlcCocvGyhGQCO/n3L8UzMN7dxUAay
-oFGrYn+ozQAULPgB021Pi8BjS35bD1UXI2jjqupY+yJH4Vod3oDPsMx+o/iPvCtU
-+ZTuyJ3+doqVQg+DWPCqdlGJr32IgN6j+sc2nfVIBH1q+zU+E7ZwkvXcljlmwPNB
-YLoLZ5A6rfH7ePRXjUtmreiTl+Ot7wkhM0YBaAKJF4s2wLKKKgBaGg7V6XwVCRm6
-NrN8FBPj/kOnMa3p0GL23XHrva43poBPf9KFgpZIIDxEboI27JQLoAu5uqcW4W7H
-miXuo3j/eA==</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:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp-test01.test.hb.se</ds:KeyName>
-        <ds:KeyName>https://hbsp-test01.test.hb.se/idp/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp-test01.test.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEQzCCAqugAwIBAgIUQEH05pwokb/txDTgbOv4/GMVmtYwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAxMWaGJzcC10ZXN0MDEudGVzdC5oYi5zZTAeFw0yMjEwMjAx
-NDU0NThaFw0zMjEwMTcxNDU0NThaMCExHzAdBgNVBAMTFmhic3AtdGVzdDAxLnRl
-c3QuaGIuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDD7SJgHDBY
-mYQFyI/N16K//515WHWjwxCic0Hog8qcD0zBh5ntgR89XA2H+CKU+qRQ4eotL8GO
-l1UHvO3s2FHJ1Ln6BNTr+bCWsLpAPpOoo9jt6OmiP5gJEiZUv4Y2xjvYfqP8OoOf
-7SG5kueZsmCWXqZqxCqjN9DoP34YstI2RkWpgsnYZuz4VPg+0junZIV2LKLCdC8j
-sgISeGX80LI6tbNeMx9D6qeIbbVLNOvGdCwBt+JLVF/3uEhxNfFnGxlpUH601HYo
-2oUVvCVz9eDWAS53kj0YyrPShXWfM6bvJiLH2+dbJc3sDQhMYugnxs7hdzn2fntF
-I4yBJp64m6Y6ZP6MHCDYG4XqZl+FLQBBHxCQjS7DnWjCNYbHT0D1e6N1QMN6TmmH
-lscSS/Z/2RCqS6Q4uvPSMbMExErKtBQq+6aeRjUdVTeeth1y/X72C8HBXxgmmEW2
-YRK0e2931o2/gphZy7vS4D5qriBHINmMsEg3PZhTxIB1u0i2kb50LBECAwEAAaNz
-MHEwUAYDVR0RBEkwR4IWaGJzcC10ZXN0MDEudGVzdC5oYi5zZYYtaHR0cHM6Ly9o
-YnNwLXRlc3QwMS50ZXN0LmhiLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSE
-oIZAnuKc5dZoqHcmgEQLJiwOkDANBgkqhkiG9w0BAQsFAAOCAYEASRszy9q0VwnS
-VJFmQuChK+M7sFDaLY/haaJF3lliMcYLVtboIYsaUXTEEvs42FqXTpAeYAA8uXmq
-b1BQNxQUpWtyyUfe5Uyn59Yn7JCz8+SbittEyqaeOGu3RawLX0NJAoxK9Agtu0zB
-YPcFizHVdBGTI1bLuR7l2xxWod2vFiD3C6xqBdR5lD/0XATRVQ2q7WrxHO+a/UC9
-wpahXMdZEjIl7+Klwz9oIsOUtsBJCgRGEgvpKoiKzrke0+e4PVYKzhZgU9NFQNkd
-pZ/aNkyfYZe2K/SKo01FIKB0OJRmL6Cu9BjW48DxKOQ6Nmeiat+8x2JJ5hSmdQzG
-iRE+qDXCvtD6tr8Px/nhzI9RrYV92FFTUCdf0v/z8p0dfkkxBQ7gjIArchGVjG/7
-E6gs8WefYo7yCCzLs7uO7rrJFw8SA8bHBvT5OENZc67OtNozTFhCY6F4bWleumQe
-Oh+D0cydIQbcgxJlDUV1KTq54FNEOlrN+NICGbbU2W9Tz6YakVTI</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://selfservice-test.test.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">selfservice-test.hb.se</md:ServiceName>
-      <md:ServiceName xml:lang="sv">selfservice-test.hb.se</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>University of Borås</md:Company>
-    <md:GivenName>IRT HB</md:GivenName>
-    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml b/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml
deleted file mode 100644
index 74b58793..00000000
--- a/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sesamutvf.its.uu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-16T18:53:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet Sesam (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University Sesam (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets Sesam (TEST) administration av passagerättigheter</mdui:Description>
-        <mdui:Description xml:lang="en">Uppsala University Sesam (TEST) administration of contactless smart card access</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=940179&amp;l=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=940179&amp;l=en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=823039527</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=823039527</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE+jCCAuKgAwIBAgIJAJhSyoAWTFzEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZsYW1tZWEuaXRzLnV1LnNlMB4XDTE0MTIxNTEyNTE1MloXDTI0MTIxMjEy
-NTE1MlowHDEaMBgGA1UEAxMRZmxhbW1lYS5pdHMudXUuc2UwggIiMA0GCSqGSIb3
-DQEBAQUAA4ICDwAwggIKAoICAQDOQIdNrT3ozzhbvdlYz2F9xzk1RRmMhbL169sZ
-o5kqUMIC/W1PkFcALskGb9rMelMymp2+fun7hgyLggjWDBjgFfRH3nZniXtil3PI
-C/0aNYoC+9Yl0SOHN5xFvfThIibj0c6ofZU9252ZaL1/GRylvO57fAvZpcULWvlA
-+/0ZTc//vsVZC/cs1dcmA4fS5dry1UucqqnAXT6Ws05JB4h8pRjYNFWU7riT6UUn
-Sv3VGmGdzZQ9lkDNzNhseFI2M3WhrVGiBamwDtP8CdJflDpKDkxx+za34P+YiB7S
-l+pbN+igY2oJ+CTNijp0R1USU49IL754ml8rEQI8NzWcTtc4C5YyD8fh1P4jkU8q
-D1UWPBblB/tiKmEL9gmy29gRdi/3Um/6kgV6Hkw4b6WQr1qMLKFdLJrTw0hJ3sab
-ilvU/IdeKVC8vIyRui0C4VSyEQ4WnKnl0P8uUn9GcUXnL8bwjCyQh/M8pfGmWDya
-l8x+DTG6efAobeUi/TnXqNZ1I66bVrgMBAnm9SJHj5xR37mraI1W7FhH6FapyasT
-UCINP0rdiQDDdBQHC+uSONrCFd1xYiaKY1uoqXOYiRB5jFRtacpaln5+/C+2BGOK
-leyP17jUilSN7dKlXQPL6EhDcIVDIke4L6fQopPoDyJa1kjA4B9M/lDfCiL29Iw9
-M2cY7wIDAQABoz8wPTAcBgNVHREEFTATghFmbGFtbWVhLml0cy51dS5zZTAdBgNV
-HQ4EFgQUHuy22CyDNk551MZVbbHRA8xprQMwDQYJKoZIhvcNAQEFBQADggIBAL7I
-wKMMMtIU2dGybNU4VNtsRGpF1o4cYsgHB3N7dpzzI2gXf/tWOzvaW8fEy9/cbxdk
-K5IO/RmjPcVapAsjSStpGIu2FYbV7R1fQfepx0CsUuj8DeAd0y3vM2Qh5nTl0I+e
-ncOAud30RWu50/hMn/EO/BsJjJqFFlYoWIWWYtAKepDOIC12ZM/XhLy2BRbJkdEh
-wQRAOfqxMuRbuCVfhp+kQc99EBSSTj2UQkJy5oUt6758v+HVEewi32iLvwELHCJS
-FnRfNNUZ9CedmGZ1zLKDhKTKOxe89b5xLdokuiyenjeqtCO29/QTJ3mIjpmIOQFg
-TioBNEYdXDEE2kbF7XMeNfwFQEBRSMGGG0NyHFTPYuel4YPpfW5FnXgdRVZ+vjLi
-3Y9WtWCDQnZsqrQUko4QHiZxxzI+Y8NskpAmu/irdqkos8ygIE18sNnRJWiSWyRL
-Pr4QFcrikK81FE9YyU2oDGLpZ2HE6EArRrxf8LWM0QGSLVaVxArBZxQEda8FLLTz
-LdjIlLdoy5HHK3cHBDIXaZsEp8cbqDIirHeu0evE9ooBNX1z5mBk5JK/BxDq5rPr
-7EFPPMjCr52KPie5L8RhFdo/D+4VYTnsQU9vehjYWyS2p+Gen3uSE/wCOdik+d44
-7aLd8zfp9fclH6JrMaiO11A/k3UtsBMCqJmXuWmH
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Uppsala universitets Sesam (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Uppsala University Sesam (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Sesam applikationsdrift</md:GivenName>
-    <md:EmailAddress>mailto:sesam-applikationsdrift@its.uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717920</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Operations</md:GivenName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Sesam applikationsdrift</md:GivenName>
-    <md:EmailAddress>mailto:sesam-applikationsdrift@its.uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717920</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/shib-test01.skolfederation.se-idp-shibboleth.xml b/swamid-2.0/shib-test01.skolfederation.se-idp-shibboleth.xml
deleted file mode 100644
index c1b7a96e..00000000
--- a/swamid-2.0/shib-test01.skolfederation.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shib-test01.skolfederation.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T14:07:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://shib-test01.skolfederation.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Test IdP 01 Skolfederation</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IdP 01 Skolfederation</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAPQ2/2lBxCasx98gbLhaMYWOfsu4MA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczM1oXDTM2MDMxNDEyMDczM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCyrgKI7YKZJTgfOMz6Tdl4JSh0/lI4a6t6kc6nWbK2wPrTO6dr/6rc
-6zfSnzZTxdMfdq4i3GQm6wqARhyopiBioqL7jfi9xFHAQ1EKBo0bYgILkUWaDB0c
-BE+g4GHbsDtU46M3Nv01iFSRrZfJIvir19sRK7pNPVneJogZMyHIGk0DeIE1e3sy
-q5hrkiPQh2wpvjQ5m0iqu/EdFfnX2SusvxZicYaFv5tuX7SWta8em9lQUXXOE1oq
-rrLucAvzlbvgPR+JWBWS92Rzyba49nP1RVpt5nFQEPDxndHJJX2jFleMXlQekjZY
-wkq43JH+lxeAniRkKNLXMNqVGb5OvgyNAgMBAAGjgYEwfzAdBgNVHQ4EFgQUqUSe
-k3iUhS7oddbgmRKPj92kelEwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHsPZpDTpzq3Ok4u
-MEV2sbqLvXlv2rIKLrSXn5wyyBisUtDKRgPpvhWeUHTjcHZMeuIY/V41d3ULDJfM
-njdytPo1d+5zXwtmqRMixzG8j/VNVPtHEwe+oFvYlWM2lvG/58dpJGVNZMgJoFpI
-ELWXWTRuDfmvB59XaJNjPA91lPCtNvpumW5ArRyT+OtvFyKWam01jEPf8ALS2Q9E
-t3CIJ1G5s7bXyPvXnrtbmQ6ZLEChbzByvLJkFtJS45IpKPy4hxtOLfOQxdlg4jna
-8W+hsupYXK3/3qb4qqaqhdtD+SWkwe/+ATup8hcmodfxhGTDnRKGXrFSzKZT4rZ0
-SMNmbOs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVANmghSf7VgN3DeTHXvgyLAxYK07WMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczMloXDTM2MDMxNDEyMDczMlowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDHQoTq1sDL1nvtkyWJIcS+2QKV+7UnSckcYhV9ETcOjz/X0eW+tI19
-2mdmJ7eYuQhtjAwUefCssbv4D4N0AB35yfbNFHJFSR32iMp8XSzcjkY1p7reL/91
-8v77ywWge5n66/2oTI1uxPbFESFXuSmNULNsZ084EVsZ5cVdSWaMhTV1yb3UT6P7
-ggioG7ZSezWftR4A9YTrDZ/L68Cl67d1QTcuLjBHuXnYaTylIzrUF/uSQ18wecOt
-P5c84m9z9Wp5mkSnKsM/5X2XAL2rnF30UJ1PbnnBiord7wsbzYlB37pURbJHkzSb
-85UjD65qzPJE1TxhWzeQoohGiA5VoTO7AgMBAAGjgYEwfzAdBgNVHQ4EFgQU7lJv
-sBxJjTpqyzRn2n6bJHwP8n0wXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAKrU1hh+0smkuJoj
-kk5LdoVpO+umabRIHxzhb9Qg29TMYgI8M9KvIpzxIa9dkJO5E2Il/soMgu9DPGc2
-sgxlqpIK9IQRrszhYh7/KIqXLeazZvt+VAkqcKEh2YlAzOng3JiDGQg2RuMVoEE3
-kS9Ib6/hyXLNabKnLncmU78qSN8AKvqt0I7E0q6EZSOje2LH7lxn1GOxGUQ6dh1y
-Ac8g0evEFl9VPCV/8ekZScbJV4V9AD/Zt9iNfgBY/9fylLKWrNjOnewHPDN6iof2
-e9uaMSKN+lfG7j1VT3ILeK287Xlec41ohosz9j/MlKNKGMjI1bybF+PLFmdfE30w
-oM6nOO8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAIeMvqpR5U5Y2XpY3eVqWkq+JRhzMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczM1oXDTM2MDMxNDEyMDczM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCS9DrfWA4WLombKbKcFAooA0rr8FQTPWXUZKdAf5jrkPhgLQRWExvE
-da2ZJ2obCvd68fuXooNlyErEzNOar7tVqisNdbzpOmxD6/DfHEjCoYyO+gzeYZI5
-wvQYZVvNeI/ZaZmAF69IQBIUrGjWNOOYh8WYWQpN7H6LV1gFJaMkaaANQGUy5LYy
-OdgdipMfg2H9Zl7nT3b3OkH8+q3Ti500EdRkY23Z0iG2ir/p6g3rQCkZ4tCftlDN
-cQgmrXTlY52/tXaFH5D+I0u3XoMJEuc0WSdmABZqZFSrNTZSaa77p3Nea0h4BtQX
-UcXauYw1s/6q2AqQvpqbknC/XC+YXSOtAgMBAAGjgYEwfzAdBgNVHQ4EFgQU1dE1
-8Ytop65CLyRnV6sbc4nsGbkwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIFLv6J5KwrWE9jC
-0j6/iYlmWBBHhgqJM5jxId+QJ/iWWFw7mv1H50pXh6zxHQby9jSMoR1vDHZJyEAH
-EuMKnZserxLunp+UwwWsDM7yhMI0IJpN4Vq+5akQqa1ScitMr4K9nDoGst9zkyZo
-aePquGWFdiAUdEq4tZOWAba4t0wC1/OSE08JiW5BLZF2ntIPxPGtkIAkg1pkA2+w
-KlBf+dVuoEzEDYbbyhTHVDtcYqVD2V69GeoUB3HjUToP/qn19t1oqGOtUkIeFzuO
-z75FH/RYPpm1Ol0OyS4l9cOkIg9LZdmYk3ze8kM1TwBdK/SX3UKW5tfNKnGW6Kbq
-ARYfhCs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test01.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAPQ2/2lBxCasx98gbLhaMYWOfsu4MA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczM1oXDTM2MDMxNDEyMDczM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCyrgKI7YKZJTgfOMz6Tdl4JSh0/lI4a6t6kc6nWbK2wPrTO6dr/6rc
-6zfSnzZTxdMfdq4i3GQm6wqARhyopiBioqL7jfi9xFHAQ1EKBo0bYgILkUWaDB0c
-BE+g4GHbsDtU46M3Nv01iFSRrZfJIvir19sRK7pNPVneJogZMyHIGk0DeIE1e3sy
-q5hrkiPQh2wpvjQ5m0iqu/EdFfnX2SusvxZicYaFv5tuX7SWta8em9lQUXXOE1oq
-rrLucAvzlbvgPR+JWBWS92Rzyba49nP1RVpt5nFQEPDxndHJJX2jFleMXlQekjZY
-wkq43JH+lxeAniRkKNLXMNqVGb5OvgyNAgMBAAGjgYEwfzAdBgNVHQ4EFgQUqUSe
-k3iUhS7oddbgmRKPj92kelEwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHsPZpDTpzq3Ok4u
-MEV2sbqLvXlv2rIKLrSXn5wyyBisUtDKRgPpvhWeUHTjcHZMeuIY/V41d3ULDJfM
-njdytPo1d+5zXwtmqRMixzG8j/VNVPtHEwe+oFvYlWM2lvG/58dpJGVNZMgJoFpI
-ELWXWTRuDfmvB59XaJNjPA91lPCtNvpumW5ArRyT+OtvFyKWam01jEPf8ALS2Q9E
-t3CIJ1G5s7bXyPvXnrtbmQ6ZLEChbzByvLJkFtJS45IpKPy4hxtOLfOQxdlg4jna
-8W+hsupYXK3/3qb4qqaqhdtD+SWkwe/+ATup8hcmodfxhGTDnRKGXrFSzKZT4rZ0
-SMNmbOs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVANmghSf7VgN3DeTHXvgyLAxYK07WMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczMloXDTM2MDMxNDEyMDczMlowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDHQoTq1sDL1nvtkyWJIcS+2QKV+7UnSckcYhV9ETcOjz/X0eW+tI19
-2mdmJ7eYuQhtjAwUefCssbv4D4N0AB35yfbNFHJFSR32iMp8XSzcjkY1p7reL/91
-8v77ywWge5n66/2oTI1uxPbFESFXuSmNULNsZ084EVsZ5cVdSWaMhTV1yb3UT6P7
-ggioG7ZSezWftR4A9YTrDZ/L68Cl67d1QTcuLjBHuXnYaTylIzrUF/uSQ18wecOt
-P5c84m9z9Wp5mkSnKsM/5X2XAL2rnF30UJ1PbnnBiord7wsbzYlB37pURbJHkzSb
-85UjD65qzPJE1TxhWzeQoohGiA5VoTO7AgMBAAGjgYEwfzAdBgNVHQ4EFgQU7lJv
-sBxJjTpqyzRn2n6bJHwP8n0wXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAKrU1hh+0smkuJoj
-kk5LdoVpO+umabRIHxzhb9Qg29TMYgI8M9KvIpzxIa9dkJO5E2Il/soMgu9DPGc2
-sgxlqpIK9IQRrszhYh7/KIqXLeazZvt+VAkqcKEh2YlAzOng3JiDGQg2RuMVoEE3
-kS9Ib6/hyXLNabKnLncmU78qSN8AKvqt0I7E0q6EZSOje2LH7lxn1GOxGUQ6dh1y
-Ac8g0evEFl9VPCV/8ekZScbJV4V9AD/Zt9iNfgBY/9fylLKWrNjOnewHPDN6iof2
-e9uaMSKN+lfG7j1VT3ILeK287Xlec41ohosz9j/MlKNKGMjI1bybF+PLFmdfE30w
-oM6nOO8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAIeMvqpR5U5Y2XpY3eVqWkq+JRhzMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczM1oXDTM2MDMxNDEyMDczM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCS9DrfWA4WLombKbKcFAooA0rr8FQTPWXUZKdAf5jrkPhgLQRWExvE
-da2ZJ2obCvd68fuXooNlyErEzNOar7tVqisNdbzpOmxD6/DfHEjCoYyO+gzeYZI5
-wvQYZVvNeI/ZaZmAF69IQBIUrGjWNOOYh8WYWQpN7H6LV1gFJaMkaaANQGUy5LYy
-OdgdipMfg2H9Zl7nT3b3OkH8+q3Ti500EdRkY23Z0iG2ir/p6g3rQCkZ4tCftlDN
-cQgmrXTlY52/tXaFH5D+I0u3XoMJEuc0WSdmABZqZFSrNTZSaa77p3Nea0h4BtQX
-UcXauYw1s/6q2AqQvpqbknC/XC+YXSOtAgMBAAGjgYEwfzAdBgNVHQ4EFgQU1dE1
-8Ytop65CLyRnV6sbc4nsGbkwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIFLv6J5KwrWE9jC
-0j6/iYlmWBBHhgqJM5jxId+QJ/iWWFw7mv1H50pXh6zxHQby9jSMoR1vDHZJyEAH
-EuMKnZserxLunp+UwwWsDM7yhMI0IJpN4Vq+5akQqa1ScitMr4K9nDoGst9zkyZo
-aePquGWFdiAUdEq4tZOWAba4t0wC1/OSE08JiW5BLZF2ntIPxPGtkIAkg1pkA2+w
-KlBf+dVuoEzEDYbbyhTHVDtcYqVD2V69GeoUB3HjUToP/qn19t1oqGOtUkIeFzuO
-z75FH/RYPpm1Ol0OyS4l9cOkIg9LZdmYk3ze8kM1TwBdK/SX3UKW5tfNKnGW6Kbq
-ARYfhCs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/shib-test02.skolfederation.se-idp-shibboleth.xml b/swamid-2.0/shib-test02.skolfederation.se-idp-shibboleth.xml
deleted file mode 100644
index 2f72bf89..00000000
--- a/swamid-2.0/shib-test02.skolfederation.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shib-test02.skolfederation.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T14:07:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://shib-test02.skolfederation.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Test IdP at shib-test02.skolfederation.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IdP at shib-test02.skolfederation.se</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAKIpDXYRvdS2zrotYm2OUO6QtBHxMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxNFoXDTM2MDMxNDEyMDcxNFowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDuXdCQDsnzEIKfhIVj4JXc3iLImuBBjd8b0AsaYIODAgnFTYEp6JwR
-YnEKDnQYEoWs6WfWjm9ByOtinHo55J27H7St5svmILIaA0XL/mtMEvVrwL+V8sp0
-UQG85zECyBUUsfa9ak9OsL/mMQSauOLOAmvO0NWP73/9AMBEDAP+Z3sncvhNVeUH
-3qXG7TYMyS63yiPQuzS/4IMA4YTm/zefx2cOC7DuouGzli2JdiLKwWVw2gnAw7m8
-AvAJM362NgwqcKEK8GXnHUUPOoNzvP6tMOuXtOt9LykmgY5okLgIUlVdJMELDcns
-hdx+/dUabm0lXXfihXletkwg7xSoGjUJAgMBAAGjgYEwfzAdBgNVHQ4EFgQU4Drw
-32V/cXL1Hps1tAMm5Wlzt5YwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBANVNtea/BQug5Xpa
-CvoLtZtn33yTL+LLwd7xhXYKlVrwXUm8oNfuJ6xpuql019t4S6+xJRNhqfqDHYVl
-nZVE6p98IVjboOPvQRDb9vGTaiGFIHkujpSAplPT3Q0ObJQXnosZdqVz0f5Ek5Y1
-uCx+7x06it9hCtMiuOx2rvbcSnB7aZ6QEmM+waRm9/NBbIfVVXyBAfvV5Tkj1ggB
-tU7ldt/up6rWflSYUuGSsyOK93tdl4/mElsax6z0uh5WGYysXD3VNwO3TUgn5oik
-qgLKGvBSeU71+pacWFMPhGTlgN9xilY98Izcpkqx8R0HOPse1Glrv/g/d2WBeTdW
-gYB1MC0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAMTx9B2MrDDQObwplYL31jsuEurxMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxM1oXDTM2MDMxNDEyMDcxM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCt+kswx/S/yGOdwcE6PXoLmdyosI+HyD4zewHAIvt2GaI+q6xcEY/I
-OwSLzVmaepW7HXbjJTTh2WWZXD9LuvUdRcddUoWyZRzO64heeKXwc09Un/QapulI
-qpJ7GJlX7ltNvWy10RqTkacPwXQimXcUQw/VNe0z2oF0erJifLHqkLT8MqXbHSQt
-Sv+5h2vR6M64ZNxe0lx4Slz6k9PCnXXQ2JdWJ07kPk3XWBTIv5g9EQi2OiD4gloD
-xawjNV51RiIUu5/BCarZgR3zPbRhkdswEHGAV26qU4QuwfqPZ8u1KPCnoZiNWCvD
-yyBj5hS5la0CmlYE+Fpk4lsgDV+HwRcNAgMBAAGjgYEwfzAdBgNVHQ4EFgQU2umq
-nceDOCxq0IvogBhhDmGzl9gwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAG3pFikol/CkP/6R
-tmkXK73fWojvbI8BatUTqikaRUTlfVgjqZ+71Uo648AUzT2pZUft+c/sAsQuW7p5
-rTsd1UkK5bGPji5JVsmD5qFOwGeMvyA3gGa8dgO1SehTwxG4Je7ZdvX5baYiMj4l
-aBWvYni36opxrFb/Xm144wU6F2wuLNQls9wzdtDivQnRoRMmUGkX6PRKzOIXuILQ
-lV+dpSrUDVYXncmFabB4jg6UU9GcXqNJz8IvQIVQcejw5pV4Zl1at52pDahk0U4U
-wB3emD5nkdkKgcsXj0LAYKZFYC4xqQxpBTZW5BCRwOQRKSa842J73oqGoAkdBAKa
-XOGjlaA=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAOKFRmXnO1W0+z5Ro16pX8gqQCK3MA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxNFoXDTM2MDMxNDEyMDcxNFowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDnudV/0wu5A017jD3yt41NXG2RzHbxJwt1E5khPHhgETfs+8ypTAEf
-HpdsWNWgM55jIi1w9HVVjzdY4i/htksxSvBgrRBnv79ZXjGlTEeaG+O1+xbmFAmp
-Zc4GHDpqW85U5Lw4skSjm/KJkzMd6biCdbd7syNoBk039XMHA0A8IgKOd3Dhs72u
-i2v0LF7ODqkmMSX27kC7p+dpfrNfvK/FstrhKzfDZVmijqNogqmw4s4bb9HL/Lw3
-dlPPpWMvvpuPcp11m9A09uo0ucSTrKhb7GZMZKvFMwnII7cfchjVkFQ9xXsTDLKm
-PIGPk2N/q+KUD7FUsCiNvClBxqocAiYvAgMBAAGjgYEwfzAdBgNVHQ4EFgQUkJdZ
-a+VzDO7nwVBI7P2x2zfhiAgwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHewrKz8eBsP8NLG
-aHPOLkLvxPKO2gOBzwGUafCp5zXLpnOIrOjVziBxeCRaGbsXlnLsxsTTfUnw7bxo
-TSKm8wwxpgtLoygQKyrY1GdN0fusRibm1D3221matfb4qCQSxZfttXy5TGzild3K
-CK0Wz3vK8wia/ldpUp0CR77F90XUpnOBZUJraZGP3zNWOulQn/V04DKjEbfFYbsT
-Kns4efG8+N0tHM6lqEVgiZn2/II3mHKwX8mJfXOmcXHSg9dwIlxcI2GQmUc5Yfu6
-wJXtfbVcy4pR2oEn6oLV4AFtkqrhlRIwXyEVLk+wVGBcn5lkZdjhilRqpVYVpL86
-yD8jVf0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test02.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAKIpDXYRvdS2zrotYm2OUO6QtBHxMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxNFoXDTM2MDMxNDEyMDcxNFowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDuXdCQDsnzEIKfhIVj4JXc3iLImuBBjd8b0AsaYIODAgnFTYEp6JwR
-YnEKDnQYEoWs6WfWjm9ByOtinHo55J27H7St5svmILIaA0XL/mtMEvVrwL+V8sp0
-UQG85zECyBUUsfa9ak9OsL/mMQSauOLOAmvO0NWP73/9AMBEDAP+Z3sncvhNVeUH
-3qXG7TYMyS63yiPQuzS/4IMA4YTm/zefx2cOC7DuouGzli2JdiLKwWVw2gnAw7m8
-AvAJM362NgwqcKEK8GXnHUUPOoNzvP6tMOuXtOt9LykmgY5okLgIUlVdJMELDcns
-hdx+/dUabm0lXXfihXletkwg7xSoGjUJAgMBAAGjgYEwfzAdBgNVHQ4EFgQU4Drw
-32V/cXL1Hps1tAMm5Wlzt5YwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBANVNtea/BQug5Xpa
-CvoLtZtn33yTL+LLwd7xhXYKlVrwXUm8oNfuJ6xpuql019t4S6+xJRNhqfqDHYVl
-nZVE6p98IVjboOPvQRDb9vGTaiGFIHkujpSAplPT3Q0ObJQXnosZdqVz0f5Ek5Y1
-uCx+7x06it9hCtMiuOx2rvbcSnB7aZ6QEmM+waRm9/NBbIfVVXyBAfvV5Tkj1ggB
-tU7ldt/up6rWflSYUuGSsyOK93tdl4/mElsax6z0uh5WGYysXD3VNwO3TUgn5oik
-qgLKGvBSeU71+pacWFMPhGTlgN9xilY98Izcpkqx8R0HOPse1Glrv/g/d2WBeTdW
-gYB1MC0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAMTx9B2MrDDQObwplYL31jsuEurxMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxM1oXDTM2MDMxNDEyMDcxM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCt+kswx/S/yGOdwcE6PXoLmdyosI+HyD4zewHAIvt2GaI+q6xcEY/I
-OwSLzVmaepW7HXbjJTTh2WWZXD9LuvUdRcddUoWyZRzO64heeKXwc09Un/QapulI
-qpJ7GJlX7ltNvWy10RqTkacPwXQimXcUQw/VNe0z2oF0erJifLHqkLT8MqXbHSQt
-Sv+5h2vR6M64ZNxe0lx4Slz6k9PCnXXQ2JdWJ07kPk3XWBTIv5g9EQi2OiD4gloD
-xawjNV51RiIUu5/BCarZgR3zPbRhkdswEHGAV26qU4QuwfqPZ8u1KPCnoZiNWCvD
-yyBj5hS5la0CmlYE+Fpk4lsgDV+HwRcNAgMBAAGjgYEwfzAdBgNVHQ4EFgQU2umq
-nceDOCxq0IvogBhhDmGzl9gwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAG3pFikol/CkP/6R
-tmkXK73fWojvbI8BatUTqikaRUTlfVgjqZ+71Uo648AUzT2pZUft+c/sAsQuW7p5
-rTsd1UkK5bGPji5JVsmD5qFOwGeMvyA3gGa8dgO1SehTwxG4Je7ZdvX5baYiMj4l
-aBWvYni36opxrFb/Xm144wU6F2wuLNQls9wzdtDivQnRoRMmUGkX6PRKzOIXuILQ
-lV+dpSrUDVYXncmFabB4jg6UU9GcXqNJz8IvQIVQcejw5pV4Zl1at52pDahk0U4U
-wB3emD5nkdkKgcsXj0LAYKZFYC4xqQxpBTZW5BCRwOQRKSa842J73oqGoAkdBAKa
-XOGjlaA=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAOKFRmXnO1W0+z5Ro16pX8gqQCK3MA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxNFoXDTM2MDMxNDEyMDcxNFowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDnudV/0wu5A017jD3yt41NXG2RzHbxJwt1E5khPHhgETfs+8ypTAEf
-HpdsWNWgM55jIi1w9HVVjzdY4i/htksxSvBgrRBnv79ZXjGlTEeaG+O1+xbmFAmp
-Zc4GHDpqW85U5Lw4skSjm/KJkzMd6biCdbd7syNoBk039XMHA0A8IgKOd3Dhs72u
-i2v0LF7ODqkmMSX27kC7p+dpfrNfvK/FstrhKzfDZVmijqNogqmw4s4bb9HL/Lw3
-dlPPpWMvvpuPcp11m9A09uo0ucSTrKhb7GZMZKvFMwnII7cfchjVkFQ9xXsTDLKm
-PIGPk2N/q+KUD7FUsCiNvClBxqocAiYvAgMBAAGjgYEwfzAdBgNVHQ4EFgQUkJdZ
-a+VzDO7nwVBI7P2x2zfhiAgwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHewrKz8eBsP8NLG
-aHPOLkLvxPKO2gOBzwGUafCp5zXLpnOIrOjVziBxeCRaGbsXlnLsxsTTfUnw7bxo
-TSKm8wwxpgtLoygQKyrY1GdN0fusRibm1D3221matfb4qCQSxZfttXy5TGzild3K
-CK0Wz3vK8wia/ldpUp0CR77F90XUpnOBZUJraZGP3zNWOulQn/V04DKjEbfFYbsT
-Kns4efG8+N0tHM6lqEVgiZn2/II3mHKwX8mJfXOmcXHSg9dwIlxcI2GQmUc5Yfu6
-wJXtfbVcy4pR2oEn6oLV4AFtkqrhlRIwXyEVLk+wVGBcn5lkZdjhilRqpVYVpL86
-yD8jVf0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml
deleted file mode 100644
index ef409e28..00000000
--- a/swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibbo3test.ltu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:20:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://shibbo3test.ltu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">A Name for the IdP at shibbo3test.ltu.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enter a description of your IdP at shibbo3test.ltu.se</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAJ/C7GVb0LTEi+7pmKXgaDAcajc6MA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzdaFw0zNjAzMTQwOTIzMzdaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxY6dkU9SFJLbKBtWEH
-wUWSxz9S4EpELEEmrTlv5FVQhR+UPMGqtbojFMasuFZOhFExLPB+NWKC2hsmhEyO
-R2/EHTFe7VhL9ZNEcbVZedHHw7dq3Zc0GuU3s2tqTb4/8gace9Pkx8MV2JGQcpll
-h/AE23GXRXPMSkFo6l35zBlzp9fmI42aKx+KGAdrvZhO4ZDVJ+8n+6U5z0YXDkIN
-32HlssxPOWYIQlhzLpNAJ9fLPwDk54dptE7oH+FRwZeAqvNobb/nwCH5Mw6wEOWJ
-xRi6lWDtW7LpPPeL+LwsDimvmtv8ahcOHxFclu/WrJ6FF8vJy/gH5pbqaNsI6mqC
-+EcCAwEAAaNrMGkwHQYDVR0OBBYEFFqKbVvlVTHGptIYS+EG98Wt/rEJMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACF00Z7OZ4IK
-C2t/ywPTIDe5U+Wk2pQ03tBpZ+pTbnI7nFxvkSRB65TeP4KX7BS6cn52jtpi+j1T
-oEWMTmTjxRBCs9RIGox04kUQlD87W7fxDyI0ZN0FA8GYOm27ZmA7PHSb9IPiXBJ5
-Kq+xeyKcnkJ84xa5Q91C9uVsgLafjdm/Z69imp9JIiybEKgnK88KRDU5VSBgV93R
-ctUC49it+6D3/Wi8K3eOLA+wo5lPLPxIsLf8gHLHwWgUvaVHt1sg6MdTU+011DTj
-8eJ9j9wuRVWrsHH97ZmkITZB0mBzkx3OS3VLsCJB5f640tbPZY75OKrOz7D07LBJ
-seV/+5km6JE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVANzbaWTqiitWHi/FZY/Cf0XjTG2tMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzVaFw0zNjAzMTQwOTIzMzVaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIM1kTvLw1tGy0YpTe80
-KxGj8w4oZiMHbErUhWUVNG09C6hMOfGkVdLBTZhqZcNhqGHLKGeE6ET9l4/YGEY1
-xdPCy4aHPyBH0AZZ5hVhRgOthEFdKTH5smb4J+lMk8a51BoRMStRmsm93IeYMMzU
-7HlCbsZ0H6bGRksEMWvbAiH5w5psT6He5oI+05g3RV1WrDexFImX/x7fZTI8YOTD
-qi64CDoLtGmGfE6dp1HPONfdLyFBr3/ENC6n9b9OOE2w7PDK63bHKrc4WfGCPWMG
-rWGLFnRwSfUKijJtvUdLAaE2SRvfzqxyZ5gUv0jcZH7VMkW1SWhgEajeiez+Z3J5
-MesCAwEAAaNrMGkwHQYDVR0OBBYEFI/PN6vDb385cLrqCL3JU+gGX4lGMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFKVyzGKVJty
-QYqseA7FjSfrOXw9Kljuggvn7M1fCs3esr3Ic4Gm3cDhjyFNakysZQm7kXC364sC
-N1JBGj4pSRLOmjaZVCCQkat4gQztumH+W47M7aFFIw+IUveS6HzhL3xMQFjxFnfL
-JU/FmWASnTeBzLGtts7eUcOtSobz6N4grPlR75KuOSDPovWyFgcmaAS17OFOt6AH
-3KIHNZOHO0rqx5g9EHzOF/+CsiAwRhg+2ydhLtf51A3ju8g/A4WMFdfmGESvM7MO
-zqNlArfwLcg+x0Au2u+aTWbCjwIq0cvdEC8CmJorZA6nH0tz8WMQXImhvrEWbtAi
-DUfmSji9lFM=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVALc7cXmNp5/uQQWtVri12AzDbYe/MA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzZaFw0zNjAzMTQwOTIzMzZaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMry0LiGt0F7Kkk/xqpo
-+evp9nQtztlkRNdN7DDDUejwLAOBB4xwotTdwmAs2F611QLhZSWI+FLM3jr+YxD1
-fUzef54BLPlPFRPmQUFzy9Uf6NJ9RUnArPWjyWEgwSQwpyu9TeKz5rpCCe39woL9
-sLOfFVRw/Lh2y6j1hPBipbP0OP3nsRE1WLZ36Q7LKQPJ6+FF0eyrEqnVfNEgHmFa
-bOR9aNjEL14gsW6KbfOsRuM+XWOj+0cNboBddVYwMmaML1sC8N5mZI0pmchz80VW
-OoY77wTxp4s4cLiOHvEfX2JqERy9h89tJQC5HnzLhjaDT9W9gKBlxe5GTvY22JhB
-g0kCAwEAAaNrMGkwHQYDVR0OBBYEFG7iRdtb6OAhSOnHYnNCvvNuZ9IEMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBADiDD72lxvE6
-K0/DIp6S4DOkqzJkyV+rzDDEJ4/TBvlr22jBFoCTjI/G2n/GjvOXYfIw2nMV86iC
-Ug5HMXsV9vgsIR4ChH+Y8YkNebCDgKckZK7opC1Jbq/7e7KNc+Dr++aOPKnuHQjQ
-N7xSqaBpIRIavAWONsxbvyLKSGWQsckYtwVug9rDwkjYm6JPd0Uae+ALgCIcIOgQ
-NDdQFzh/nDsIV9lfCwSIgBVFDAvO5HODbMrlIyAyCw4cdDxRLP0Q/dI3uLcs6Hxb
-ls1YqceuIJ1xea3cFj/VxrqP2sizmG/OGusxJ1JfWY/OHbeyiBtVAYz1u3WAy0xh
-ynzkb00+6b8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo3test.ltu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAJ/C7GVb0LTEi+7pmKXgaDAcajc6MA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzdaFw0zNjAzMTQwOTIzMzdaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxY6dkU9SFJLbKBtWEH
-wUWSxz9S4EpELEEmrTlv5FVQhR+UPMGqtbojFMasuFZOhFExLPB+NWKC2hsmhEyO
-R2/EHTFe7VhL9ZNEcbVZedHHw7dq3Zc0GuU3s2tqTb4/8gace9Pkx8MV2JGQcpll
-h/AE23GXRXPMSkFo6l35zBlzp9fmI42aKx+KGAdrvZhO4ZDVJ+8n+6U5z0YXDkIN
-32HlssxPOWYIQlhzLpNAJ9fLPwDk54dptE7oH+FRwZeAqvNobb/nwCH5Mw6wEOWJ
-xRi6lWDtW7LpPPeL+LwsDimvmtv8ahcOHxFclu/WrJ6FF8vJy/gH5pbqaNsI6mqC
-+EcCAwEAAaNrMGkwHQYDVR0OBBYEFFqKbVvlVTHGptIYS+EG98Wt/rEJMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACF00Z7OZ4IK
-C2t/ywPTIDe5U+Wk2pQ03tBpZ+pTbnI7nFxvkSRB65TeP4KX7BS6cn52jtpi+j1T
-oEWMTmTjxRBCs9RIGox04kUQlD87W7fxDyI0ZN0FA8GYOm27ZmA7PHSb9IPiXBJ5
-Kq+xeyKcnkJ84xa5Q91C9uVsgLafjdm/Z69imp9JIiybEKgnK88KRDU5VSBgV93R
-ctUC49it+6D3/Wi8K3eOLA+wo5lPLPxIsLf8gHLHwWgUvaVHt1sg6MdTU+011DTj
-8eJ9j9wuRVWrsHH97ZmkITZB0mBzkx3OS3VLsCJB5f640tbPZY75OKrOz7D07LBJ
-seV/+5km6JE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVANzbaWTqiitWHi/FZY/Cf0XjTG2tMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzVaFw0zNjAzMTQwOTIzMzVaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIM1kTvLw1tGy0YpTe80
-KxGj8w4oZiMHbErUhWUVNG09C6hMOfGkVdLBTZhqZcNhqGHLKGeE6ET9l4/YGEY1
-xdPCy4aHPyBH0AZZ5hVhRgOthEFdKTH5smb4J+lMk8a51BoRMStRmsm93IeYMMzU
-7HlCbsZ0H6bGRksEMWvbAiH5w5psT6He5oI+05g3RV1WrDexFImX/x7fZTI8YOTD
-qi64CDoLtGmGfE6dp1HPONfdLyFBr3/ENC6n9b9OOE2w7PDK63bHKrc4WfGCPWMG
-rWGLFnRwSfUKijJtvUdLAaE2SRvfzqxyZ5gUv0jcZH7VMkW1SWhgEajeiez+Z3J5
-MesCAwEAAaNrMGkwHQYDVR0OBBYEFI/PN6vDb385cLrqCL3JU+gGX4lGMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFKVyzGKVJty
-QYqseA7FjSfrOXw9Kljuggvn7M1fCs3esr3Ic4Gm3cDhjyFNakysZQm7kXC364sC
-N1JBGj4pSRLOmjaZVCCQkat4gQztumH+W47M7aFFIw+IUveS6HzhL3xMQFjxFnfL
-JU/FmWASnTeBzLGtts7eUcOtSobz6N4grPlR75KuOSDPovWyFgcmaAS17OFOt6AH
-3KIHNZOHO0rqx5g9EHzOF/+CsiAwRhg+2ydhLtf51A3ju8g/A4WMFdfmGESvM7MO
-zqNlArfwLcg+x0Au2u+aTWbCjwIq0cvdEC8CmJorZA6nH0tz8WMQXImhvrEWbtAi
-DUfmSji9lFM=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVALc7cXmNp5/uQQWtVri12AzDbYe/MA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzZaFw0zNjAzMTQwOTIzMzZaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMry0LiGt0F7Kkk/xqpo
-+evp9nQtztlkRNdN7DDDUejwLAOBB4xwotTdwmAs2F611QLhZSWI+FLM3jr+YxD1
-fUzef54BLPlPFRPmQUFzy9Uf6NJ9RUnArPWjyWEgwSQwpyu9TeKz5rpCCe39woL9
-sLOfFVRw/Lh2y6j1hPBipbP0OP3nsRE1WLZ36Q7LKQPJ6+FF0eyrEqnVfNEgHmFa
-bOR9aNjEL14gsW6KbfOsRuM+XWOj+0cNboBddVYwMmaML1sC8N5mZI0pmchz80VW
-OoY77wTxp4s4cLiOHvEfX2JqERy9h89tJQC5HnzLhjaDT9W9gKBlxe5GTvY22JhB
-g0kCAwEAAaNrMGkwHQYDVR0OBBYEFG7iRdtb6OAhSOnHYnNCvvNuZ9IEMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBADiDD72lxvE6
-K0/DIp6S4DOkqzJkyV+rzDDEJ4/TBvlr22jBFoCTjI/G2n/GjvOXYfIw2nMV86iC
-Ug5HMXsV9vgsIR4ChH+Y8YkNebCDgKckZK7opC1Jbq/7e7KNc+Dr++aOPKnuHQjQ
-N7xSqaBpIRIavAWONsxbvyLKSGWQsckYtwVug9rDwkjYm6JPd0Uae+ALgCIcIOgQ
-NDdQFzh/nDsIV9lfCwSIgBVFDAvO5HODbMrlIyAyCw4cdDxRLP0Q/dI3uLcs6Hxb
-ls1YqceuIJ1xea3cFj/VxrqP2sizmG/OGusxJ1JfWY/OHbeyiBtVAYz1u3WAy0xh
-ynzkb00+6b8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml
deleted file mode 100644
index 2931cbe1..00000000
--- a/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth-test.uhr.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-09-26T13:57:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://shibboleth-test.uhr.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Universitets- och högskolerådet - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish Council for Higher Education - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">TEST Identity Provider för Universitets- och högskolerådet (UHR)</mdui:Description>
-        <mdui:Description xml:lang="en">TEST Identity Provider for the Swedish Council for Higher Education (UHR)</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="80" width="131">https://shibboleth-test.uhr.se/idp/images/uhr_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="80" width="131">https://shibboleth-test.uhr.se/idp/images/uhr_logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">UHR Universitets+och+Högskolerådet VHS IPK The+Swedish+Council+for+Higher+Education</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">UHR Universitets+och+Högskolerådet VHS IPK The+Swedish+Council+for+Higher+Education</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>uhr.se</mdui:DomainHint>
-        <mdui:IPHint>193.11.100.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.33760,18.05835</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKTCCApGgAwIBAgIVAOmJNNsPlhtyCEhGvcbHwm8z88oHMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVzdC51aHIuc2UwHhcNMTkwOTE5
-MDcyMzI5WhcNMzkwOTE5MDcyMzI5WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLXRl
-c3QudWhyLnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAl6s0U5zo
-wGjNHDo6iyYbUCrKC8zIvyykkilrZDQZTjIfCiuETwaWY9bghpZiNrAZcVsUgVIP
-qaWoSw4P0v2e7s4xU076nVTrDagjc9Jh3OJfjws5n5Jo4/1GfPOeKuXXP3zVq52B
-A72sJA4D3QJJ4V04Jxr7RZlTfkqtBJqMEMHhPPB5nqxkUUeH6y/ceXUgJDBJ1Z2q
-MpSLMRgzTBFdc99SqZuR2oIlkA3KIzQVsyZqx+SgvMxCMImrXpmLNwUFak6lHEsN
-wH0jeKSJAI/5M2jP+OcRMy0H3/InE6VfPaKrQDq46bWIfQHsgdR5KbunKUXuEmcm
-E5W2o3/M/iWMPpd1FWtLT2nyf+7MHuTv/qms6vXDw2BBW74H8lRXC9pqVWq3plzg
-gwRWbKJJaGMgrELpQ47ewzzGro0XrgS3J6Mj+QPRn46Md3DqjmPSKnB8cP8v5YxU
-2+L8oGcnWLr1DTwy8BCCXUeDC2bgEt/TNpwTVm6td+ryhU6hghDJEEaNAgMBAAGj
-WDBWMB0GA1UdDgQWBBSzu8A3ALrUEs1+5Fft+DfUreW5/jA1BgNVHREELjAsghZz
-aGliYm9sZXRoLXRlc3QudWhyLnNlhhJodHRwczovL3Voci5zZS9pZHAwDQYJKoZI
-hvcNAQELBQADggGBAFLkaC9FXHlCzi2mYGPPixEc3pHMn9jwDCAcDB4UahJeEx5W
-EAJJkw4/ivHawLeG7AyF8IqSpvhBoGKZ3vAVUgD65jCj0lDOXAqGdl+zO7SvaEyZ
-gFUOv1UyEjE5vjdBQoA0wTfMxnFxKt4J2mUhBu7QGHjOcUfgYD+LBf825/IZ6R5/
-uByive0WP1f6gMxgN4EwgYWVVZxsBSCPTIOFqzBlngXt++A17JY3n3S2WM9fLe3Y
-j5utiDd3yF0LOOVGbwWFq9Y6VCm47rIciT3Y0KuDTyk3Fyf/h3Rhy/r8qROd+/kn
-kIIXs6CQW2y+e45mlfvxV9RV6OzmYjwyeit+Woa4BauHkUHKv+YeDlqHLkliOYMx
-x2N9Vkf+SslXx+zUB3YwHDEZ8G5nIM/eVE7lQuVcKLXjGhnIssKufM4cza9RSYxX
-Tvsyp3YRLHYFm581IBZ5eOu/11K63GieK1AM782871wmNDSFIM3dF5DRS73PG09H
-R1pR1C9aGOgVijhfxA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKTCCApGgAwIBAgIVAJa3jrWH5mn8cZPSdsybp17ygpHYMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVzdC51aHIuc2UwHhcNMTkwOTE5
-MDcyMzI3WhcNMzkwOTE5MDcyMzI3WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLXRl
-c3QudWhyLnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAnORmFlBy
-RbVlEjF+HTt+yZgAxl1hfddpXkJvNti8f+1wovfbANXMO12Iycpf63kfHojzx5Z3
-HOskiMju/o9tUMEgcvLQC4KDXzd2YgvmTO+0dYPI/eMDOmNZlRy+x5O8yIJWYSGJ
-rOwKHY4Wt4oRNCMbGeXM5uBX3S+95EFfD+JFquwhG50Pxv31CF1tPyaUJ47BnoU1
-evoahG2ZPX9GMcYYRtRf/gG+PTZ2xc5ZTDFQUnVu7dbcENcpFFGTdzChlW/6nBBO
-E1pDAB5cZ1+uXmpt92gf5R5ZDJ14Cj9+qou5vnA3ozdRVtPKcwpYBtrNb3hq+i8s
-RlcVX4Xl/TZxaN2rMJq1Wywb2EssRF3Nynq3jPaZk0QOOlldAwzhSvoeXbCxpj6/
-v0VMRlGijmCBZoY8vPTEB+C6e60ORQWDVq/N3ZyfLyekYjscIvZwfDZjYsCrtTJR
-xXsYg1m4tcrPfMd2QKcD4SZimfkDOH/qDSQdB7gAadOeledBoitWPrdVAgMBAAGj
-WDBWMB0GA1UdDgQWBBQiaM4Hy9R+2Lh+7JjLE2yrQWcf5jA1BgNVHREELjAsghZz
-aGliYm9sZXRoLXRlc3QudWhyLnNlhhJodHRwczovL3Voci5zZS9pZHAwDQYJKoZI
-hvcNAQELBQADggGBAGMzTkPlKeNFvcYsBKOcKkElTcekWwUCw8YyK+0qvKcOHR8b
-+APaud40Qs6mc4GOpju9ttUqI41ivDrpTSTSn1kyuUORgBUxnMduXUsm9sl9kJEL
-zEtLbxGl2588afRvy6qbnk9OAtpf1ckkoSW/lgZlWLg8TSC0Ff64a1wt6L86Z2aZ
-ByhiQWNlG+1eEbP4WBCae+HB/aKz+kYqdfjMqdFKhe4m1xgTwHzzjkwIeblEOzM1
-NDDdYfLEPiZZBoLOGn6txrkHHiEaL7lGVNTyWW7iiNG4kDIKH/ENSETKw1nNomJw
-r+0wNLrVzkpIStn43Mix/sr7mGCglFjfVP1AUD1o10GUPkYFDLR3BKpYbRbrg+s7
-+LjW2gG8l01hhq/mir+TII4Jm2PUFEXG4xYy6aohusA2u7t5u0gbc8Z0BUO/weZH
-b852nYB4FAI99bRACz3198vgnGCbEONYFpAjd4ZpJnYVd+CAOw7JpZk9Pn4rMtja
-m0LsY3AEmqhT8UG9og==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKDCCApCgAwIBAgIUZRduGMYlVVvhNNG7skvbn4qYZf8wDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWc2hpYmJvbGV0aC10ZXN0LnVoci5zZTAeFw0xOTA5MTkw
-NzIzMjhaFw0zOTA5MTkwNzIzMjhaMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVz
-dC51aHIuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDhkTrpfzf9
-q+4/CPNHWjFpCsjSU6WQ/mwZ5sKc3q/f9CWLMoNoYWfQxjFaltD5hbiC9Dan5tqu
-Hj24w3Vep2qS+Zy4YIWb+uGgdecV4mMBkmiYmVH0PyKu6n3PFvBpY9tX5WxNQlvC
-hrEJ59z8xZlGdl0+Ph4esYKqurKJWSR/eHooalHa0Pu466C9WWh+BWJZ6KZasPjr
-5AF2NGM+uC5cdlzV9sZvwwJDrfW0eVBfCdtDFxuDeEOuDzmsC655D135hgfCWnTK
-ZZDzgWLC0JYjIv01qhShy4Na4QrvItwqz8BzZodRXi6k381FyEbBcwJA52S/FvMy
-YeipAHxuq8CmnHd0LE8cotzKHkuzx2WGdHaPNLkgOEDIpl+e6SPNSjHd01mIjX1F
-YJ9KN2Ax2YfMm73aA5qP63toJTc6k73bf/zZdxWS86blGsnJHYLmGpDttJmO78ap
-19K4vQbbZLy9mcQsfyDQ2wPfRIarJl0SQd23Gj9VBBNtbWsrEw1WXtECAwEAAaNY
-MFYwHQYDVR0OBBYEFCJ172tw8WP8o6kkwyqqejmwfYWJMDUGA1UdEQQuMCyCFnNo
-aWJib2xldGgtdGVzdC51aHIuc2WGEmh0dHBzOi8vdWhyLnNlL2lkcDANBgkqhkiG
-9w0BAQsFAAOCAYEALkFrjQvcJrVguWW/fo02no3vpHztWZ8Fmmcy7SY6nNxRaqR0
-P6aixFWr+lsEzaISV2uiJWBg79hjW9d7yQ+igDj8ONJVSy+oA2uivm3PaKkOXs8h
-kpKKg4fFa2THtqMhS4imtr9A5HWzWoff1PeidOFKS/HQdLaHHlA3IzixbWzx3k9H
-sxZkVE2eK5eFIyVoYfS/l/Qy/6pK/EnSHMVbOgQ+LtzSdPEi9ABEJ5/3U5lbRXN9
-V7UlTzaXliJqeLt8m5B3DEs1azTLTPyR0Htitor0MAKD+BHqLebhEwGgMr+Fpjdg
-kIU8uXJq2rkxuhcil5OJwjUMPA+BqD8BlsPwEnXkeOD1RVvQWvV3VF99IerdM7z+
-ZNd4tzvfX6UIwSxELtcoO4xCi/ngqq9bb6eg3kSFu2rRcX7LNuFrcSeNclyrcTHR
-WXMFwoSfMdumy0WzeBAegMe7tKCPEjFKMBi22Wak0U57lRMZE3JB7mTna3L49R1W
-l7UYcB93c7mgKbGO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-test.uhr.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://shibboleth-test.uhr.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://shibboleth-test.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKTCCApGgAwIBAgIVAOmJNNsPlhtyCEhGvcbHwm8z88oHMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVzdC51aHIuc2UwHhcNMTkwOTE5
-MDcyMzI5WhcNMzkwOTE5MDcyMzI5WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLXRl
-c3QudWhyLnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAl6s0U5zo
-wGjNHDo6iyYbUCrKC8zIvyykkilrZDQZTjIfCiuETwaWY9bghpZiNrAZcVsUgVIP
-qaWoSw4P0v2e7s4xU076nVTrDagjc9Jh3OJfjws5n5Jo4/1GfPOeKuXXP3zVq52B
-A72sJA4D3QJJ4V04Jxr7RZlTfkqtBJqMEMHhPPB5nqxkUUeH6y/ceXUgJDBJ1Z2q
-MpSLMRgzTBFdc99SqZuR2oIlkA3KIzQVsyZqx+SgvMxCMImrXpmLNwUFak6lHEsN
-wH0jeKSJAI/5M2jP+OcRMy0H3/InE6VfPaKrQDq46bWIfQHsgdR5KbunKUXuEmcm
-E5W2o3/M/iWMPpd1FWtLT2nyf+7MHuTv/qms6vXDw2BBW74H8lRXC9pqVWq3plzg
-gwRWbKJJaGMgrELpQ47ewzzGro0XrgS3J6Mj+QPRn46Md3DqjmPSKnB8cP8v5YxU
-2+L8oGcnWLr1DTwy8BCCXUeDC2bgEt/TNpwTVm6td+ryhU6hghDJEEaNAgMBAAGj
-WDBWMB0GA1UdDgQWBBSzu8A3ALrUEs1+5Fft+DfUreW5/jA1BgNVHREELjAsghZz
-aGliYm9sZXRoLXRlc3QudWhyLnNlhhJodHRwczovL3Voci5zZS9pZHAwDQYJKoZI
-hvcNAQELBQADggGBAFLkaC9FXHlCzi2mYGPPixEc3pHMn9jwDCAcDB4UahJeEx5W
-EAJJkw4/ivHawLeG7AyF8IqSpvhBoGKZ3vAVUgD65jCj0lDOXAqGdl+zO7SvaEyZ
-gFUOv1UyEjE5vjdBQoA0wTfMxnFxKt4J2mUhBu7QGHjOcUfgYD+LBf825/IZ6R5/
-uByive0WP1f6gMxgN4EwgYWVVZxsBSCPTIOFqzBlngXt++A17JY3n3S2WM9fLe3Y
-j5utiDd3yF0LOOVGbwWFq9Y6VCm47rIciT3Y0KuDTyk3Fyf/h3Rhy/r8qROd+/kn
-kIIXs6CQW2y+e45mlfvxV9RV6OzmYjwyeit+Woa4BauHkUHKv+YeDlqHLkliOYMx
-x2N9Vkf+SslXx+zUB3YwHDEZ8G5nIM/eVE7lQuVcKLXjGhnIssKufM4cza9RSYxX
-Tvsyp3YRLHYFm581IBZ5eOu/11K63GieK1AM782871wmNDSFIM3dF5DRS73PG09H
-R1pR1C9aGOgVijhfxA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKTCCApGgAwIBAgIVAJa3jrWH5mn8cZPSdsybp17ygpHYMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVzdC51aHIuc2UwHhcNMTkwOTE5
-MDcyMzI3WhcNMzkwOTE5MDcyMzI3WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLXRl
-c3QudWhyLnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAnORmFlBy
-RbVlEjF+HTt+yZgAxl1hfddpXkJvNti8f+1wovfbANXMO12Iycpf63kfHojzx5Z3
-HOskiMju/o9tUMEgcvLQC4KDXzd2YgvmTO+0dYPI/eMDOmNZlRy+x5O8yIJWYSGJ
-rOwKHY4Wt4oRNCMbGeXM5uBX3S+95EFfD+JFquwhG50Pxv31CF1tPyaUJ47BnoU1
-evoahG2ZPX9GMcYYRtRf/gG+PTZ2xc5ZTDFQUnVu7dbcENcpFFGTdzChlW/6nBBO
-E1pDAB5cZ1+uXmpt92gf5R5ZDJ14Cj9+qou5vnA3ozdRVtPKcwpYBtrNb3hq+i8s
-RlcVX4Xl/TZxaN2rMJq1Wywb2EssRF3Nynq3jPaZk0QOOlldAwzhSvoeXbCxpj6/
-v0VMRlGijmCBZoY8vPTEB+C6e60ORQWDVq/N3ZyfLyekYjscIvZwfDZjYsCrtTJR
-xXsYg1m4tcrPfMd2QKcD4SZimfkDOH/qDSQdB7gAadOeledBoitWPrdVAgMBAAGj
-WDBWMB0GA1UdDgQWBBQiaM4Hy9R+2Lh+7JjLE2yrQWcf5jA1BgNVHREELjAsghZz
-aGliYm9sZXRoLXRlc3QudWhyLnNlhhJodHRwczovL3Voci5zZS9pZHAwDQYJKoZI
-hvcNAQELBQADggGBAGMzTkPlKeNFvcYsBKOcKkElTcekWwUCw8YyK+0qvKcOHR8b
-+APaud40Qs6mc4GOpju9ttUqI41ivDrpTSTSn1kyuUORgBUxnMduXUsm9sl9kJEL
-zEtLbxGl2588afRvy6qbnk9OAtpf1ckkoSW/lgZlWLg8TSC0Ff64a1wt6L86Z2aZ
-ByhiQWNlG+1eEbP4WBCae+HB/aKz+kYqdfjMqdFKhe4m1xgTwHzzjkwIeblEOzM1
-NDDdYfLEPiZZBoLOGn6txrkHHiEaL7lGVNTyWW7iiNG4kDIKH/ENSETKw1nNomJw
-r+0wNLrVzkpIStn43Mix/sr7mGCglFjfVP1AUD1o10GUPkYFDLR3BKpYbRbrg+s7
-+LjW2gG8l01hhq/mir+TII4Jm2PUFEXG4xYy6aohusA2u7t5u0gbc8Z0BUO/weZH
-b852nYB4FAI99bRACz3198vgnGCbEONYFpAjd4ZpJnYVd+CAOw7JpZk9Pn4rMtja
-m0LsY3AEmqhT8UG9og==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKDCCApCgAwIBAgIUZRduGMYlVVvhNNG7skvbn4qYZf8wDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWc2hpYmJvbGV0aC10ZXN0LnVoci5zZTAeFw0xOTA5MTkw
-NzIzMjhaFw0zOTA5MTkwNzIzMjhaMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVz
-dC51aHIuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDhkTrpfzf9
-q+4/CPNHWjFpCsjSU6WQ/mwZ5sKc3q/f9CWLMoNoYWfQxjFaltD5hbiC9Dan5tqu
-Hj24w3Vep2qS+Zy4YIWb+uGgdecV4mMBkmiYmVH0PyKu6n3PFvBpY9tX5WxNQlvC
-hrEJ59z8xZlGdl0+Ph4esYKqurKJWSR/eHooalHa0Pu466C9WWh+BWJZ6KZasPjr
-5AF2NGM+uC5cdlzV9sZvwwJDrfW0eVBfCdtDFxuDeEOuDzmsC655D135hgfCWnTK
-ZZDzgWLC0JYjIv01qhShy4Na4QrvItwqz8BzZodRXi6k381FyEbBcwJA52S/FvMy
-YeipAHxuq8CmnHd0LE8cotzKHkuzx2WGdHaPNLkgOEDIpl+e6SPNSjHd01mIjX1F
-YJ9KN2Ax2YfMm73aA5qP63toJTc6k73bf/zZdxWS86blGsnJHYLmGpDttJmO78ap
-19K4vQbbZLy9mcQsfyDQ2wPfRIarJl0SQd23Gj9VBBNtbWsrEw1WXtECAwEAAaNY
-MFYwHQYDVR0OBBYEFCJ172tw8WP8o6kkwyqqejmwfYWJMDUGA1UdEQQuMCyCFnNo
-aWJib2xldGgtdGVzdC51aHIuc2WGEmh0dHBzOi8vdWhyLnNlL2lkcDANBgkqhkiG
-9w0BAQsFAAOCAYEALkFrjQvcJrVguWW/fo02no3vpHztWZ8Fmmcy7SY6nNxRaqR0
-P6aixFWr+lsEzaISV2uiJWBg79hjW9d7yQ+igDj8ONJVSy+oA2uivm3PaKkOXs8h
-kpKKg4fFa2THtqMhS4imtr9A5HWzWoff1PeidOFKS/HQdLaHHlA3IzixbWzx3k9H
-sxZkVE2eK5eFIyVoYfS/l/Qy/6pK/EnSHMVbOgQ+LtzSdPEi9ABEJ5/3U5lbRXN9
-V7UlTzaXliJqeLt8m5B3DEs1azTLTPyR0Htitor0MAKD+BHqLebhEwGgMr+Fpjdg
-kIU8uXJq2rkxuhcil5OJwjUMPA+BqD8BlsPwEnXkeOD1RVvQWvV3VF99IerdM7z+
-ZNd4tzvfX6UIwSxELtcoO4xCi/ngqq9bb6eg3kSFu2rRcX7LNuFrcSeNclyrcTHR
-WXMFwoSfMdumy0WzeBAegMe7tKCPEjFKMBi22Wak0U57lRMZE3JB7mTna3L49R1W
-l7UYcB93c7mgKbGO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universitets- och hogskoleradet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet - Test</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education - Test</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>The Swedish Council for Higher Education</md:Company>
-    <md:SurName>Håkan Pettersson</md:SurName>
-    <md:EmailAddress>mailto:hakan.pettersson@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>070-595 96 28</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>The Swedish Council for Higher Education</md:Company>
-    <md:SurName>Håkan Pettersson</md:SurName>
-    <md:EmailAddress>mailto:hakan.pettersson@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 70595 96 28</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>The Swedish Council for Higher Education</md:Company>
-    <md:SurName>Håkan Pettersson</md:SurName>
-    <md:EmailAddress>mailto:hakan.pettersson@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 70595 96 28</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/signservice.edusign.sunet.se-sigservice.xml b/swamid-2.0/signservice.edusign.sunet.se-sigservice.xml
deleted file mode 100644
index 02c186ed..00000000
--- a/swamid-2.0/signservice.edusign.sunet.se-sigservice.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://signservice.edusign.sunet.se/sigservice">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-04-30T18:01:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="sv">Underskriftstjänst för eduSign</mdui:Description>
-        <mdui:Description xml:lang="en">eduSign signing service</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">SUNET underskriftstjänst</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET signing service</mdui:DisplayName>
-        <mdui:Logo xml:lang="sv" height="150" width="150">https://signservice.edusign.sunet.se/cs-sigserver/publish/logos/edusign/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="150" width="150">https://signservice.edusign.sunet.se/cs-sigserver/publish/logos/edusign/logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/eduSign+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/eduSign+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://signservice.edusign.sunet.se/sigservice</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=Signing Service instance edusign</ds:X509SubjectName>
-          <ds:X509Certificate>MIICzzCCAbcCBgFxy4a7ijANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDDCBTaWduaW5nIFNlcnZpY2UgaW5zdGFuY2UgZWR1c2lnbjAeFw0yMDA0MzAxMjM4NTdaFw0yNTA0MzAxNDM4NTdaMCsxKTAnBgNVBAMMIFNpZ25pbmcgU2VydmljZSBpbnN0YW5jZSBlZHVzaWduMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxshkXPk8TG2Qk2+0mzoc5b2GS9bHF/PJtR8XUy9aS1kjs7APY51k076rBlj/DNVcHsr8yEUAJ4JPAYD9csGYA8HHzZnUIp7mjv0hRM43THpy6os/4QWFw+XbevCRKsARokLDykxT+cvoyoolCa+MRzT9nPTBzlr/rFrN3W3YXY2tR9J6Qe46WXIKLF6h+3NPL3yTIE19K6WUUJ/PeZyf6DXQ70rXxJPnmyFNFf49iyE2l9lSwQJsa1OGVHdwW3LlFXMPXfMhuKyNEIf2olonmzS5u64riQ7uzsyxoZyLiXlWGjvzntPJGutzaMQ9R7TnTGYUjfctzNa/mK+8K2BsTQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQC69U8EEOHp7FG+NrD/l+2J5NX5RTsGcQNSEtClsDxkG4zkGO/nTmp+gFg4zZS/zfaEQ+eyfZfL4VD31t+5enb/xETDpAzoZifyN1gU7rUqMg3/B+hJiUws0MBFja+z6cZiQVDlS+lcLcknIDEIeKs4EeTwn/K8p4yPINcjzDUlzhNuYHsI4ypG7VNbRvKAc25aDLpg1Okxo1/z02aR6BfSrE6t9aU5tn2nJh6ve5xupqqI4XzV9S3oEijxvLE+tewu46NnhTq4MDHJsOQFbZ2/O6SMA3uruW+g4hlBHxynrOU8sB/A1p/ePYmab7xaUz9nsUyjuzJXZB1osjxnLYev</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signservice.edusign.sunet.se/cs-sigserver/sign" index="0"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">SUNET eduSIGN Service</md:ServiceName>
-      <md:ServiceName xml:lang="sv">SUNET eduSIGN - tjänst för e-signaturer</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90-20 59 100</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 20 78 60</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SUNET CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sp.haikom.com-saml-kph-test.xml b/swamid-2.0/sp.haikom.com-saml-kph-test.xml
deleted file mode 100644
index 6948c1f0..00000000
--- a/swamid-2.0/sp.haikom.com-saml-kph-test.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sp.haikom.com/saml/kph-test">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-10-17T11:16:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets visitkortsportal (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University business cards portal (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets visitkortsportal används för beställning av visitkort.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University business cards portal is used for ordering business cards.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=860972</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=860972</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIIcS3igxdPcxEwDQYJKoZIhvcNAQENBQAwgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb20wHhcNMTcwOTE2MDAwMDAwWhcNMzcwOTE2MDAwMDAwWjBOMRYwFAYDVQQDDA1zcC5oYWlrb20uY29tMQ8wDQYDVQQKDAZIYWlLb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWmhC8VIJsSOSArrsO/jRgukGxCbX+0KyIzA2aNcsi9GDvYIMnf9m4P/uhVK7YFrsaC6BvWv38mdZP3oW4tOVX5J9XuiMwH+mOJajyNvMqaMebWLbwJJ2mDSC/4kX9y5tn+y/Fwu3+QMnRApVQCLWL+Pr5z7xeq4gpETsC8KnDqRq3jNSRClYmZzU3UNFb5wKIcLFJ7ShQpFi5tORhNeX1Y8ziUJgUChKlvrqI9Xxs+whEtMjqmqB6P/8NDR35y8bzmv8FlfNdJQXP8XG+icTXAOsuI78fIQQl860v+BiuCHIr3nzHcZIkeXP1E5skVE8G521TzALacNABvMKRUhCQIDAQABo4IBBDCCAQAwgdAGA1UdIwSByDCBxYAUUlkcUX7NJ5BrsANXn7DX2or8t2ihgaKkgZ8wgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb22CCHEt4oMXT3MRMB0GA1UdDgQWBBRSWRxRfs0nkGuwA1efsNfaivy3aDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAESl1nr0+3TNo3KEh2UPykyi/2XrYrfMU4Yu7FMQPYPcyNqjumUumzX/fjwHP/yWeNZ7F3L+2npQicZ/04o4sNwzhixuZ2fSv/s5PTvpbwQzBEbTitLkr/ki1PTLQp12yIN6EWkmpxdsnfMEvY3arV3e6Le8c2dVZSIUomuDYg38KhEoj22yPUYsBCxKv7mWBB4H/BJ6rOxAlJ00T4FOCKttj4qajKuEK3T9rbQ2CMnhxLB2WPcWUSE8oprLZSNwqDSWzhnn0YZEWRKj2jd3RuFsnSBTlroYwiUgfiLTWOj3bTcw5/B5uty2TVAqmWTA4fAQUgZn3JBJ7SeeGbaQdc</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIIcS3igxdPcxEwDQYJKoZIhvcNAQENBQAwgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb20wHhcNMTcwOTE2MDAwMDAwWhcNMzcwOTE2MDAwMDAwWjBOMRYwFAYDVQQDDA1zcC5oYWlrb20uY29tMQ8wDQYDVQQKDAZIYWlLb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWmhC8VIJsSOSArrsO/jRgukGxCbX+0KyIzA2aNcsi9GDvYIMnf9m4P/uhVK7YFrsaC6BvWv38mdZP3oW4tOVX5J9XuiMwH+mOJajyNvMqaMebWLbwJJ2mDSC/4kX9y5tn+y/Fwu3+QMnRApVQCLWL+Pr5z7xeq4gpETsC8KnDqRq3jNSRClYmZzU3UNFb5wKIcLFJ7ShQpFi5tORhNeX1Y8ziUJgUChKlvrqI9Xxs+whEtMjqmqB6P/8NDR35y8bzmv8FlfNdJQXP8XG+icTXAOsuI78fIQQl860v+BiuCHIr3nzHcZIkeXP1E5skVE8G521TzALacNABvMKRUhCQIDAQABo4IBBDCCAQAwgdAGA1UdIwSByDCBxYAUUlkcUX7NJ5BrsANXn7DX2or8t2ihgaKkgZ8wgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb22CCHEt4oMXT3MRMB0GA1UdDgQWBBRSWRxRfs0nkGuwA1efsNfaivy3aDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAESl1nr0+3TNo3KEh2UPykyi/2XrYrfMU4Yu7FMQPYPcyNqjumUumzX/fjwHP/yWeNZ7F3L+2npQicZ/04o4sNwzhixuZ2fSv/s5PTvpbwQzBEbTitLkr/ki1PTLQp12yIN6EWkmpxdsnfMEvY3arV3e6Le8c2dVZSIUomuDYg38KhEoj22yPUYsBCxKv7mWBB4H/BJ6rOxAlJ00T4FOCKttj4qajKuEK3T9rbQ2CMnhxLB2WPcWUSE8oprLZSNwqDSWzhnn0YZEWRKj2jd3RuFsnSBTlroYwiUgfiLTWOj3bTcw5/B5uty2TVAqmWTA4fAQUgZn3JBJ7SeeGbaQdc</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/slo/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/slo/Redirect"/>
-    <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://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/Redirect" index="2" isDefault="false"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HaiKom AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HaiKom</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.haikom.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>HaiKom</md:Company>
-    <md:EmailAddress>mailto:support@haikom.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 16d12f39..00000000
--- a/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sp.snd.gu.se/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-21T10:11:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</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">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SND Service Provider</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SND Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO service for SND.</mdui:Description>
-        <mdui:Description xml:lang="sv">SSO tjänst för SND.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://snd.gu.se/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://snd.gu.se/sv</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAOSJkiHJyuhvMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTEeMBwGA1UECAwVVsODwqRzdHJhIEfDg8K2dGFsYW5kMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzEnMCUGA1UECgweU3ZlbnNrIE5hdGlvbmVsbCBEYXRhdGrDg8KkbnN0MQwwCgYDVQQLDANTTkQxFTATBgNVBAMMDHNwLnNuZC5ndS5zZTAeFw0xNzAzMTUxMzQwMDBaFw0yNzAzMTUxMzQwMDBaMIGRMQswCQYDVQQGEwJTRTEeMBwGA1UECAwVVsODwqRzdHJhIEfDg8K2dGFsYW5kMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzEnMCUGA1UECgweU3ZlbnNrIE5hdGlvbmVsbCBEYXRhdGrDg8KkbnN0MQwwCgYDVQQLDANTTkQxFTATBgNVBAMMDHNwLnNuZC5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy/SFCAUMA1/kifnZ+BXyoQQko1N2gKDWJAtxkhdLjqIMSWiAJB6Hm/6y+KeVjJI/sS4/YeeU3tNhEt4jAz/pvzBfSrTnq7r19bAag/ETA0bl3v5e2reTOm10TC3vzYYdGRYeZJ7hzJc41E9nvxKFq/WPWPkEU/n2tyaAkpR+daiCdCs5wyNdTC2qNdC290fST7xNFHQ9H/SAcKBdw8bb7aPbX/UXUAdbz0HSt621P6fMCsJ2OrxZsbfuB0tt21whabnxuiWyvU0jlX+E3psl7Ckqzpgo3jjR8NwIIbDqhUhdpTq3VfmAhCNGJLsn/WFcKTeWcUVCaK8Kz4dYvKaf8CAwEAAaNQME4wHQYDVR0OBBYEFCtRfcV48A7euocX6hm3Uf3bqRLpMB8GA1UdIwQYMBaAFCtRfcV48A7euocX6hm3Uf3bqRLpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADi6MncS0X8OosEgUNIFHTm2M/nIiMf/Q5Y3tXKnAYKVrrv2FZXFvFtGYGFs6tpvmAqgRBP8wAF1BfCOPihbB8QtTqPBsDB2AklUH9BGJiZeKKJjPj7EmQyI6w1bcntvrOXA/P3dIgvyL6opoXp/103qB3aCcvGzdt6jHcsVfnWnW8OSZyCHQeoYTqAmtDTaxrzhEd+festHNEPoJtnjdQW1bLa20HxJNnABarrYbo7ELikBz3tUwztOc1u5+40+XuRky7eqioptf5mhmJuZ7kh3sapzTdJLXhU++nQ6jS3rCpK1gUWuwhzN+67w+hV+/EeviTxkRlqa5//sBr6Erus=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAOSJkiHJyuhvMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTEeMBwGA1UECAwVVsODwqRzdHJhIEfDg8K2dGFsYW5kMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzEnMCUGA1UECgweU3ZlbnNrIE5hdGlvbmVsbCBEYXRhdGrDg8KkbnN0MQwwCgYDVQQLDANTTkQxFTATBgNVBAMMDHNwLnNuZC5ndS5zZTAeFw0xNzAzMTUxMzQwMDBaFw0yNzAzMTUxMzQwMDBaMIGRMQswCQYDVQQGEwJTRTEeMBwGA1UECAwVVsODwqRzdHJhIEfDg8K2dGFsYW5kMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzEnMCUGA1UECgweU3ZlbnNrIE5hdGlvbmVsbCBEYXRhdGrDg8KkbnN0MQwwCgYDVQQLDANTTkQxFTATBgNVBAMMDHNwLnNuZC5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy/SFCAUMA1/kifnZ+BXyoQQko1N2gKDWJAtxkhdLjqIMSWiAJB6Hm/6y+KeVjJI/sS4/YeeU3tNhEt4jAz/pvzBfSrTnq7r19bAag/ETA0bl3v5e2reTOm10TC3vzYYdGRYeZJ7hzJc41E9nvxKFq/WPWPkEU/n2tyaAkpR+daiCdCs5wyNdTC2qNdC290fST7xNFHQ9H/SAcKBdw8bb7aPbX/UXUAdbz0HSt621P6fMCsJ2OrxZsbfuB0tt21whabnxuiWyvU0jlX+E3psl7Ckqzpgo3jjR8NwIIbDqhUhdpTq3VfmAhCNGJLsn/WFcKTeWcUVCaK8Kz4dYvKaf8CAwEAAaNQME4wHQYDVR0OBBYEFCtRfcV48A7euocX6hm3Uf3bqRLpMB8GA1UdIwQYMBaAFCtRfcV48A7euocX6hm3Uf3bqRLpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADi6MncS0X8OosEgUNIFHTm2M/nIiMf/Q5Y3tXKnAYKVrrv2FZXFvFtGYGFs6tpvmAqgRBP8wAF1BfCOPihbB8QtTqPBsDB2AklUH9BGJiZeKKJjPj7EmQyI6w1bcntvrOXA/P3dIgvyL6opoXp/103qB3aCcvGzdt6jHcsVfnWnW8OSZyCHQeoYTqAmtDTaxrzhEd+festHNEPoJtnjdQW1bLa20HxJNnABarrYbo7ELikBz3tUwztOc1u5+40+XuRky7eqioptf5mhmJuZ7kh3sapzTdJLXhU++nQ6jS3rCpK1gUWuwhzN+67w+hV+/EeviTxkRlqa5//sBr6Erus=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.snd.gu.se/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.snd.gu.se/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Swedish National Data Service</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Svensk Nationell Datatjänst</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish National Data Service</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://snd.gu.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>SND</md:Company>
-    <md:GivenName>SND</md:GivenName>
-    <md:SurName>Administrative</md:SurName>
-    <md:EmailAddress>mailto:snd@snd.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>SND</md:Company>
-    <md:GivenName>SND</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SND</md:GivenName>
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>SND</md:Company>
-    <md:GivenName>SND</md:GivenName>
-    <md:SurName>Security</md:SurName>
-    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
deleted file mode 100644
index f6df5f70..00000000
--- a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sp.spraakbanken.gu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-10-13T09:16:19Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <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"/>
-  </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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Språkbanken</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Språkbanken</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Språkbanken är en forskningsenhet vid Institutionen för svenska språket, Göteborgs universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Språkbanken (the Swedish Language Bank) is a nationally and internationally acknowledged research unit at the Department of Swedish, University of Gothenburg</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://spraakbanken.gu.se/eng/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="146" width="256">https://sp.spraakbanken.gu.se/logo-small.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="256">https://sp.spraakbanken.gu.se/logo-small.png</mdui:Logo>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/DS/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>sp.spraakbanken.gu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.spraakbanken.gu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEBjCCAm6gAwIBAgIJANTqNGS+Meg9MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-          BAMTFXNwLnNwcmFha2Jhbmtlbi5ndS5zZTAeFw0xNzEwMDkwOTMzNDJaFw0yNzEw
-          MDcwOTMzNDJaMCAxHjAcBgNVBAMTFXNwLnNwcmFha2Jhbmtlbi5ndS5zZTCCAaIw
-          DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALDidsS0JETlmVQttP/ZWkfHOuz5
-          dWSo2jUSLK61yRNN1Ti7ZYrv8O4shEvKzhDxXMUKoiGWvzvKArE6ELrjBvpWciJj
-          f5clh4NkKVrRUqQiHONO4f3XVFOJ2WGGHHK7if1YHuCdKUYbkuUjJ1f+GPVEInT2
-          0cS2TO/BEpR859sJFghx55CH6ovg5PjvGp+apfA1Nh40Snp3Ssf6lES/Z2lLJNeF
-          bfidkt4gkwGjnusQUcirtY4MpN6oEusyhU81Ly6pJOydcBaZzFxVkrbf1PTmfYcX
-          8j7muuMMFKYMf+vYtL9rkx+kRtA8T0nESJCrovWVRoUJujGlq3yUFI6d8hiPYr2x
-          xUOhia5EeLQOKevinvwvcnl51txwMtoc3WlVWHl5qv21JWupw4l5R98E+GEui2av
-          +lpEnxluIM0fqnU/QO0j1QkmRP5o73kloms39CJMALWgLwUZXEe5M4EDnjF+4Oa4
-          LocWuj/S1HO8SYEjUky0Rc3x1YHjz1qlNoBHrwIDAQABo0MwQTAgBgNVHREEGTAX
-          ghVzcC5zcHJhYWtiYW5rZW4uZ3Uuc2UwHQYDVR0OBBYEFK5gYOUKyVkjcyJfveEq
-          7qMCNF0dMA0GCSqGSIb3DQEBCwUAA4IBgQBz6Tr80qXJK3QztV4NQtns+eysSkR5
-          MZYLA/8Au3khfvLKm851pbcNm8kIydWcHy3L/y+k4dBTurmYPNmqIJcn4V6+E8oW
-          9RKcDbxxan8Z+epZinedR86Cl//BcGYCvd1VLnnLwC/otMaVvBJUTGKHW8AXIsoU
-          YdaaogtWv+aMarnmggvq1op2mkLodvUvJqNU+5W3mtLRlNweQWAn0WSfSlnQb98H
-          HINifOI9yhkw+kgayV/Vs9yhvRetSJFdxJy/RsIzsiBCB5gi/5jbCEyZKjthp1l2
-          jJ/LCxMnNdmERg9Knn+fvYwDqAbvt5lvI0YjKHwyU/TVx4uAx/Yn0A62ZlXs1SxS
-          quocDzbyT+8G/2hgINlcXMeffSNIxF0Bnqr7t0twwmz3jEXljt/5Xmawk63+sKnk
-          XY2YJNAZj6iK43EuFEAVfDchxTI02c8/1RpjTipSSLbV7jzrUoz8wuY7zlLSrODG
-          B1l+7GujpIQqv3B1RJA3m+G632LPFkBZgFM=
-          </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://sp.spraakbanken.gu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Språkbanken</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Språkbanken</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Språkbanken</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Språkbanken</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Språkbanken</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Språkbanken</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://spraakbanken.gu.se/eng/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Lars</md:GivenName>
-    <md:SurName>Borin</md:SurName>
-    <md:EmailAddress>mailto:sb-info@svenska.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Carl-Johan</md:GivenName>
-    <md:SurName>Schenström</md:SurName>
-    <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carl-Johan</md:GivenName>
-    <md:SurName>Schenström</md:SurName>
-    <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sp.sprakochfolkminnen.se-.xml b/swamid-2.0/sp.sprakochfolkminnen.se-.xml
deleted file mode 100644
index 4a3341f0..00000000
--- a/swamid-2.0/sp.sprakochfolkminnen.se-.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sp.sprakochfolkminnen.se/">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-03-02T14:07:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Institute for Language and Folklore</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Institutet för språk och folkminnen</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Institute for Language and Folklore</mdui:Description>
-        <mdui:Description xml:lang="sv">Institutet för språk och folkminnen</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.sprakochfolkminnen.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sprakochfolkminnen.se/om-oss/verksamhet/about-the-institute.html</mdui:InformationURL>
-        <mdui:Logo width="236" height="146" xml:lang="sv">https://sp.sprakochfolkminnen.se/ISOF-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJALSgVaAtkpyyMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGHNwLnNwcmFrb2NoZm9sa21pbm5lbi5zZTAeFw0xOTA3MTYxNDE0NDBaFw0yOTA3MTMxNDE0NDBaMCMxITAfBgNVBAMTGHNwLnNwcmFrb2NoZm9sa21pbm5lbi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJFmCxfK2ApdO44DOxoSLsuUrati1I1i83kNwpjaai7LNhr993Xrz2VvwatAnsStSuKEkJPjVoLuhwtmGPU7OlseNU4i8v//4REDtJVeJLmI+VSgLxCB3bobtolq0JUOSD08cnVtHxpSspbicNTXp5UHodZM2PRbbsheFrLoKIJdYRO/hDT/ScMegeJP15HvMKR6Yoxv60KWkgK0EerRDSVpfBfdsiNqGHS9FpAP82W4yyMyLIj7Cdqb73zngVhV78DDb3TErGaoa10kygJEebJx43dctYiw08Xd2JA83EDqtKX+dS+Uc+zTD4HLBsg1zv0X36tgnk5r3K1Ke07AWsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYc3Auc3ByYWtvY2hmb2xrbWlubmVuLnNlMB0GA1UdDgQWBBQPlGQtSXDteRMPpBDLmU/PSOLrrzANBgkqhkiG9w0BAQUFAAOCAQEABYm8hbubDEhnCg+HqSzfvJIpXPylfDztNw8WG+19xfcMSVy6A1g7i4JYN8mCj0VwF6gViCf4ABxpAvP0t/JLN/z+aHVRphnFOpdGYBEClnRjUK5N0FIyHfnhiPN6Trfn7k4yBdlw3rZCd57JGRtWgWz6YY/yN/kSrdCnfpL4nDpSevilADGqdjtIVqi6d9K+FHzsCuGiF2OZ5VtXguXL7hySJwd3xscZcqJB3HeOpn15wQN5Zavg1mKQWq+URQVYrIZXc9E/jt0znOXen8E1306cyCo4Z0PXSSuP/sqtGr/tcf9DDWE0as48anZ3k8ntfrsLVEnBIEmATs/uIl7D3A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJALSgVaAtkpyyMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGHNwLnNwcmFrb2NoZm9sa21pbm5lbi5zZTAeFw0xOTA3MTYxNDE0NDBaFw0yOTA3MTMxNDE0NDBaMCMxITAfBgNVBAMTGHNwLnNwcmFrb2NoZm9sa21pbm5lbi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJFmCxfK2ApdO44DOxoSLsuUrati1I1i83kNwpjaai7LNhr993Xrz2VvwatAnsStSuKEkJPjVoLuhwtmGPU7OlseNU4i8v//4REDtJVeJLmI+VSgLxCB3bobtolq0JUOSD08cnVtHxpSspbicNTXp5UHodZM2PRbbsheFrLoKIJdYRO/hDT/ScMegeJP15HvMKR6Yoxv60KWkgK0EerRDSVpfBfdsiNqGHS9FpAP82W4yyMyLIj7Cdqb73zngVhV78DDb3TErGaoa10kygJEebJx43dctYiw08Xd2JA83EDqtKX+dS+Uc+zTD4HLBsg1zv0X36tgnk5r3K1Ke07AWsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYc3Auc3ByYWtvY2hmb2xrbWlubmVuLnNlMB0GA1UdDgQWBBQPlGQtSXDteRMPpBDLmU/PSOLrrzANBgkqhkiG9w0BAQUFAAOCAQEABYm8hbubDEhnCg+HqSzfvJIpXPylfDztNw8WG+19xfcMSVy6A1g7i4JYN8mCj0VwF6gViCf4ABxpAvP0t/JLN/z+aHVRphnFOpdGYBEClnRjUK5N0FIyHfnhiPN6Trfn7k4yBdlw3rZCd57JGRtWgWz6YY/yN/kSrdCnfpL4nDpSevilADGqdjtIVqi6d9K+FHzsCuGiF2OZ5VtXguXL7hySJwd3xscZcqJB3HeOpn15wQN5Zavg1mKQWq+URQVYrIZXc9E/jt0znOXen8E1306cyCo4Z0PXSSuP/sqtGr/tcf9DDWE0as48anZ3k8ntfrsLVEnBIEmATs/uIl7D3A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.sprakochfolkminnen.se/simplesaml/module.php/saml/sp/saml2-logout.php/federated"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.sprakochfolkminnen.se/simplesaml/module.php/saml/sp/saml2-acs.php/federated" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.sprakochfolkminnen.se/simplesaml/module.php/saml/sp/saml1-acs.php/federated" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sprakochfolkminnen.se/simplesaml/module.php/saml/sp/saml2-acs.php/federated" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.sprakochfolkminnen.se/simplesaml/module.php/saml/sp/saml1-acs.php/federated/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute for Language and Folklore</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Institutet för språk och folkminnen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute for Language and Folklore</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Institutet för språk och folkminnen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.sprakochfolkminnen.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.sprakochfolkminnen.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Magnus</md:GivenName>
-    <md:SurName>Ahltorp</md:SurName>
-    <md:EmailAddress>mailto:magnus.ahltorp@sprakochfolkminnen.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml b/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
deleted file mode 100644
index 4f5f2208..00000000
--- a/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://staging-us.cloudmore.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-08T11:09:44Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging-us.cloudmore.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="300" width="300">https://us.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://web.cloudmore.com/privacy/cloudmore-data-processing-terms</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>cmpusfe01.cmp-us.cloudmore.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cmpusfe01.cmp-us.cloudmore.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEITCCAomgAwIBAgIJAKyL/KWR/DdqMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
-BAMTHmNtcHVzZmUwMS5jbXAtdXMuY2xvdWRtb3JlLm5ldDAeFw0xNzA0MDMxMTUy
-MzhaFw0yNzA0MDExMTUyMzhaMCkxJzAlBgNVBAMTHmNtcHVzZmUwMS5jbXAtdXMu
-Y2xvdWRtb3JlLm5ldDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALLz
-RYrrIiv11E8u5ivDKbk8CiAchunwwbzApbg9Gbf03qv+MlWI/TizbB4U78qmUQQo
-rBbrxhxHCG6zh7jmCGrKI525JC/Ggq8eLh5scsReS+h+3dP4OLITYX255AxBXsnf
-puHztUqgmvJalxTqv3ZSj+sgL1Gg9miffZU9Qp+PJTDnvFqryyF5RdtYsM8hl1Hs
-gTgkqq1CfNwjAX+K3KPuaXeI13wX5O5XgLy3GL6AvNcjzR7OK6WRVMzusFV5GDkv
-HDmW1SKPOiwVpEajJFG9ALqYpRcVHWLFC9PbY35aElJppKwI+lOc9+gKoe72Pfzy
-NWktXwcCOQFrKTC+OkdocKD9qU0Ykb5a6jxSke/OqCDXZIDNMtcwkaNq2EVQHQ5l
-m5FSX+7aHkovpZ1EldKeN7bbAHR4vbAHu/TzItw2FTqxIIJ3Dhro+cDxHvt2PkVe
-lHi6FnRKEWD/eKuBa4HYi6wNyPJL5DuTWSa9b6EIHcEAEObx/cLCcO5JyrYCPwID
-AQABo0wwSjApBgNVHREEIjAggh5jbXB1c2ZlMDEuY21wLXVzLmNsb3VkbW9yZS5u
-ZXQwHQYDVR0OBBYEFCIqTffYDcKPd0MsT7uJPMPSdFXBMA0GCSqGSIb3DQEBCwUA
-A4IBgQA6x3KG35Lo6+WdDiHc6jItmA3NVtwEa7yP65+e58eDsFwkcZKMpriKT1j6
-oAQLCo9gm90iTMB6Bp3w49Ugff1ZWp8XQDkS5XATB8kuefdclzT8e0l7AZY3XHVP
-wAzc9xIx8fPDzX7EaQWdUKag+xhC3KarIM+fxIi2bpTl/dmqMlfZXnqYD7xwn/d5
-YL+WaojEcT+bAjwBENRveVJzE8F2zP9XWoac+Kq5m+bpUk4mbdsiyopM+JyQbv0v
-LbdC4ymC3I3g7UWdnrOVIxvAmpZSvfcrltBcq3YUYbNUqN0JBi3yp+vM3YC/Wy5z
-1u9OtZv4XRHYhc4MWrHdpQQ9XmM2fP2Z3IUDD6wrt/oD0bsyZikfS+vQyeWKxVpR
-mNH2YgIOVvKd7FdBOG/Azmal9DDVIRBVT71v/UOR3iQKLemFIKbYeLAlDE3bruDF
-pyWYJhS1xRUZKLOk/yUKNAXBGehk9HjEibygik5sJkYKQ4lVNXyXq06saSeR/Sf0
-LAkq68U=
-</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://staging-us.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Cloudmore</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 07e4b786..00000000
--- a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://stats.inacademia.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-10-04T09:12:52Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">InAcademia stats portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The stats portal for InAcademia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://inacademia.org</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://inacademia.org/privacy-and-data-protection/</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="en">inacademia affiliation+validation</mdui:Keywords>
-        <mdui:Logo width="280" height="72" xml:lang="en">https://inacademia.org/wp-content/uploads/2017/02/inacademia_logo.jpg</mdui:Logo>
-        <mdui:DisplayName xml:lang="sv">InAcademia stats portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">The stats portal for InAcademia</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://inacademia.org</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://inacademia.org/privacy-and-data-protection/</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">inacademia affiliation+validation</mdui:Keywords>
-        <mdui:Logo width="280" height="72" xml:lang="sv">https://inacademia.org/wp-content/uploads/2017/02/inacademia_logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAJaFV40ZWU9XMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzAeFw0xOTA5MjgxMzA1MzNaFw0yOTA5MjUxMzA1MzNaMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6lTNVNJ8FF5/4NR93E8xSPtKWF5mNMnxIBkukS0elZOhRWzR2FetfHG/9vovbwfCKLn0+pSs/o3Gj9nceVbCbZN5oA7WyI02BOVTf2GVcQ5HADBPdPJWsduatmYxxTb5MOTgld1f9gjGxO4s6yhO7RWXfE/NVNLJWR0wEQp8xnTVRarrgDJFRMJqQ+8Ezkr2oHpjUAPoZSmLKm7t7/QR/ekHsfLZr0lWmi4TaIps3SspyNo9ty4s6AZFX7BvzQ4PRByqxZTYXwrzuT41dN3D2gXSG0oRJB9YrrTy8dWBZXADNKhtpSkZiril3g0j7lCiZ+yIkiVkzZ9ew7j11vV38CAwEAAaNQME4wHQYDVR0OBBYEFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMB8GA1UdIwQYMBaAFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAI3BIeABs8IIWBkI3uevKVc2zsScAmJgwq89k6iApTAvt233a7u9X7V8jXJ3dmXWxWm18J7HxIqK9r/s+TXF9rCTsjUptycIKzlLqBDkHKDIebNFPSoFLcIE3yy6d5OVdnwzZRXywi2cbwpWZy5ap+nFH0ObhN1WpH3zCK38ylJmQ2DQ/n2oim8B43dxHtQ9pjy71jHEcK5qeKee2mCUx+sVtnJmae66QLGg4FBhOb39/AvRd+/lH5Y1Fs8D2ukxNhvl2MyifIRu68GM0SOyp+DiktlBJ+lgVtIJU9Fckd7YH9BhDlRvhJ0blNuZgaqTZMTBds8isVTOLLhB8N11v8I=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAJaFV40ZWU9XMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzAeFw0xOTA5MjgxMzA1MzNaFw0yOTA5MjUxMzA1MzNaMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6lTNVNJ8FF5/4NR93E8xSPtKWF5mNMnxIBkukS0elZOhRWzR2FetfHG/9vovbwfCKLn0+pSs/o3Gj9nceVbCbZN5oA7WyI02BOVTf2GVcQ5HADBPdPJWsduatmYxxTb5MOTgld1f9gjGxO4s6yhO7RWXfE/NVNLJWR0wEQp8xnTVRarrgDJFRMJqQ+8Ezkr2oHpjUAPoZSmLKm7t7/QR/ekHsfLZr0lWmi4TaIps3SspyNo9ty4s6AZFX7BvzQ4PRByqxZTYXwrzuT41dN3D2gXSG0oRJB9YrrTy8dWBZXADNKhtpSkZiril3g0j7lCiZ+yIkiVkzZ9ew7j11vV38CAwEAAaNQME4wHQYDVR0OBBYEFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMB8GA1UdIwQYMBaAFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAI3BIeABs8IIWBkI3uevKVc2zsScAmJgwq89k6iApTAvt233a7u9X7V8jXJ3dmXWxWm18J7HxIqK9r/s+TXF9rCTsjUptycIKzlLqBDkHKDIebNFPSoFLcIE3yy6d5OVdnwzZRXywi2cbwpWZy5ap+nFH0ObhN1WpH3zCK38ylJmQ2DQ/n2oim8B43dxHtQ9pjy71jHEcK5qeKee2mCUx+sVtnJmae66QLGg4FBhOb39/AvRd+/lH5Y1Fs8D2ukxNhvl2MyifIRu68GM0SOyp+DiktlBJ+lgVtIJU9Fckd7YH9BhDlRvhJ0blNuZgaqTZMTBds8isVTOLLhB8N11v8I=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">InAcademia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">InAcademia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://inacademia.org</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://inacademia.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>InAcademia</md:GivenName>
-    <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>InAcademia</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>InAcademia Technical Support</md:GivenName>
-    <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>InAcademia Technical Support</md:GivenName>
-    <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 684715a9..00000000
--- a/swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-09-21T16:36:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">InAcademia stats qa-portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The stats qa-portal for InAcademia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://inacademia.org</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://inacademia.org/privacy-and-data-protection/</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="en">inacademia affiliation+validation</mdui:Keywords>
-        <mdui:Logo width="280" height="72" xml:lang="en">https://inacademia.org/wp-content/uploads/2017/02/inacademia_logo.jpg</mdui:Logo>
-        <mdui:DisplayName xml:lang="sv">InAcademia stats qa-portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">The stats qa-portal for InAcademia</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://inacademia.org</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://inacademia.org/privacy-and-data-protection/</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">inacademia affiliation+validation</mdui:Keywords>
-        <mdui:Logo width="280" height="72" xml:lang="sv">https://inacademia.org/wp-content/uploads/2017/02/inacademia_logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAJaFV40ZWU9XMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzAeFw0xOTA5MjgxMzA1MzNaFw0yOTA5MjUxMzA1MzNaMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6lTNVNJ8FF5/4NR93E8xSPtKWF5mNMnxIBkukS0elZOhRWzR2FetfHG/9vovbwfCKLn0+pSs/o3Gj9nceVbCbZN5oA7WyI02BOVTf2GVcQ5HADBPdPJWsduatmYxxTb5MOTgld1f9gjGxO4s6yhO7RWXfE/NVNLJWR0wEQp8xnTVRarrgDJFRMJqQ+8Ezkr2oHpjUAPoZSmLKm7t7/QR/ekHsfLZr0lWmi4TaIps3SspyNo9ty4s6AZFX7BvzQ4PRByqxZTYXwrzuT41dN3D2gXSG0oRJB9YrrTy8dWBZXADNKhtpSkZiril3g0j7lCiZ+yIkiVkzZ9ew7j11vV38CAwEAAaNQME4wHQYDVR0OBBYEFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMB8GA1UdIwQYMBaAFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAI3BIeABs8IIWBkI3uevKVc2zsScAmJgwq89k6iApTAvt233a7u9X7V8jXJ3dmXWxWm18J7HxIqK9r/s+TXF9rCTsjUptycIKzlLqBDkHKDIebNFPSoFLcIE3yy6d5OVdnwzZRXywi2cbwpWZy5ap+nFH0ObhN1WpH3zCK38ylJmQ2DQ/n2oim8B43dxHtQ9pjy71jHEcK5qeKee2mCUx+sVtnJmae66QLGg4FBhOb39/AvRd+/lH5Y1Fs8D2ukxNhvl2MyifIRu68GM0SOyp+DiktlBJ+lgVtIJU9Fckd7YH9BhDlRvhJ0blNuZgaqTZMTBds8isVTOLLhB8N11v8I=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAJaFV40ZWU9XMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzAeFw0xOTA5MjgxMzA1MzNaFw0yOTA5MjUxMzA1MzNaMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6lTNVNJ8FF5/4NR93E8xSPtKWF5mNMnxIBkukS0elZOhRWzR2FetfHG/9vovbwfCKLn0+pSs/o3Gj9nceVbCbZN5oA7WyI02BOVTf2GVcQ5HADBPdPJWsduatmYxxTb5MOTgld1f9gjGxO4s6yhO7RWXfE/NVNLJWR0wEQp8xnTVRarrgDJFRMJqQ+8Ezkr2oHpjUAPoZSmLKm7t7/QR/ekHsfLZr0lWmi4TaIps3SspyNo9ty4s6AZFX7BvzQ4PRByqxZTYXwrzuT41dN3D2gXSG0oRJB9YrrTy8dWBZXADNKhtpSkZiril3g0j7lCiZ+yIkiVkzZ9ew7j11vV38CAwEAAaNQME4wHQYDVR0OBBYEFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMB8GA1UdIwQYMBaAFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAI3BIeABs8IIWBkI3uevKVc2zsScAmJgwq89k6iApTAvt233a7u9X7V8jXJ3dmXWxWm18J7HxIqK9r/s+TXF9rCTsjUptycIKzlLqBDkHKDIebNFPSoFLcIE3yy6d5OVdnwzZRXywi2cbwpWZy5ap+nFH0ObhN1WpH3zCK38ylJmQ2DQ/n2oim8B43dxHtQ9pjy71jHEcK5qeKee2mCUx+sVtnJmae66QLGg4FBhOb39/AvRd+/lH5Y1Fs8D2ukxNhvl2MyifIRu68GM0SOyp+DiktlBJ+lgVtIJU9Fckd7YH9BhDlRvhJ0blNuZgaqTZMTBds8isVTOLLhB8N11v8I=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">InAcademia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">InAcademia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://inacademia.org</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://inacademia.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>InAcademia</md:GivenName>
-    <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>InAcademia</md:GivenName>
-    <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>InAcademia Technical Support</md:GivenName>
-    <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>InAcademia Technical Support</md:GivenName>
-    <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml b/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
deleted file mode 100644
index 6a5e304b..00000000
--- a/swamid-2.0/stipendier-test.its.uu.se-stipendium.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://stipendier-test.its.uu.se/stipendium">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-10T09:08:30Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">Stipendiehantering (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Scholarship (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">System (TEST) som hanterar stipendium vid Uppsala universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Scholarship (TEST) management system at Uppsala University</mdui:Description>
-        <mdui:Logo xml:lang="en" height="125" width="125">https://stipendier-test.its.uu.se/stipendium/img/UU-logga_125x125.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="125" width="125">https://stipendier-test.its.uu.se/stipendium/img/UU-logga_125x125.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://stipendier-test.its.uu.se/stipendium/stipac/login</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://stipendier-test.its.uu.se/stipendium/stipac/login?lang=en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://uu.se/hittastipendier/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://uu.se/en/findscholarships/processing-of-personal-data</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDYzCCAkugAwIBAgIEfScBOzANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJzZTEQMA4GA1UE
-						CBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMCVVUxCzAJBgNVBAsTAklUMRUw
-						EwYDVQQDEwxUb21teSBTdGVudmkwHhcNMTcwMzAzMDcwMDA3WhcNMzcwMjI2MDcwMDA3WjBiMQsw
-						CQYDVQQGEwJzZTEQMA4GA1UECBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMC
-						VVUxCzAJBgNVBAsTAklUMRUwEwYDVQQDEwxUb21teSBTdGVudmkwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQCcxAvJuFC8orIPNpsam9iXZJekHs2dSmDd/ex50A0vf3l60cpkxg3cAMcR
-						EH5Bk+h9PSO0eRjj7pzPFE1Ok0MQEsmCljXQPcMfOOXGAD6g+cR3ZyLqiZ7k8/oog5G+S5HFAY+4
-						7y6loEkYsJ1iLTPhgBLeoWjFP2T8S67l5WSHAeeUVEyeXfodxGA4zee3w3V9XtaNc/ldiEZnF905
-						dITQX4D5gew3Tb9ezP79+GrHQwv3Q3xWjU4EILJ6uGFcBhO0fbj7hS7GGvmzMgI9vyq10xVdUAY6
-						kFpwwnfFiJm3gkusTvluuWnyscA3RTzrNab290jrXzHQQcP1AoeA/WdjAgMBAAGjITAfMB0GA1Ud
-						DgQWBBTCDLvl0/fpImvNkS9Wsg1fZ+fu1jANBgkqhkiG9w0BAQsFAAOCAQEAHXbUQzYX7q5tE7f6
-						VuU2YtI+XFOBdrw4SE1uDcd1XeWMcBsMvcEFbeWrwhYdVlv9+ni1A3/pGgy6Do9EvJfu79Jj6QgQ
-						GdbL+RJ/8oBt09w+zGJ00m86g5JpN5l19CIi+yIVBGL1v+aK6c3AHC+9y8f2965mHk/YZknIw1xR
-						1EXQ1/KXwlHzvBpEU3EfWRxhZ+B66zWHfekr659A3T5wCUpPWrzVCTaXh2ZNEBY95bGhuECZnVVY
-						yRw902t0AGgUk9jhJ83aMPdrSk3IZTFa5YOC9OQcwJ6nfAGXNgsn/taFleA8+GaIBwhKF95s8h1J
-						l+6u+L3FBjFOWmy9EQZdyA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SingleLogout/alias/defaultAlias"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SingleLogout/alias/defaultAlias"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <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:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="1"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Stipendiehantering (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Scholarship (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Stipendiekansliet</md:SurName>
-    <md:EmailAddress>mailto:stipendiekansliet@uadm.uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714750</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Stipendiekansliet</md:SurName>
-    <md:EmailAddress>mailto:stipendiekansliet@uadm.uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714750</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/stipendier-utv.its.uu.se-stipendium.xml b/swamid-2.0/stipendier-utv.its.uu.se-stipendium.xml
deleted file mode 100644
index cf0d2f5a..00000000
--- a/swamid-2.0/stipendier-utv.its.uu.se-stipendium.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://stipendier-utv.its.uu.se/stipendium">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-16T14:49:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">Stipendiehantering (UTV)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Scholarship (DEV)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">System (UTV) för att söka och hantera stipendium vid Uppsala universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Scholarship (DEV) management system at Uppsala University</mdui:Description>
-        <mdui:Logo xml:lang="en" height="125" width="125">https://stipendier-utv.its.uu.se/stipendium/img/UU-logga_125x125.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="125" width="125">https://stipendier-utv.its.uu.se/stipendium/img/UU-logga_125x125.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://stipendier-utv.its.uu.se/stipendium/stipac/login</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://stipendier-utv.its.uu.se/stipendium/stipac/login?lang=en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://uu.se/hittastipendier/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://uu.se/en/findscholarships/processing-of-personal-data</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDYzCCAkugAwIBAgIEfScBOzANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJzZTEQMA4GA1UE
-						CBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMCVVUxCzAJBgNVBAsTAklUMRUw
-						EwYDVQQDEwxUb21teSBTdGVudmkwHhcNMTcwMzAzMDcwMDA3WhcNMzcwMjI2MDcwMDA3WjBiMQsw
-						CQYDVQQGEwJzZTEQMA4GA1UECBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMC
-						VVUxCzAJBgNVBAsTAklUMRUwEwYDVQQDEwxUb21teSBTdGVudmkwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQCcxAvJuFC8orIPNpsam9iXZJekHs2dSmDd/ex50A0vf3l60cpkxg3cAMcR
-						EH5Bk+h9PSO0eRjj7pzPFE1Ok0MQEsmCljXQPcMfOOXGAD6g+cR3ZyLqiZ7k8/oog5G+S5HFAY+4
-						7y6loEkYsJ1iLTPhgBLeoWjFP2T8S67l5WSHAeeUVEyeXfodxGA4zee3w3V9XtaNc/ldiEZnF905
-						dITQX4D5gew3Tb9ezP79+GrHQwv3Q3xWjU4EILJ6uGFcBhO0fbj7hS7GGvmzMgI9vyq10xVdUAY6
-						kFpwwnfFiJm3gkusTvluuWnyscA3RTzrNab290jrXzHQQcP1AoeA/WdjAgMBAAGjITAfMB0GA1Ud
-						DgQWBBTCDLvl0/fpImvNkS9Wsg1fZ+fu1jANBgkqhkiG9w0BAQsFAAOCAQEAHXbUQzYX7q5tE7f6
-						VuU2YtI+XFOBdrw4SE1uDcd1XeWMcBsMvcEFbeWrwhYdVlv9+ni1A3/pGgy6Do9EvJfu79Jj6QgQ
-						GdbL+RJ/8oBt09w+zGJ00m86g5JpN5l19CIi+yIVBGL1v+aK6c3AHC+9y8f2965mHk/YZknIw1xR
-						1EXQ1/KXwlHzvBpEU3EfWRxhZ+B66zWHfekr659A3T5wCUpPWrzVCTaXh2ZNEBY95bGhuECZnVVY
-						yRw902t0AGgUk9jhJ83aMPdrSk3IZTFa5YOC9OQcwJ6nfAGXNgsn/taFleA8+GaIBwhKF95s8h1J
-						l+6u+L3FBjFOWmy9EQZdyA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier-utv.its.uu.se:443/stipendium/saml/SingleLogout/alias/defaultAlias"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stipendier-utv.its.uu.se:443/stipendium/saml/SingleLogout/alias/defaultAlias"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <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:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier-utv.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stipendier-utv.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="1"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Stipendiehantering (UTV)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Scholarship (DEV)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Stipendiekansliet</md:SurName>
-    <md:EmailAddress>mailto:stipendiekansliet@uadm.uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714750</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Stipendiekansliet</md:SurName>
-    <md:EmailAddress>mailto:stipendiekansliet@uadm.uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714750</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sts.mah.se-adfs-services-trust.xml b/swamid-2.0/sts.mah.se-adfs-services-trust.xml
deleted file mode 100644
index 5f343f48..00000000
--- a/swamid-2.0/sts.mah.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://sts.mah.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-09-02T13:28:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/hide-from-discovery</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://saml-error.mau.se/ERRORURL_CODE.html">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">mau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Identity Services for Malmö University</mdui:Description>
-        <mdui:Logo xml:lang="en" height="163" width="56">https://cdn.mah.se/images/header/en/mau-logo.svg</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Malmö University (MFA)</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="en">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:Description xml:lang="sv">Identity Services för Malmö universitet</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Malmö universitet (MFA)</mdui:DisplayName>
-        <mdui:Keywords xml:lang="sv">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:Logo xml:lang="sv" height="163" width="56">https://cdn.mah.se/images/header/sv/mau-logo.svg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/sv_SE/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>mah.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.6087954,12.9945611</mdui:GeolocationHint>
-        <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
-        <mdui:DomainHint>mau.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQcA5gDLu8VZ1COPzEZZi6BzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBzdHMubWFoLnNlMB4XDTIyMDIyMzIzNDYwNVoXDTI1MDIyMjIzNDYwNVowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gc3RzLm1haC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN/0klk8MVKAv8JZhI+l2OX46yYhIZlHJRtHVAAMtrqSlew657BKku8t6mkBh7GdvCNh4rqJaHy+rbzTOV54wJb43DRDkOfdHZ63zY0/rpx4bwQYCOp8dwlJn+zPirgHhdfhZGIveLyC2wJwvYXs+Fuuy6aJGB2Trlcm7ZfmQrTEYXWaQRUFGMK26fteT6YtjLV7s6pRdalkH7NjbT5lv00fe5tgek/5cVgh6TZ/A1HoLcsJ5SEdhqdyKQ1N4qgq2kHp1ryhnjJrjkbkmk6u7Mjz/5W4F7PuYuHBn/TD/fh/GjIpIrfUwYD8Gxdz7o0J785m8KHZ0JwDKYz00rwHqBECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAfHpLUoE9bbRSIUXG0z0eBmebHuYIE+pcFAaOerOXGrS7EjH0ShXzHxkX+AvtPgTHZS4QE1stskn5gbXLorz7rfMc+WUZLDPhbNu5JXlj7KuKHSCLiUvfBm5oUhgLJDvvONh0cPsIIw5UCMm7SFmnz35iCTao3HzDy8P0ayfvpn36RrLQ35mTRhy4zL2PmUOIxzbhIRM9C3EQpzNf+x3v7D0t0lJod32haRl4JoHCKGDQp4i5ZIubax/7LLz/MrsUF2c2GdiDxB79qKfn26rJNzeRmzsUmi+X+4yGTr+8+HFaiwdrH+14j+jQWtKMjK/ZfekMbo1wuZJBjfd+8e+aFw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQfVWTDvmP0adLdw5YeJv6DzANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBzdHMubWFoLnNlMB4XDTIyMDIyMzIzNDYwNloXDTI1MDIyMjIzNDYwNlowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gc3RzLm1haC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4oyq4oh9PvoBsjxBmOWtH7G8KoNvQiFuWBQao6EBfw9n3NbOqZYkKMDFI+QzidmNd0A5de7YRiWKWHrlkvFnBJbx5pAcgAYCIt+w7fO0OJrFng7LU5DC4or3rUsy0SpYmMoA1xulR+WEor+hZKHcvDJb8Yk24UmhGkrrbLZR6pDZ/H0jBiuGEOQfV6diTh25r3KtSljOLvSBzMWGB0HPn2dw4KxUOODJRuJpB40r4v4+VmCCrvCM04ntVNTMpODqIOXu3fl7RQM+32VNCAqUgwfuv1l7biQTf3vcRR0FVizMhT0sq9hZrG4RSgU+kHa93ckUF/r/vKcY2vwtkcHCkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA0eGwqAFsdMLeEsxDPufOQB4wRoyGlHvksNUylaf41ysEK2/RClHMsIsaihBfyGL++Q9pvUp9B4gB15SuUzTEWe8ptYlPBSV2rWzSkBQv5R5fsMQxouOz98VE00n89EwbET4V9epeBC72+B7gJ2kpPjpA/CSGatXAgH9ZULmVASk9Y2nhyMb4hBRwoMSCBAgbPqLp1/OmEgipb572B3ybHh6/1lviXAhNZQa8L3lmr8ls1PjE2TeJNJrBCRBBoUzWCDgRW/6KxIPhJ2C4M6ea+Toz918+eF9bWtbSa4huVye6rtbWxdZgM0+kh9yQ4PmBKengfEbksKj1SlfO/6ntQA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.mah.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.mah.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.mah.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.mah.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Malmö University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Malmö universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Malmö University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Malmö universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.mau.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.mau.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:support@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Malmö universitet</md:Company>
-    <md:GivenName>IT Drift</md:GivenName>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sts.mau.se-adfs-services-trust.xml b/swamid-2.0/sts.mau.se-adfs-services-trust.xml
deleted file mode 100644
index 298ac702..00000000
--- a/swamid-2.0/sts.mau.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://sts.mau.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-10-27T11:09:37Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://saml-error.mau.se/ERRORURL_CODE.html">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">mau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Identity Services for Malmö University</mdui:Description>
-        <mdui:Description xml:lang="sv">Identity Services för Malmö universitet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Malmö University - MFA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Malmö universitet - MFA</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/sv_SE/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="163" width="56">https://cdn.mah.se/images/header/en/mau-logo.svg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="163" width="56">https://cdn.mah.se/images/header/sv/mau-logo.svg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>mah.se</mdui:DomainHint>
-        <mdui:DomainHint>mau.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.6087954,12.9945611</mdui:GeolocationHint>
-        <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE1jCCAr6gAwIBAgIQTJ0dg0LCUYRDgMhUK6Za8TANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBzdHMubWF1LnNlMB4XDTIyMTAxNDA5MTE1M1oXDTI1MTAxMzA5MTE1M1owJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gc3RzLm1hdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAO0BKPTVjdZ3j/rmYB67X9ilvbEDD/+Rd2e/68gR3SbM3lA1Ynt7dPyuP0Iepit3fg2DfDweJf8FAkhLsoerO1KBUNn6UKmr3Fsc7g8J5deadSUhoYeCXA8G7n2zVwI5Ui9RsPzhncQ4VaP4CoUJy0BoC1DesDiTzFx3F1T4g/yXFMTzyq22RK0RqiqM3f4Apo0uk7HIYyVdrf2ZARS4a8qVjRxknUrWPgNV96fxGQ/kyDr6laYzdyZt9a4svJlWxnc4M86AQCuwqDv+kgxEIPbPHfvh/46OqfXBMsTEA6anugJLTnIxSN+wx3+pBA8tKCzqWdLcrxIdqMwfrtxLxvS5Q7K5geZrWNvMlLeFSasPd7xMNZ6f5gypiqbsYa8F4ezXMp9DP9Xu2GaQY9XWKVn7eDJ3WGDJt1c14FnkNZdL4/2ESGe/9oLVomF6UqZRfEEBIXY6xOOscKn9FbIUYxJpCk/VBLLhxvEZz3cGBy29qswwiIcPNdniqX9oQghDMoqYQoprUi4nlI2inlDYqLjh+NurjXzXsY3swWc+ePgzXWTqfzQM41p0FcuaKUDSEu3nkl58fQ+Z41PEwgKRm+5HA94uFuocXicJVtNQzYpqaMFt/odAGKcoOtpu+84yBKQjCool37xg5Mf2ZaqIWJuOodQur19Gsb2ajT8ww111AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAGfCbYjkthJXgcishbCUfE688/sCcG0/gQHGedAKcWAYoJwfJjcwKOszn6ZIjaQbDmCGmUuJTAc7FMTnabxNcFlzx6LNtJO6llb2eHQDt5z41qOT/KH0GuqyZxTcW69l8Jk5vI5OujXagpFIFvTVoage7KGuNZUvi3ykFiPmPdx0pBGybXnvfKAUhDYgeHkTNxSiW5jZy6nSOYdL4L8ZI8uYU34YztCtC7PM5QbPg/oWt3QBWtt/YF+OkL6DH2mpLzoDm//EipRM1aW3Ct/Fu07WBppg4xDnbEH8Sa6TZg8qh2Ap2jSqEQizCuXk/O7HeoXv7w0u6PRUmqMTxnvtpsw/SR7dMPHYEIz8FlpbWdwL0po+D9UCSMKQqYexnoqjtm2bumv2QaVCKVjFCXyYSnF0oX3Ea29nBnWgBEzU/3hXvvdrsWdXFDTY98QTVxPujXMyykAiW1bqUjJ6rjgXA6wK7XBMBufAUQFcIBrZ3eg5PNyd9Nxw/GS2Z5W9cqrvX4LFr0ycQgzHAiSHtR0fBO02FyBLmEuzt2+gU+QMdYDOODGHdd91ZQokR3kjFRsCULyA389+H6ONGF1FTa1NvR3CPk/NPcR1mvhNQtydkinLCq7Vy93+5iX7mgbesUuB65g0GVEmLhr57Whd5SuSvMorFOJvtKNtgG3BL7GCzaBj</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE0DCCArigAwIBAgIQYM1SyQp5BbdI84LKUY9BMDANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBzdHMubWF1LnNlMB4XDTIyMTAxNDA5MTE1N1oXDTI1MTAxMzA5MTE1N1owJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gc3RzLm1hdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALWaY3BOZvsjuQIfqvm5sBPz1AjYnykUGNQS2PWzR088Ec4GxwoIBeCrzhT5F6px/ea5d4I1q952qFKSeNasL6GaMkLalDBa/DydNUrnrmFDxKPzuQ4dqBbVKbZGVUhKW3ETm/Oaf8Np39boCOzU/WWrELA+zxSzjWCf9p6rAq5roxG4Us0/IDoUHNo3kJax46aerg5AgHV6tOj34+mwneHi7W0Ygfl+7ZTyVT9CVDE256MttXd0LjxPZrg4WIhEyP9XoKowYtP+32zAcAGEogizdNYvN33XSAORJnUiu/pMeStCmA0fTsFV2QUYw3+Y8HkxCgVNU4gm0hcNmXzU7yYhZK50Y1Ef5E53LH4w+aloCEwcW6lm//SpYeH4iPmLzabPA9X8EEdbo39s01aQk1Z6YapRoOJ6DlxZ+SO1A5BxopheHaZpJqhehv4o/TZ7wvvu/TtgNl8QImejcIbj3D07BxuaJ1pdGRmmGnPJWI2ViU8RwlYHWgZrO2CfakBA4yQc0hKL6+0ucJIowbTZchs3hcgxFrrz8rgnTwxREAtX26RdzM+yhn0L2sOggCCM4xI7/hngVd8RW4QOA/jjRSn05o9pQFqFAGNiEniHfc6GEv6U1qhvYMm4QB4jQmlwB1lU1sjk6HslabahMpIfBV68aZNMaUWeq1ZY6BgDIB09AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAIB2GMbYJxgsAMuZaX/JX1YWuOyuRdvDD/xorkKPD1cNWVyz0pX1dprlS/M4NUjhI4+57UUZ57j7A/dZLv1zdaY3iBC+t5uVTWpVlqKDZe+9CkGKezd29sRr6e30Mu3GDAWER22EYnLmpOfi01fHKMHr/ZfMzpdPT/b6nx4Ln4g9gjDulf2Uq9awIPsmQnTvvhnRyQct0Dh1iB15YEgU2tKlq4nRciWsV04RRAtGISEDRJ0R7talOa89UTMaiuNHBsvkZth08BbW7ia78mK1psb100wl7AtnsKbDP7xkJpGPO1ajkj5n29ZXlhqFIj61gSDnUJ4+I3b7V2dY15jeFR7F7/3ZDHt1JCnTRVueaYIsEya6al/ghNLIu5/DeP8AHQS2MpKWJvciI8TqedmN9FZi7jTdknu55ECjQsxKxi5ufwvS4CL10+oe3oBQ2pGHMP+lnKj8MBfbV+hbkvF6R7NlxJPSx6JvKrlLb20gLAaXrzgvxg/cn5+7eB1+nmTS5lRhuEcrHtcCCedKeytqMlA+ERVgkbrW2ZiJAlgD120c2WYuF1AR2T64C4Px5rejL3g/seUzNqurFeltOBjvLmSN42lnporHEkyyQTyzxl5t0urC49UPOOj9kBomRzPwKOuQkoBk39EBxhosQgMAmgifXvLBya3HCE8cMAGKC+9s</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sts.mau.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.mau.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.mau.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.mau.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.mau.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Malmö University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Malmö universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Malmö University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Malmö universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.mau.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.mau.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:support@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Malmö universitet</md:Company>
-    <md:GivenName>IT Drift</md:GivenName>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/stslab.mah.se-adfs-services-trust.xml b/swamid-2.0/stslab.mah.se-adfs-services-trust.xml
deleted file mode 100644
index be8157fd..00000000
--- a/swamid-2.0/stslab.mah.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://stslab.mah.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-20T09:23:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://stslab.mah.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mah.se (regexp="false")</shibmd:Scope>
-      <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Test Identity Provider for Malmö university</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Malmö university</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="163" width="56">https://cdn.mah.se/images/header/en/mau-logo.svg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="163" width="56">https://cdn.mah.se/images/header/sv/mau-logo.svg</mdui:Logo>
-        <mdui:DisplayName xml:lang="sv">Test Identity Provider för Malmö universitet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Malmö universitet</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/sv_SE/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>mah.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.6087954,12.9945611</mdui:GeolocationHint>
-        <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQW0dvhIGI9LlEjyE4QH+rTDANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBzdHNsYWIubWFoLnNlMB4XDTIyMDUxMDEwNTYxM1oXDTI1MDUwOTEwNTYxM1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gc3RzbGFiLm1haC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMaS0WkRq0kUwWAUMtKMLYUw6kwNlpTyJfjn/Xs64oSMsUyN59V3UHF42Ane1x6ZVACF/ctxMeFhLMh8Uj/cCfecHIbvSOgmajuVwe5usgYCUErNhRaoX38xsYnoEaOBLT4bQRq4xm3mNakNzO4KPVzJ/ybyaUOfDKFkpx4ZO1a6wsGXcVxp5UAABg2Q3Ll9/dQAZUbywwElhtuB/J4kRbVxXejAIwqDWTP68wIwIPbjFaSUT8BmhjPwBnGMkQTf6xgv9Aq7N1h2m2k1GPN62WwjaYlQt2r/ROkplNj1bu+7z13sI0ReqmjHpozmKqi50O9igaP9PPEJFMrA/CFFIaUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAuxW4Kgg51WWiT1tZAK8CAzOvHTJSzig1hjbX8GPVZKKt3bNOeczhEqKRvLVWvio1huTuSHSnF7mEBt2ghbl80NHPJ6BSwHeTjSW4J81UzCb8BCtVFVGxvNypG/fRBMGZpQ7/PjP4DkobWR6tyLbKVMshq3d9gQPjkzLLM/70XPLuzX9JAW7uVbfutK6NUmxSBSPakDc7mzlJGC5xYEDsO1PtEhP3gQsY66O5Ftl1FwmH6M3YaGIHs8HNlOtr4zYv7UXuTo93MaDVp6QqJIdSUYCbXy+SeLnogS2nIuZNqDyUvViwpobyxS9DkuOrd5gkLAnE5eHLtJa8azmfNBGEZg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQNUOymZUnNZ5LgKcuEtj9uDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBzdHNsYWIubWFoLnNlMB4XDTIyMDUxMDEwNTYwM1oXDTI1MDUwOTEwNTYwM1owJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gc3RzbGFiLm1haC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8hiQ1ewxfM7Z8vnGQBBZZCOTeRx/p7fzpuXHCI2RtP1MaeIscAMSedIvsSYZGkndXtqszQpUtvveWoPi6Gs/xdVd1YpRmeqzzacq/+uux+7YODoVw0s7QQDAEdC/t4+586mmYPDfjmugQSg3j/Jbp+Wn3jHd+vj7WNI1z9AxSKh+rIft4olr3pLEv0UvJ/ylHJO6Ohn/rbPe/bXChOzvBv7zOLHCfG03uXWwennOG65qFqgSUh0gqQ9WZcBzeyA7FJ70087ElcHqIoFm+hCEtEDkZ4Dc6tj2xfxMeI+0RZITOh+WeynWfW+XuAqj7Z5wJYQK3tudqFg1YFrLfNK8cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEASPOFDrv7+BP1aSZPwpq3+WuaIHjqSLif+TQ1Aoss2uktJhT/SPf7E+jVuBJ0CXkqkyb8EJdwFD06Kymbqmlr/p9pxdcY7ON6VK8J4pjLdsKssPfbiDe1etzLXMDm60ULW8TpQL0Zaa/eB5EiXgBzP7xOKI4tF4gNbpIWgMMRcnUnRg0BXLBYkd+VGHW1mD5y7jKxOPugIn8W9afhQXnhKRfdA5spyi655A1HlodS0McviwCd8kpTU/dbI/XedSGOjS5ZDvf1wOOB5DazxGb/j+98mXyZmvd41fBy0Ps5sEJGYyg4BnCOyLfsOt3Y2bBvYX23lgua/PMVUYRe3NpnPA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQFoGG9+p3RpdG1Ufyjd3O9TANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBzdHNsYWIubWFoLnNlMB4XDTIyMDUxMDEwNTYwM1oXDTI1MDUwOTEwNTYwM1owJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gc3RzbGFiLm1haC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0V6jeNEyEW2z2NEyHxehmkJDHg9L82OMzf0dcsaYzXJFZhLYsbygJmbs7B9f3lZQ5VWf9Bi1dUNQI1BJJhkd/vMAeB1Pcu4pUfS8lGJiV9e20qQ7fMmzaajzUtLTkHbJFUQRnpKCeWh0+ScIGDzyUMhQsLfYYbg3vgJUTnCrN/keqT5ZykquhZmXkskaeH3sc9fvEb1JtkYe+6sdT4oRYuJrERML/qPx+Dg74tqz9Q11bT04FxEi0QSpWMEXkownwRaIuyPYq4Sa0+imHwOa1+tMkdLulSA8BqXR6l8kcGamWjXozH+Hri4xiQyuLiscAozkDmBRbBpLKlCO8HmL8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAKLF9+v57eznYgb9HSXKT5icnK+5YqT5oLEj12m0B3CNp7/Yzh3cWzRW4es453JYv1MixbmG68kLg7hW5B9/WoewSpqveRy+95ard040vnq3wHib9uzP8kn/+6gHCOhWmdvAQ6nVFCIlY2CnHZot4h1aDJ2KFWFFYr31w2SrtfkMsUJXkZ7rQIhTGb0si5ogko3L/SfVnHsAwC9IFVu5A/HHRaflMV1C7FctcDhoMBch3OFy/CWoMr4v3SNTGhVwIzQyrH3ko9jr1GoN5lXm3d55WSn6bJYkycWwrwjCxbED32XvqTElM9316E056fiaGa7uyQcG8KccfhuoBULMN0Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stslab.mah.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stslab.mah.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stslab.mah.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stslab.mah.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MAH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">MAH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Malmö universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Malmö university</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.mau.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.mau.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:support@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Malmö universitet</md:Company>
-    <md:GivenName>IT Drift</md:GivenName>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
deleted file mode 100644
index affcab5f..00000000
--- a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://swamid2.shh.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-09-13T11:39:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://swamid2.shh.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">shh.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sophiahemmet Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sophiahemmet University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Sophiahemmet Högskola.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Sophiahemmet University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.sophiahemmet.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.sophiahemmet.se/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>sophiahemmet.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.34547,18.07525</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnN3YW1pZDIuc2hoLnNlMB4XDTEzMDkxMTEyMjkzNloX
-DTMzMDkxMTEyMjkzNlowGTEXMBUGA1UEAxMOc3dhbWlkMi5zaGguc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAFjj9XWfRDUlUbQ5+JieOPIlb9ijT
-PpnUuzM3/lGbqOhK3wsSrfTx/xkfVVusFfqc+5maUjpG19yln6srVSF/kMAk55S+
-o9PhrSUY5gQl2uYBAeK99Ol/6bWR6frA7xCWlB19hUjuHyCER7bkWzgpucYfJa0m
-k2Ad0S3kmIlxN13NHar0eg3TtBzEF8+ckY+hRUif+N5dFilx1LUGnpxKdVMY7pWP
-4ITWkjffIFiKvtfYnKt7+OWF/pIsH2BnAC1aIixNFogxkbUOh/mxz6ETdRWUd5sq
-v7Y86uv3aKrScIELHyHQboHVicFIJ3z0YKV39JEBziR0nE/BkPkh3Hg7AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnN3YW1pZDIuc2hoLnNlhiVodHRwczovL3N3YW1pZDIu
-c2hoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRJhbf3IfPJnZ5yadVwH9OZ
-sJ6gfTANBgkqhkiG9w0BAQUFAAOCAQEAfq+blNorCZcCJwvC1dzohHaEkXPWu6Li
-eeffuQ3F98ZizlurLWK/a5T+GOpdMiD+Tv1gOGeF4xwFVtG/VMLKZdhsWSgVndoq
-m0uLanEaWsDW7eegsQ2krvzhMd7E2IxvgnVFhL8cr/blHzUTqu1wjNT69xEYLjMk
-UOVyoxnOo5Fi2BoLNACADCZXl8OjW+v+GYh0YpJ617ijB3zfL+nyta9Y8gn+xIpT
-YXsGDr65xZHaeJavzLIj6hGF2h2KHgbqau0ET7qKyVv/ntgP2tHLGBnCuFCbSco8
-URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid2.shh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid2.shh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid2.shh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid2.shh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">shh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnN3YW1pZDIuc2hoLnNlMB4XDTEzMDkxMTEyMjkzNloX
-DTMzMDkxMTEyMjkzNlowGTEXMBUGA1UEAxMOc3dhbWlkMi5zaGguc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAFjj9XWfRDUlUbQ5+JieOPIlb9ijT
-PpnUuzM3/lGbqOhK3wsSrfTx/xkfVVusFfqc+5maUjpG19yln6srVSF/kMAk55S+
-o9PhrSUY5gQl2uYBAeK99Ol/6bWR6frA7xCWlB19hUjuHyCER7bkWzgpucYfJa0m
-k2Ad0S3kmIlxN13NHar0eg3TtBzEF8+ckY+hRUif+N5dFilx1LUGnpxKdVMY7pWP
-4ITWkjffIFiKvtfYnKt7+OWF/pIsH2BnAC1aIixNFogxkbUOh/mxz6ETdRWUd5sq
-v7Y86uv3aKrScIELHyHQboHVicFIJ3z0YKV39JEBziR0nE/BkPkh3Hg7AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnN3YW1pZDIuc2hoLnNlhiVodHRwczovL3N3YW1pZDIu
-c2hoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRJhbf3IfPJnZ5yadVwH9OZ
-sJ6gfTANBgkqhkiG9w0BAQUFAAOCAQEAfq+blNorCZcCJwvC1dzohHaEkXPWu6Li
-eeffuQ3F98ZizlurLWK/a5T+GOpdMiD+Tv1gOGeF4xwFVtG/VMLKZdhsWSgVndoq
-m0uLanEaWsDW7eegsQ2krvzhMd7E2IxvgnVFhL8cr/blHzUTqu1wjNT69xEYLjMk
-UOVyoxnOo5Fi2BoLNACADCZXl8OjW+v+GYh0YpJ617ijB3zfL+nyta9Y8gn+xIpT
-YXsGDr65xZHaeJavzLIj6hGF2h2KHgbqau0ET7qKyVv/ntgP2tHLGBnCuFCbSco8
-URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SHH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sophiahemmet University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.shh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Sophiahemmet University</md:Company>
-    <md:SurName>Sophiahemmet IT</md:SurName>
-    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Sophiahemmet University</md:Company>
-    <md:SurName>Sophiahemmet IT</md:SurName>
-    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Sophiahemmet University</md:Company>
-    <md:SurName>Sophiahemmet IT</md:SurName>
-    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/t0253.srv.lu.se-shibboleth.xml b/swamid-2.0/t0253.srv.lu.se-shibboleth.xml
deleted file mode 100644
index 915fdbcc..00000000
--- a/swamid-2.0/t0253.srv.lu.se-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://t0253.srv.lu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-05-26T10:30:52Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://t0253.srv.lu.se/Shibboleth.sso/Login-lu"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://t0253.srv.lu.se/Shibboleth.sso/Login-swamid" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">lu.se dev-server</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">lu.se dev-server</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Server för leveransområdet lu.se, där det sker utvecklingstester.</mdui:Description>
-        <mdui:Description xml:lang="en">Server for development tests for lu.se</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>t0253.srv.lu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=t0253.srv.lu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAKsb9ND3kJJHMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3QwMjUzLnNydi5sdS5zZTAeFw0xNTA1MjExMjUxMzdaFw0yNTA1MTgxMjUx
-MzdaMBoxGDAWBgNVBAMTD3QwMjUzLnNydi5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALUEWPsvPfvLMpdOcuj2pTlAkB/AclM7pk3Pid/Y8N2g
-Ig/zNuwvm3JHb7wtX2rnYwlQkZnVQHYmCdHcPRqVF2skZ3oGhAxKfMhzMv9hdpQC
-z2rOkU7TKHOCS8QVtUrp+5lHNLJgRLGwRdnkmKwmBeaw+ARrMajac78XM/IluR6W
-szvvDxuJzTI4VrIIFaxowIaqEQZ0eqJ5xRgVtm2gWT/+dFKQ5Rarih5J7YsAf/qx
-QdzLuzxprElN154+GK6v2cPjzzNFFDZ2b2nZYGlA7monslUvvtyPJfftC8eUlo+x
-0oh57KT+2l+LQAKMQK2fTJzP26PWEk0EkcYc4tAgXccCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPdDAyNTMuc3J2Lmx1LnNlMB0GA1UdDgQWBBSjdvGg25y0PMaGlfeOUpZt
-Hxs+xzANBgkqhkiG9w0BAQUFAAOCAQEAMdX5Gptx4P0wZP09bvE7f6iUzoZJvIzQ
-5Fx4bJmSOvk4gBY67HI/jMdr96SUx95jtEaPeyIZY+qgMHt50VH6EmJUX2MvTmGq
-9SmVBkyZlslgGgbhfxNyle2Q/2MmJSrVZLKlE1OCTXrP8wQ8cnUQhFMycNkPq++B
-ycUie3oom6nWqBNdYTIm/BMLrm3s/ElSYKaMP9fTfcZEidI1f9tcfNKFVvnWdF2m
-c+rHrc5Y3vgVwBDLiCKgVnfrdD94HrvV9o+8T9joTmacC/1MqXVhC/yFPIAWTx0z
-X0M9HPc6jTSKpzxoFU9QN+XTGltcAihuBo8Qh8fpVqYAX6Qi3VD/Fg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://t0253.srv.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://t0253.srv.lu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://t0253.srv.lu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://t0253.srv.lu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://t0253.srv.lu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://t0253.srv.lu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://t0253.srv.lu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://t0253.srv.lu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://t0253.srv.lu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://t0253.srv.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://t0253.srv.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://t0253.srv.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://t0253.srv.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://t0253.srv.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test-his.hr.evry.se-shibboleth.xml b/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
deleted file mode 100644
index 6ddb30e6..00000000
--- a/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test-his.hr.evry.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-01-30T10:48:28Z">
-      <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#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/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </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:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJALQZLo4SG3IqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Rlc3Qtc3NjLmhyLmV2cnkuc2UwHhcNMTQxMTI1MTQ0ODU1WhcNMjQxMTIy
-MTQ0ODU1WjAeMRwwGgYDVQQDExN0ZXN0LXNzYy5oci5ldnJ5LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmMXETFuyDLH3w07c8NvkgzVuwzIXrCE
-Uvs7wZyT6ZxJBZUpv40E3hMjWD6H1HES5EReGn1Pz/N0WNwJgKwPSoXAKdIsarle
-JXT8tLnWh1VwxYwqJAWicIBEHg+wieZOtpx4bZWbuoawrmG4y+Sv2bQ4ysCGTv+e
-ldtBQDDg7AoYgKKNd7XTCvmpCFSRgsvKNlfcM7IqqbQGZXAjAdN8fE925NCwJAXD
-Ls1TkHuhdUDqonkpjeIcOknfl1MYHmabjICyStZapz+3/dwbkUxpR92FwaCg+RcQ
-S0rnS/PL9NXZYliFZp0Xh4ScDIma9psz2sE7slSRYuw1YVUiOu5iawIDAQABo2kw
-ZzBGBgNVHREEPzA9ghN0ZXN0LXNzYy5oci5ldnJ5LnNlhiZodHRwczovL3Rlc3Qt
-c3NjLmhyLmV2cnkuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyz73UbcUW2un96s
-oed1EtDPMQAwDQYJKoZIhvcNAQEFBQADggEBADlt8uXtd2pneWkOTEsnz1pjb9bi
-pirtJavI5AUPV2rK70VRG/jpSbagsZFJWQrw+fPZVEF5emKUyR49EUJRn0KCBNya
-SZg2n3AISr0f3QfubUAzCCHukIRnhGt4xeAAWN05X7ANzxwnGlvVFrY4LQmwYiyD
-8IUFY03HFM86DjGWnC7TfPA4sg12abLkRuWHRytlWSO61a6xXvFflQlAuwMlL6Vm
-gEhPDsDiKCgP+rtRfKirnUj/35G+bl+esZ9Nv4FQ3uEMxezo5IofzVjy92Xg4bxP
-tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-his.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-his.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-his.hr.evry.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:artifact-01" Location="https://test-his.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://test-his.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="affiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Primula</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test.lu.ortrac.com-saml-sp.xml b/swamid-2.0/test.lu.ortrac.com-saml-sp.xml
deleted file mode 100644
index d7713565..00000000
--- a/swamid-2.0/test.lu.ortrac.com-saml-sp.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test.lu.ortrac.com/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-14T06:28:36Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.lu.ortrac.com/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.lu.ortrac.com/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">QPS Test environment</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">QPS Testmiljö</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Quality and control system for the education at the Faculty of Medicine</mdui:Description>
-        <mdui:Description xml:lang="sv">Kvalitets- och uppföljningssystem för utbildningen vid Medicinska fakulteten</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>www.ortrac.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ortrac.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/DCCAmSgAwIBAgIUIdrYO7SXSTpQdQMUN0OaFNDfNeYwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAxMOd3d3Lm9ydHJhYy5jb20wHhcNMjAwMTA1MjM1ODUxWhcN
-MzAwMTAyMjM1ODUxWjAZMRcwFQYDVQQDEw53d3cub3J0cmFjLmNvbTCCAaIwDQYJ
-KoZIhvcNAQEBBQADggGPADCCAYoCggGBAL2eD02Ch/WpMfgA8Bmsy1C3etN1QmvQ
-WROGi9nlm9A1tYg6A/E99nebNNuaDjOhlf2bFEmrUvXNZV2htZxp9Dk3iS3LoQen
-n6j+hlxHVZKBm8ns/NMyO7wSVKimJCx6YXpisPPYBQn9Q3LQFARDXdkNndOtnIja
-Jy6+bpmSUM7J90kTlinZ++VXYv2fTnVpWQie6ir422n+MvfJli9XFi8pri895XZZ
-CExeTOe4u5FIoVrVxLp+TIolb4xsvpZo6PCHKpCW0nyfX2EUe94yAP+i9wwtqnRB
-lHRDIbjitnpoVn0wIw/JkpY6Uk6Qs46vm1bxo9RlILY9+NoaUJuqOvXg7sGvGcC2
-wHcHEwzzb44V43mUkgOA8/QUwiOzkgzpTKZZpwwTKvKFCiMcQ9ck/hy9372TRX4L
-qOpkwxOAS5gQzlJQ3UKpn7sJavzjZgpUbWn9yHWVGxAaKHpbW0I7Sa+lHqtWoVJX
-h56LH/K2FmGtA9fCIKi3pCaC/FBZXCIfHQIDAQABozwwOjAZBgNVHREEEjAQgg53
-d3cub3J0cmFjLmNvbTAdBgNVHQ4EFgQUid+qBStC7mLmxpz2tc7WqmrBB9EwDQYJ
-KoZIhvcNAQELBQADggGBAB+1zL/mJGZZ6DHN9ohhrv3Kw47bNgn8MEiSrrE9bjwH
-/0WaqJFUwiBcmH1N3EA25uZT4mUK0AwlnuQlPwkkDgj3Y5yrSE21//99+Xf8Ksfe
-91Yjx4hMUUmZnMxJQl1JsvuZ3KF8kgHk+ijmWJGlz7u2NKTDY6m9y/RsaDoycqOp
-S/r9HFuPYBYdFw3DivQmjM0jwOtt4JuWZDYg75sYjelR8RnxSIQnxgk5St4GKLq0
-URB0VnbbiYt1vGpVvbpXcEnlrwCo+gWUMM6a35Q5eKgKantfkhd1ElfFB6OIZCXd
-InqHD3/3ZgqTfdYZ8IzIsMxqyTEbCWwSlisE7L2JQ2wNKUO5gDMRD/IrwvQZc+UG
-zIbTFrMZ+RPS8CVwt0NlvzYfKSM/12HjZ/FUluKIcJwXC3sPnyn0V5fJZjQm3qf1
-kJ+sjgFwjYk3lFoOmYnXU8NZQWlyfNO0XNNiZK+4RU2zyDDNARD95j0FueYVFvA3
-yQ8Fym8zwW/5KlfigfEnLA==
-</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://test.lu.ortrac.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.lu.ortrac.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.lu.ortrac.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.lu.ortrac.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.lu.ortrac.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.lu.ortrac.com/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Jakob Donnér</md:SurName>
-    <md:EmailAddress>mailto:jakob.donner@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Johan Agardh</md:SurName>
-    <md:EmailAddress>mailto:johan.agardh@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml b/swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml
deleted file mode 100644
index f2d4999e..00000000
--- a/swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test.mp.uu.se/Shibboleth.sso">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-11-14T18:24:20Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.mp.uu.se/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.mp.uu.se/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.mp.uu.se/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medarbetarportalen vid Uppsala universitet (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala University (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medarbetarportalen är ett intranät för anställda vid Uppsala universitet, men är även åtkomlig för studenter och externa användare.</mdui:Description>
-        <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://test.mp.uu.se/sv/web/support/om-mp</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://test.mp.uu.se/en/web/support/om-mp</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/en/web/support/behandlingpersonuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/sv/web/support/behandlingpersonuppgifter</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE8DCCAtigAwIBAgIJAM5IksMD367xMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
-BAMTDXRlc3QubXAudXUuc2UwIBcNMjIxMDE0MDcwNDI4WhgPMjEyMjA5MjAwNzA0
-MjhaMBgxFjAUBgNVBAMTDXRlc3QubXAudXUuc2UwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCqYz4WJSxnNPzQHvjLUzMkwPP00F1PUJRkQdbRdLLCshTj
-0VBhXE7LR+I86WW2HRhjR+EYuEgcKCPptIAuVPutO5sfljMnfkrgUAqW3AygjA4W
-2w0L5Bc2+RV3mPnjkGFogUdPZ4TjnYn3AHlF7ocwkoLr45iRiL0o0s1vckIMTpI4
-LkZlHmdUnHmm2Ae3rNhQ0FoPmx/wov3radxCpnQazdhVaUlKkDBuvZ8xP0qcKaPw
-yul5bW6/Wut8gSHrESR9yMH3Gnh0p9StoMwEW3h0kxjik+FSwn8qN+EeIURryNxm
-XgauBZSF3kYwFrUxeR8g4tVq/Pw6h1hhCc2j9P+Cktfa+et46YC4H9RIUJpiBAPg
-ySQnpx+uGQzxC700RnN8y8pHg1rpv+CkDiuA4PIIzMpCcUBBhNeSwZJq8yKH91u0
-Mz0MwPKF6hJsQzJ3/S3o/uRsFLntska0HMpBdWt5nZvY/YVWvgEgGWU+hwtAnxRl
-Vy2KuaIf6fQTNIKux4ShdjtPTSH7H9scqxx+Xf3BNKMBJQvefavt9qftbmlzl+JX
-xl8ZqsX+LON6EYBVQfmuBUdP75Kc7tIOaJVd6q6duqZcCkz73ZpNj3IY6YKOAp7i
-HiJJiq3TfqkN/8baIh0++YlrjeYoY7/baIvP/+8zOMUK5jJwvWfks5DZClK+ywID
-AQABozswOTAYBgNVHREEETAPgg10ZXN0Lm1wLnV1LnNlMB0GA1UdDgQWBBTFQL5E
-u3ewVGP07MsTOp3cSbUHrzANBgkqhkiG9w0BAQsFAAOCAgEALnypaHbunBiyZGeI
-1wW+6nLEPjwK9lDF2Mq0kASN1dP1ZPqju9E4cXx98DBAyD5r7YuQd8JqOU6hBhMe
-Mnz6WcUjbyTzMdvk7ergG9CVjKneYuLXgdcW3PvK2YeaAviMnYiHQqi2tYMWLU+Z
-zAK5a47U0EUku2F9riQeDvcvl9YSBlFt/81c9q8A/j5f5Ece2ux6rdILeUf9tKWb
-SB24AeFBd9UJ11+XiJdnAZ2KkKeAAjznradSL034guALL6KqhvPPdGkGTA32fQjI
-ub3vsCBtOeZIXGHK4NysN0bwDiWpOHmNEfM5a2jH8/pIs5SA03Iz2KH3b/tFgUTN
-yTso2QH9eM2cHBUCLyLUpoH7cyqzbh8dFU3hklLcrveoXW2KNXc2TYQbUSRw96Pp
-BFwkmr6Czx0hQP6HFJMnymYIlHEXxsDBCzM/xJtDFEjxDP/bl9jWyFTAyPisq3ZU
-ssQ2JFLVEyQ6GtfaoRzG/1SPO8LqPNQTC9GMOO7Gr9NdwKEPz1OI4nI7QvspS/Wd
-fA/5tndXaVrbpD22WQWPiNxdKBrNh6K296dmx0nWhpkoMN1LKXqBwCCkTgbKNP+F
-EygWvHCGgDVriBh6+tcRwV0fZ+YiwfvxtKsfOP6eI/2YQMw9BfusXUOx4/4KeFuY
-xeSNu6jmKOMefPbRNSYIBOTTQFI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.mp.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.mp.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.mp.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.mp.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.mp.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.mp.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.mp.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.mp.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.mp.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.mp.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.mp.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Medarbetarportalen vid Uppsala universitet (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala University (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test.ortrac.com-saml-sp.xml b/swamid-2.0/test.ortrac.com-saml-sp.xml
deleted file mode 100644
index 988a2895..00000000
--- a/swamid-2.0/test.ortrac.com-saml-sp.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test.ortrac.com/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-06-11T13:35:41Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ortrac.com/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ortrac.com/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">QPS testmiljö</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">QPS test environment</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testmiljö för medicinska fakultetens utbildningsplattform</mdui:Description>
-        <mdui:Description xml:lang="en">Test environment for the Quality and Performance System at the Faculty of Medicine</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://test.ortrac.com/Shibboleth.sso/DS/Login</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://test.ortrac.com/Shibboleth.sso/DS/Login</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.medarbetarwebben.lu.se/stod-och-verktyg/juridik-dokument-och-arendehantering/personuppgifter-och-dataskydd/overgripande-information/allmanna-principer-for-personuppgiftshantering</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.medarbetarwebben.lu.se/stod-och-verktyg/juridik-dokument-och-arendehantering/personuppgifter-och-dataskydd/overgripande-information/allmanna-principer-for-personuppgiftshantering</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>www.ortrac.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ortrac.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/DCCAmSgAwIBAgIUIdrYO7SXSTpQdQMUN0OaFNDfNeYwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAxMOd3d3Lm9ydHJhYy5jb20wHhcNMjAwMTA1MjM1ODUxWhcN
-MzAwMTAyMjM1ODUxWjAZMRcwFQYDVQQDEw53d3cub3J0cmFjLmNvbTCCAaIwDQYJ
-KoZIhvcNAQEBBQADggGPADCCAYoCggGBAL2eD02Ch/WpMfgA8Bmsy1C3etN1QmvQ
-WROGi9nlm9A1tYg6A/E99nebNNuaDjOhlf2bFEmrUvXNZV2htZxp9Dk3iS3LoQen
-n6j+hlxHVZKBm8ns/NMyO7wSVKimJCx6YXpisPPYBQn9Q3LQFARDXdkNndOtnIja
-Jy6+bpmSUM7J90kTlinZ++VXYv2fTnVpWQie6ir422n+MvfJli9XFi8pri895XZZ
-CExeTOe4u5FIoVrVxLp+TIolb4xsvpZo6PCHKpCW0nyfX2EUe94yAP+i9wwtqnRB
-lHRDIbjitnpoVn0wIw/JkpY6Uk6Qs46vm1bxo9RlILY9+NoaUJuqOvXg7sGvGcC2
-wHcHEwzzb44V43mUkgOA8/QUwiOzkgzpTKZZpwwTKvKFCiMcQ9ck/hy9372TRX4L
-qOpkwxOAS5gQzlJQ3UKpn7sJavzjZgpUbWn9yHWVGxAaKHpbW0I7Sa+lHqtWoVJX
-h56LH/K2FmGtA9fCIKi3pCaC/FBZXCIfHQIDAQABozwwOjAZBgNVHREEEjAQgg53
-d3cub3J0cmFjLmNvbTAdBgNVHQ4EFgQUid+qBStC7mLmxpz2tc7WqmrBB9EwDQYJ
-KoZIhvcNAQELBQADggGBAB+1zL/mJGZZ6DHN9ohhrv3Kw47bNgn8MEiSrrE9bjwH
-/0WaqJFUwiBcmH1N3EA25uZT4mUK0AwlnuQlPwkkDgj3Y5yrSE21//99+Xf8Ksfe
-91Yjx4hMUUmZnMxJQl1JsvuZ3KF8kgHk+ijmWJGlz7u2NKTDY6m9y/RsaDoycqOp
-S/r9HFuPYBYdFw3DivQmjM0jwOtt4JuWZDYg75sYjelR8RnxSIQnxgk5St4GKLq0
-URB0VnbbiYt1vGpVvbpXcEnlrwCo+gWUMM6a35Q5eKgKantfkhd1ElfFB6OIZCXd
-InqHD3/3ZgqTfdYZ8IzIsMxqyTEbCWwSlisE7L2JQ2wNKUO5gDMRD/IrwvQZc+UG
-zIbTFrMZ+RPS8CVwt0NlvzYfKSM/12HjZ/FUluKIcJwXC3sPnyn0V5fJZjQm3qf1
-kJ+sjgFwjYk3lFoOmYnXU8NZQWlyfNO0XNNiZK+4RU2zyDDNARD95j0FueYVFvA3
-yQ8Fym8zwW/5KlfigfEnLA==
-</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://test.ortrac.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ortrac.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.ortrac.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ortrac.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ortrac.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ortrac.com/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lunds universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jakob</md:GivenName>
-    <md:SurName>Donner</md:SurName>
-    <md:EmailAddress>mailto:jakob.donner@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Agardh</md:SurName>
-    <md:EmailAddress>mailto:johan.agardh@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml b/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml
deleted file mode 100644
index 3d098e1d..00000000
--- a/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://testidpv4.lu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-04-21T08:31:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://saml-error.lu.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">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Lunds universitet (Test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lund University (Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testidentitetstjänst för anställda och studenter vid Lunds universitet (Shibboleth IdPv4)</mdui:Description>
-        <mdui:Description xml:lang="en">Test identity provider for employees and students at Lund University (Shibboleth IdPv4)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
-        <mdui:InformationURL xml:lang="sv">https://www.lu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.lunduniversity.lu.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.it.lu.se/fileadmin/user_upload/itlu/personuppgiftshantering.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.it.lu.se/fileadmin/user_upload/itlu/personaldata.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="146" width="121">https://testidpv4.lu.se/idp/images/mdui-logo-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="116">https://testidpv4.lu.se/idp/images/mdui-logo-en.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>lu.se</mdui:DomainHint>
-        <mdui:DomainHint>lth.se</mdui:DomainHint>
-        <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEJzCCAo+gAwIBAgIUax5wlSZ9mfr4nj6Nq3lG3OJ/rlAwDQYJKoZIhvcNAQEL
-                        BQAwGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMB4XDTIwMDIyODE0MTkzMloX
-                        DTQwMDIyODE0MTkzMlowGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMIIBojAN
-                        BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAjSLQZe0gVwlmXmX7Aodd7RtVIq7x
-                        SdGkUMzXKWmu0RrGoEYiIqWGPl4vwepj8rxpB+3fn1ICYLNzDZ/uZjIrQpRRLVFo
-                        EpkvPtio7DiBP67CFBrW8dqeFljyyeJ1x9LXEElM5RTnduwLZfz19QnhKT3BJ6nl
-                        ErtQX6AEhDaGBQr5xPcx6MOmEL6Z3l8oOuIHEJzs++CWUsaGGratFalk1mRKPjOS
-                        OVS8ABKTL2WSGFWN9lg262YSozDg/b9A2Yb1CO9BfqSQLf7dqDjT8ncuQSeJ0F+k
-                        9TbVgoclFPwCGW2ozi0I521UePRaAIQ9K9ogdyHntcGzg6CI4vBIiQTwBqxxBwQc
-                        6Y0E9SKeNajx2zBUuXKhU7Ny+xk/fCSB8/tCn/hU1cSI+3nOpD7I+W5AkI1aJarE
-                        16qmpeqnE0hVsSnJrRvR3RXcUkuFfjNR4ZDSzPgvF4zRgbXHDuN7CQAi+6zhdcnW
-                        M8mxrv0Kv8+2x1rrKsqU2O0ug/N5vaEDasZXAgMBAAGjZTBjMB0GA1UdDgQWBBRQ
-                        E/8BKrHdzUJ77Gwu73rUEDJGMDBCBgNVHREEOzA5gg90ZXN0aWRwdjQubHUuc2WG
-                        Jmh0dHBzOi8vdGVzdGlkcHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-                        DQEBCwUAA4IBgQAEX8bVUgn4Fx11xpM1InUKTX5PCFABCCEHrcogdisG+i9D/6vp
-                        lByz8+htRhWK3NiQcFeEvb22+vWSdILQ2Orxkr5pKnq/gwwtxCtwyLLzppN9Apk8
-                        MdGKykZhTt5q2vC+z5QIYVAFqop+Aur8PV8/jh5hfOS1A8qP9f4CdDbJ4yut9slD
-                        ezmhSDyBzwBGw9Gp9MMwki8wUxPABnYSO0tB9hHqHcNs66L9TnU7MHFwgttWkVAe
-                        fEtnmE3TOfhDvPKfA0GvxMx+8Yq33l5ULYpe7VTIZ9cnB8JDyVmxQEVY/OzfBTzr
-                        4+MRo+Mla4dxpRFZCjjPzJfIoWZ4zyRCknVyITj10tVFDyZhgoGlwj3OXrny8HEz
-                        syr6g6Dv3/Dvpa2hfvagYaV7MCS63lxnEwhrfHR9s8BwYhmLzKybVc+V+39cddMb
-                        rQxCop8QUrH5asbJFtrD181RVvg+78kE6+06+ZpRK3fMWOxaXYQNgTsV9SUknt9W
-                        vfDfE7lmEmBH3KU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEKDCCApCgAwIBAgIVALKujwaVHaZhGOqyCUibFCDSPg+WMA0GCSqGSIb3DQEB
-                        CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
-                        Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
-                        DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKV4FKUullzDjlhIueafuIMUklq4
-                        PnkRpcLedmblQ52Vla7kA4ZWJlTihFBuxNrnV3zrRMMdvjZI1u69HgdgZHSwtCFc
-                        TsqiKc3Mj2LaWrRn9+CXPvgsoHNLSVJNHBugm1lDrX/9ON5qPfcF4ojaYdvUVi56
-                        ZNNhSGYUQ0zZ1+BhdUMGNAJDPL1keqsxS+OHlJzcAAhWWLEwiEohfZEcKItvE5w4
-                        m53q1nJaPKZCmNRMu/U0cS5Kglr6mkF9x11HmVswdIrWEtTD7n5cfqt/2d/fimK5
-                        TErL4tHLnxN8iXp5k/2ZvXKEhgT8RLczVArl7ji3WG7Uyf/+tCvbMQxsZDx5lfar
-                        237f/lBQz98/73hNa6eu20Jk4aiz5RnWQDJVr5J0vxKnls6CVZ7VvckLQazQLLRw
-                        LiEngXL3vRw9ZgDioKudpiPwTRvbL7Q5VjYr4WBAMImSR//AEdW14O6xSq11eKmI
-                        ydEHHvH+mfEu1jwc5obRnKPgtRi44FqqVTnU3wIDAQABo2UwYzAdBgNVHQ4EFgQU
-                        AFbJB7RnXcAZhzFHErMsHIWyvtMwQgYDVR0RBDswOYIPdGVzdGlkcHY0Lmx1LnNl
-                        hiZodHRwczovL3Rlc3RpZHB2NC5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-                        9w0BAQsFAAOCAYEAJH5eXOsHdSeq29vW0v0NJs3WhQILiyykp6I7yyy8gM8LSv4j
-                        mQvzKDwGZUYkbhpGHm0zlKc+hMUA/xwZ6aoIk2/rj/ZZRa5HX0/y+UWMiQJ1mnF5
-                        3PPxR/95cAwD7dOJVM5gn4Bos8DWSNI6dgSaqS59FkSFrVtWFxRLbsyviq8eRfT0
-                        mVqBszBh3YYvsv3YCgVlDhW9UmvA7DsHD1UK4Ot3dfV7NkB4XMb1o6LJ1/fjP8Jt
-                        Vhi0fmZx/Jjf7yBZZsZvXuty9NSeJYSFl4CrV5FtZyDjv81PpT1Ho5tFDGF+MWAP
-                        xZlszLFdompzKrg4GV0hOYCVzbYHP87okyKexYqM+ILsjnbiBaYPhvbT0OvqzCyB
-                        3xR3z6v9VJ7iZb6s53/6hfPIOaqoigCVVs9kryL/LWxAcONVe3j+LHSpO/LbVeVl
-                        PhPdkKEJlNSh0fl1He/4tDRgn6oxtriCeGhkgkgec1Wts9ToVkVTx8Qj7KOH5pY7
-                        /3I+s2NlmSzSfJF2
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEKDCCApCgAwIBAgIVAL5LJ0uT+Dd+w/aIz5bHK/9jbaYQMA0GCSqGSIb3DQEB
-                        CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
-                        Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
-                        DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIxmBcbFnCYXL5QozP0c1RSoAs9R
-                        +LLhYdFM8zXE1pfg0MGlNGylU/OyrDG80pRV3RvNFYLWWJ8y0w2I2aVmWjxrcCt0
-                        g95qQC/MbIc7yMJXL5X8jzIJ7dTT3npW+QCzgXOvV+9kk9ukG0/Z6tJiRz2Ici6a
-                        1fvJU8QjfRJqJsm4iRGYvoxLZiLlQcwyGerzoS2rDgIor99KSQEONYjoRdp/6VNy
-                        yCNBta9/ZWCxAd8TFfU2QmilDR+t846IeSWuZ0lhLywr+GzxmEycklAPN/xaNQ1K
-                        /nConoYA6TiJD3ecLm/K9fEay+wCN918ENJABHiQ+i2KStnhqL8oUeudPL5zUgen
-                        D767tUYSjJ10orRSv0agqX7HMYMBl65Zqw9asjZNL9DZkyomyL40QIv5eFV7GmvD
-                        0XyBtem7IR7SGdxloOxFE8PdRYBW655e8ojxIKoMEyoHkelhEtobzIJlYCpE44/I
-                        LDxgt+NRgQ7Cjq2vh/A89JpWbYo0h2hoy6zUvwIDAQABo2UwYzAdBgNVHQ4EFgQU
-                        I5jXm8+Npq8IslUUAkBW3tlyrGMwQgYDVR0RBDswOYIPdGVzdGlkcHY0Lmx1LnNl
-                        hiZodHRwczovL3Rlc3RpZHB2NC5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-                        9w0BAQsFAAOCAYEAN1yFroy/gJAvGQ/wcKLrbWHCeCBp8HXGRh+bJIzJoE6/JKSw
-                        BNGLbd6Jp2rYobG4AnyThYn3FeaCWwq0cSyCJZ+7r+xf/X7nqWp1Hz9ols2pM7l2
-                        Gszd3DP3Op8Dv1MPPbb1vWiYHhQY/AwH0dDGpkMiouxyhL7bRkId1tka6/y4olYb
-                        JsqFquFZzWxiicBiY/xPqBgOA1Xd3nusiXfpawtP/5cH+HwJTMaQqDDqW9yzhZAI
-                        jm8y85Vo2h4lXtqRcOJKt7m2mpGEJHKEODr7ZnmCi8gpjlwXYBqn/4ztEQCgsQwy
-                        K8iUARfquSCvJbq9u68bpfG85c3CPwX4Wjke71CV50P1fwWosXUZDawR+am6PEP6
-                        OJ8Dg60C40ih35vpVLw3Ro7L/48vDtE79Ncc6jPEoincmJNHsdzhWwhB0kdPC2hy
-                        BOk5y8w16iqOOkOJmt1bBG5Y3fxXxFKsqecJnGu+bz++xLjtCOJhV2WEsevWKelB
-                        S1UOXyr6n+XEbwgu
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidpv4.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidpv4.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidpv4.lu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidpv4.lu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://testidpv4.lu.se/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testidpv4.lu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://testidpv4.lu.se/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEJzCCAo+gAwIBAgIUax5wlSZ9mfr4nj6Nq3lG3OJ/rlAwDQYJKoZIhvcNAQEL
-                        BQAwGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMB4XDTIwMDIyODE0MTkzMloX
-                        DTQwMDIyODE0MTkzMlowGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMIIBojAN
-                        BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAjSLQZe0gVwlmXmX7Aodd7RtVIq7x
-                        SdGkUMzXKWmu0RrGoEYiIqWGPl4vwepj8rxpB+3fn1ICYLNzDZ/uZjIrQpRRLVFo
-                        EpkvPtio7DiBP67CFBrW8dqeFljyyeJ1x9LXEElM5RTnduwLZfz19QnhKT3BJ6nl
-                        ErtQX6AEhDaGBQr5xPcx6MOmEL6Z3l8oOuIHEJzs++CWUsaGGratFalk1mRKPjOS
-                        OVS8ABKTL2WSGFWN9lg262YSozDg/b9A2Yb1CO9BfqSQLf7dqDjT8ncuQSeJ0F+k
-                        9TbVgoclFPwCGW2ozi0I521UePRaAIQ9K9ogdyHntcGzg6CI4vBIiQTwBqxxBwQc
-                        6Y0E9SKeNajx2zBUuXKhU7Ny+xk/fCSB8/tCn/hU1cSI+3nOpD7I+W5AkI1aJarE
-                        16qmpeqnE0hVsSnJrRvR3RXcUkuFfjNR4ZDSzPgvF4zRgbXHDuN7CQAi+6zhdcnW
-                        M8mxrv0Kv8+2x1rrKsqU2O0ug/N5vaEDasZXAgMBAAGjZTBjMB0GA1UdDgQWBBRQ
-                        E/8BKrHdzUJ77Gwu73rUEDJGMDBCBgNVHREEOzA5gg90ZXN0aWRwdjQubHUuc2WG
-                        Jmh0dHBzOi8vdGVzdGlkcHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-                        DQEBCwUAA4IBgQAEX8bVUgn4Fx11xpM1InUKTX5PCFABCCEHrcogdisG+i9D/6vp
-                        lByz8+htRhWK3NiQcFeEvb22+vWSdILQ2Orxkr5pKnq/gwwtxCtwyLLzppN9Apk8
-                        MdGKykZhTt5q2vC+z5QIYVAFqop+Aur8PV8/jh5hfOS1A8qP9f4CdDbJ4yut9slD
-                        ezmhSDyBzwBGw9Gp9MMwki8wUxPABnYSO0tB9hHqHcNs66L9TnU7MHFwgttWkVAe
-                        fEtnmE3TOfhDvPKfA0GvxMx+8Yq33l5ULYpe7VTIZ9cnB8JDyVmxQEVY/OzfBTzr
-                        4+MRo+Mla4dxpRFZCjjPzJfIoWZ4zyRCknVyITj10tVFDyZhgoGlwj3OXrny8HEz
-                        syr6g6Dv3/Dvpa2hfvagYaV7MCS63lxnEwhrfHR9s8BwYhmLzKybVc+V+39cddMb
-                        rQxCop8QUrH5asbJFtrD181RVvg+78kE6+06+ZpRK3fMWOxaXYQNgTsV9SUknt9W
-                        vfDfE7lmEmBH3KU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEKDCCApCgAwIBAgIVALKujwaVHaZhGOqyCUibFCDSPg+WMA0GCSqGSIb3DQEB
-                        CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
-                        Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
-                        DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKV4FKUullzDjlhIueafuIMUklq4
-                        PnkRpcLedmblQ52Vla7kA4ZWJlTihFBuxNrnV3zrRMMdvjZI1u69HgdgZHSwtCFc
-                        TsqiKc3Mj2LaWrRn9+CXPvgsoHNLSVJNHBugm1lDrX/9ON5qPfcF4ojaYdvUVi56
-                        ZNNhSGYUQ0zZ1+BhdUMGNAJDPL1keqsxS+OHlJzcAAhWWLEwiEohfZEcKItvE5w4
-                        m53q1nJaPKZCmNRMu/U0cS5Kglr6mkF9x11HmVswdIrWEtTD7n5cfqt/2d/fimK5
-                        TErL4tHLnxN8iXp5k/2ZvXKEhgT8RLczVArl7ji3WG7Uyf/+tCvbMQxsZDx5lfar
-                        237f/lBQz98/73hNa6eu20Jk4aiz5RnWQDJVr5J0vxKnls6CVZ7VvckLQazQLLRw
-                        LiEngXL3vRw9ZgDioKudpiPwTRvbL7Q5VjYr4WBAMImSR//AEdW14O6xSq11eKmI
-                        ydEHHvH+mfEu1jwc5obRnKPgtRi44FqqVTnU3wIDAQABo2UwYzAdBgNVHQ4EFgQU
-                        AFbJB7RnXcAZhzFHErMsHIWyvtMwQgYDVR0RBDswOYIPdGVzdGlkcHY0Lmx1LnNl
-                        hiZodHRwczovL3Rlc3RpZHB2NC5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-                        9w0BAQsFAAOCAYEAJH5eXOsHdSeq29vW0v0NJs3WhQILiyykp6I7yyy8gM8LSv4j
-                        mQvzKDwGZUYkbhpGHm0zlKc+hMUA/xwZ6aoIk2/rj/ZZRa5HX0/y+UWMiQJ1mnF5
-                        3PPxR/95cAwD7dOJVM5gn4Bos8DWSNI6dgSaqS59FkSFrVtWFxRLbsyviq8eRfT0
-                        mVqBszBh3YYvsv3YCgVlDhW9UmvA7DsHD1UK4Ot3dfV7NkB4XMb1o6LJ1/fjP8Jt
-                        Vhi0fmZx/Jjf7yBZZsZvXuty9NSeJYSFl4CrV5FtZyDjv81PpT1Ho5tFDGF+MWAP
-                        xZlszLFdompzKrg4GV0hOYCVzbYHP87okyKexYqM+ILsjnbiBaYPhvbT0OvqzCyB
-                        3xR3z6v9VJ7iZb6s53/6hfPIOaqoigCVVs9kryL/LWxAcONVe3j+LHSpO/LbVeVl
-                        PhPdkKEJlNSh0fl1He/4tDRgn6oxtriCeGhkgkgec1Wts9ToVkVTx8Qj7KOH5pY7
-                        /3I+s2NlmSzSfJF2
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEKDCCApCgAwIBAgIVAL5LJ0uT+Dd+w/aIz5bHK/9jbaYQMA0GCSqGSIb3DQEB
-                        CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
-                        Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
-                        DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIxmBcbFnCYXL5QozP0c1RSoAs9R
-                        +LLhYdFM8zXE1pfg0MGlNGylU/OyrDG80pRV3RvNFYLWWJ8y0w2I2aVmWjxrcCt0
-                        g95qQC/MbIc7yMJXL5X8jzIJ7dTT3npW+QCzgXOvV+9kk9ukG0/Z6tJiRz2Ici6a
-                        1fvJU8QjfRJqJsm4iRGYvoxLZiLlQcwyGerzoS2rDgIor99KSQEONYjoRdp/6VNy
-                        yCNBta9/ZWCxAd8TFfU2QmilDR+t846IeSWuZ0lhLywr+GzxmEycklAPN/xaNQ1K
-                        /nConoYA6TiJD3ecLm/K9fEay+wCN918ENJABHiQ+i2KStnhqL8oUeudPL5zUgen
-                        D767tUYSjJ10orRSv0agqX7HMYMBl65Zqw9asjZNL9DZkyomyL40QIv5eFV7GmvD
-                        0XyBtem7IR7SGdxloOxFE8PdRYBW655e8ojxIKoMEyoHkelhEtobzIJlYCpE44/I
-                        LDxgt+NRgQ7Cjq2vh/A89JpWbYo0h2hoy6zUvwIDAQABo2UwYzAdBgNVHQ4EFgQU
-                        I5jXm8+Npq8IslUUAkBW3tlyrGMwQgYDVR0RBDswOYIPdGVzdGlkcHY0Lmx1LnNl
-                        hiZodHRwczovL3Rlc3RpZHB2NC5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-                        9w0BAQsFAAOCAYEAN1yFroy/gJAvGQ/wcKLrbWHCeCBp8HXGRh+bJIzJoE6/JKSw
-                        BNGLbd6Jp2rYobG4AnyThYn3FeaCWwq0cSyCJZ+7r+xf/X7nqWp1Hz9ols2pM7l2
-                        Gszd3DP3Op8Dv1MPPbb1vWiYHhQY/AwH0dDGpkMiouxyhL7bRkId1tka6/y4olYb
-                        JsqFquFZzWxiicBiY/xPqBgOA1Xd3nusiXfpawtP/5cH+HwJTMaQqDDqW9yzhZAI
-                        jm8y85Vo2h4lXtqRcOJKt7m2mpGEJHKEODr7ZnmCi8gpjlwXYBqn/4ztEQCgsQwy
-                        K8iUARfquSCvJbq9u68bpfG85c3CPwX4Wjke71CV50P1fwWosXUZDawR+am6PEP6
-                        OJ8Dg60C40ih35vpVLw3Ro7L/48vDtE79Ncc6jPEoincmJNHsdzhWwhB0kdPC2hy
-                        BOk5y8w16iqOOkOJmt1bBG5Y3fxXxFKsqecJnGu+bz++xLjtCOJhV2WEsevWKelB
-                        S1UOXyr6n+XEbwgu
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidpv4.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>LU IdP administrators</md:GivenName>
-    <md:EmailAddress>mailto:idpadmin@epic.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LU Servicedesk</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IRT Lund University</md:GivenName>
-    <md:EmailAddress>mailto:abuse@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LU IdP administrators</md:GivenName>
-    <md:EmailAddress>mailto:idpadmin@epic.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/uppsala-test.blackboard.com-lms.xml b/swamid-2.0/uppsala-test.blackboard.com-lms.xml
deleted file mode 100644
index 0cabd884..00000000
--- a/swamid-2.0/uppsala-test.blackboard.com-lms.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://uppsala-test.blackboard.com/lms">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-08T10:29:42Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uppsala-test.blackboard.com/auth-saml/saml/login/alias/_102_1?disco=true" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Learning Management System - Blackboard</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Lärplattformen Blackboard</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Lärplattform vid Uppsala universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Learning Management System at Uppsala university</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICrTCCAZWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9CbGFja2JvYXJkIFNB
-						TUwwHhcNMTcxMTAxMjMzNjU4WhcNMjcxMTAxMjMzNjU4WjAaMRgwFgYDVQQDEw9CbGFja2JvYXJk
-						IFNBTUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbg9857S7YUJ+bjNnPH3XtSk1l
-						Hhoka3O110aWJK72ffgeDDQyncpzri1xVBUOzkhDeqKu/OskypGkc8XCr1cik0V/g8rAdM3OGlZh
-						6UlZJXgIeyv4BAbo9SXHG56gRW3VvMQ9GDgglVVH3aQ+WX4AwUrCTaPYNeBMX5VXan12/+tDxqz4
-						nk3tY3OKVwH0xtDksJXW0ug0KuN9T4PZtGg1OPf3Tot/O+JvWtC/awVSNTiLoqHGT4taSw2v43WH
-						vnxZBHE/lkSgobBK2Gg391WSGCO2c7V+4AH2y+lVfu4Y16FWupCYc49jk8yqzRyHpmtLvWezomQ1
-						2IHI724lf5H7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGpP0lKNJNQ4uYu5XBIRku1XK8HMQoZS
-						St5qw1ClBhcobOMXq5s4a0zTkAKhQ/gG+f62pSEHvTu7x3TGg+fNvzT5GgEvAuPZfOcvSFoXfpYw
-						V0u1KHXeSlKrkHxx/kjsIsfsTxhepyhROd59c4Z7tIWx8Ypc0AabYSP5AcASws96Pj/Xrq16ayBw
-						380z9sk/dFlMHjF/eSp2OTmXSObwFSU5hj6vcY9t+cBhHEV5fu+Lfs0zuvD5wNcFeoEEqp+Rb46v
-						AqG7mZxR5m4/rXKR7UCIkxVOMZx6uy9ZfvxPWyc6FNUKY86AnK9FiUNOdxdUWw1aDKgGrgwd7lFX
-						tKNZrNo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICrTCCAZWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9CbGFja2JvYXJkIFNB
-						TUwwHhcNMTcxMTAxMjMzNjU4WhcNMjcxMTAxMjMzNjU4WjAaMRgwFgYDVQQDEw9CbGFja2JvYXJk
-						IFNBTUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbg9857S7YUJ+bjNnPH3XtSk1l
-						Hhoka3O110aWJK72ffgeDDQyncpzri1xVBUOzkhDeqKu/OskypGkc8XCr1cik0V/g8rAdM3OGlZh
-						6UlZJXgIeyv4BAbo9SXHG56gRW3VvMQ9GDgglVVH3aQ+WX4AwUrCTaPYNeBMX5VXan12/+tDxqz4
-						nk3tY3OKVwH0xtDksJXW0ug0KuN9T4PZtGg1OPf3Tot/O+JvWtC/awVSNTiLoqHGT4taSw2v43WH
-						vnxZBHE/lkSgobBK2Gg391WSGCO2c7V+4AH2y+lVfu4Y16FWupCYc49jk8yqzRyHpmtLvWezomQ1
-						2IHI724lf5H7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGpP0lKNJNQ4uYu5XBIRku1XK8HMQoZS
-						St5qw1ClBhcobOMXq5s4a0zTkAKhQ/gG+f62pSEHvTu7x3TGg+fNvzT5GgEvAuPZfOcvSFoXfpYw
-						V0u1KHXeSlKrkHxx/kjsIsfsTxhepyhROd59c4Z7tIWx8Ypc0AabYSP5AcASws96Pj/Xrq16ayBw
-						380z9sk/dFlMHjF/eSp2OTmXSObwFSU5hj6vcY9t+cBhHEV5fu+Lfs0zuvD5wNcFeoEEqp+Rb46v
-						AqG7mZxR5m4/rXKR7UCIkxVOMZx6uy9ZfvxPWyc6FNUKY86AnK9FiUNOdxdUWw1aDKgGrgwd7lFX
-						tKNZrNo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uppsala-test.blackboard.com/auth-saml/saml/SingleLogout/alias/_102_1"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
-		</md:NameIDFormat>
-    <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:unspecified
-		</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName
-		</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uppsala-test.blackboard.com/auth-saml/saml/SSO/alias/_102_1" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uppsala-test.blackboard.com/auth-saml/saml/SSO/alias/_102_1" index="1"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tommy</md:GivenName>
-    <md:SurName>Stenvi</md:SurName>
-    <md:EmailAddress>mailto:tommy.stenvi@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/urn-mace-feide.no-services-no.inspera.assessment.test.xml b/swamid-2.0/urn-mace-feide.no-services-no.inspera.assessment.test.xml
deleted file mode 100644
index 38c69779..00000000
--- a/swamid-2.0/urn-mace-feide.no-services-no.inspera.assessment.test.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="urn:mace:feide.no:services:no.inspera.assessment.test">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-04-13T08:34:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="false">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Inspera Assessment (T)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Inspera Assessment is a leading European SaaS provider for high stakes assessment.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.inspera.com</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.inspera.com/legal/privacy-notice</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" width="126" height="18">https://www.inspera.com/hubfs/InsperaFall2015/insperaassessment.svg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDVzCCAj+gAwIBAgIJAI4CnpvwSXWDMA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNV
-            BAYTAk5PMQ8wDQYDVQQIDAZOb3J3YXkxDTALBgNVBAcMBE9zbG8xEzARBgNVBAoM
-            Ckluc3BlcmEgQVMwHhcNMTgwMzA1MTEyMjEzWhcNMjMwMzA0MTEyMjEzWjBCMQsw
-            CQYDVQQGEwJOTzEPMA0GA1UECAwGTm9yd2F5MQ0wCwYDVQQHDARPc2xvMRMwEQYD
-            VQQKDApJbnNwZXJhIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-            9xP6LbR7o7xE+4Nfyc+ERYEEdBfFzMoi3RlkXaNnyfz5KhK7J9X8PNQv7OOd+hQ3
-            ygbM7OuWzkvq030C4Qfu0HGNT6/cDQikCjvE4gKZzeqInSkK0fouiaOMBGAwNdDW
-            tWFsoCYPvtuuDlWgxTSem93tL0oxKk8Kq3HVMYEldELlb8WJlBpK+fW7pZyKGiv/
-            0BZoDwt49aJTMI9xixwuZ25XseHd0m8uyE3jWkMZFGEC4f20MrwhPIml9T8V/ZI9
-            a8HUcfarqjKkAL3cvlBu0F3RQxIjZZUlVWLZzGvkejnJELzaCoQertLaZOnTpm2G
-            V87SLqFDrbgb51arOr7hYQIDAQABo1AwTjAdBgNVHQ4EFgQUdwYeh/Do5h3spm/u
-            uJBAa6FZ9uwwHwYDVR0jBBgwFoAUdwYeh/Do5h3spm/uuJBAa6FZ9uwwDAYDVR0T
-            BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAbve3Ezx+JaUpAxC3VlcI/nNUp4hu
-            gTtwAFENo8aFQDkl+d+UjwG8s7+DVg5QKfq86PC3eLqHoVQYfJkyFpCg0mYnd+j3
-            DKrQpGHvHhygLalAAxdLt3iWkOO44+UXI/x9BQfmKz8FxeKhgZUsYeoOu6dMqHEO
-            fqAoHlectwQPkYwBtRFiRPjFVDFYQ6ByJgpvWC74YireWwTG7VBjXmwxH6fRI9Vd
-            s54PP7vYL+FDAc/phqyD/DejCQ6VSEzvujI1n7LhvLrgnPYpcnP9qPQQ4lo8SdPu
-            QbmZguNk1osxdUK0XH/eBFCYKEygmK+7iKPg4C9/w53uSTdolnmsssOWGQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDVzCCAj+gAwIBAgIJAI4CnpvwSXWDMA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNV
-            BAYTAk5PMQ8wDQYDVQQIDAZOb3J3YXkxDTALBgNVBAcMBE9zbG8xEzARBgNVBAoM
-            Ckluc3BlcmEgQVMwHhcNMTgwMzA1MTEyMjEzWhcNMjMwMzA0MTEyMjEzWjBCMQsw
-            CQYDVQQGEwJOTzEPMA0GA1UECAwGTm9yd2F5MQ0wCwYDVQQHDARPc2xvMRMwEQYD
-            VQQKDApJbnNwZXJhIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-            9xP6LbR7o7xE+4Nfyc+ERYEEdBfFzMoi3RlkXaNnyfz5KhK7J9X8PNQv7OOd+hQ3
-            ygbM7OuWzkvq030C4Qfu0HGNT6/cDQikCjvE4gKZzeqInSkK0fouiaOMBGAwNdDW
-            tWFsoCYPvtuuDlWgxTSem93tL0oxKk8Kq3HVMYEldELlb8WJlBpK+fW7pZyKGiv/
-            0BZoDwt49aJTMI9xixwuZ25XseHd0m8uyE3jWkMZFGEC4f20MrwhPIml9T8V/ZI9
-            a8HUcfarqjKkAL3cvlBu0F3RQxIjZZUlVWLZzGvkejnJELzaCoQertLaZOnTpm2G
-            V87SLqFDrbgb51arOr7hYQIDAQABo1AwTjAdBgNVHQ4EFgQUdwYeh/Do5h3spm/u
-            uJBAa6FZ9uwwHwYDVR0jBBgwFoAUdwYeh/Do5h3spm/uuJBAa6FZ9uwwDAYDVR0T
-            BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAbve3Ezx+JaUpAxC3VlcI/nNUp4hu
-            gTtwAFENo8aFQDkl+d+UjwG8s7+DVg5QKfq86PC3eLqHoVQYfJkyFpCg0mYnd+j3
-            DKrQpGHvHhygLalAAxdLt3iWkOO44+UXI/x9BQfmKz8FxeKhgZUsYeoOu6dMqHEO
-            fqAoHlectwQPkYwBtRFiRPjFVDFYQ6ByJgpvWC74YireWwTG7VBjXmwxH6fRI9Vd
-            s54PP7vYL+FDAc/phqyD/DejCQ6VSEzvujI1n7LhvLrgnPYpcnP9qPQQ4lo8SdPu
-            QbmZguNk1osxdUK0XH/eBFCYKEygmK+7iKPg4C9/w53uSTdolnmsssOWGQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
-      </md:EncryptionMethod>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-test.inspera.no/edugain/endpoint/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-test.inspera.no/edugain/endpoint/assertion" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Inspera Assessment Login
-        service (test)</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Inspera
-        Assessment Login service, test environment</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Inspera AS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Inspera</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.inspera.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Inspera Assessment Technical Support Team</md:GivenName>
-    <md:EmailAddress>mailto:support@inspera.no</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Inspera Assessment Administration</md:GivenName>
-    <md:EmailAddress>mailto:firmapost@inspera.no</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Inspera Assessment Service Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@inspera.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/us.cloudmore.com-shibboleth.xml b/swamid-2.0/us.cloudmore.com-shibboleth.xml
deleted file mode 100644
index 945ddc35..00000000
--- a/swamid-2.0/us.cloudmore.com-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://us.cloudmore.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-08T11:09:44Z">
-      <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>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="300" width="300">https://us.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://web.cloudmore.com/privacy/cloudmore-data-processing-terms</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://us.cloudmore.com/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>cmpusfe01.cmp-us.cloudmore.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cmpusfe01.cmp-us.cloudmore.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEITCCAomgAwIBAgIJAKyL/KWR/DdqMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
-BAMTHmNtcHVzZmUwMS5jbXAtdXMuY2xvdWRtb3JlLm5ldDAeFw0xNzA0MDMxMTUy
-MzhaFw0yNzA0MDExMTUyMzhaMCkxJzAlBgNVBAMTHmNtcHVzZmUwMS5jbXAtdXMu
-Y2xvdWRtb3JlLm5ldDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALLz
-RYrrIiv11E8u5ivDKbk8CiAchunwwbzApbg9Gbf03qv+MlWI/TizbB4U78qmUQQo
-rBbrxhxHCG6zh7jmCGrKI525JC/Ggq8eLh5scsReS+h+3dP4OLITYX255AxBXsnf
-puHztUqgmvJalxTqv3ZSj+sgL1Gg9miffZU9Qp+PJTDnvFqryyF5RdtYsM8hl1Hs
-gTgkqq1CfNwjAX+K3KPuaXeI13wX5O5XgLy3GL6AvNcjzR7OK6WRVMzusFV5GDkv
-HDmW1SKPOiwVpEajJFG9ALqYpRcVHWLFC9PbY35aElJppKwI+lOc9+gKoe72Pfzy
-NWktXwcCOQFrKTC+OkdocKD9qU0Ykb5a6jxSke/OqCDXZIDNMtcwkaNq2EVQHQ5l
-m5FSX+7aHkovpZ1EldKeN7bbAHR4vbAHu/TzItw2FTqxIIJ3Dhro+cDxHvt2PkVe
-lHi6FnRKEWD/eKuBa4HYi6wNyPJL5DuTWSa9b6EIHcEAEObx/cLCcO5JyrYCPwID
-AQABo0wwSjApBgNVHREEIjAggh5jbXB1c2ZlMDEuY21wLXVzLmNsb3VkbW9yZS5u
-ZXQwHQYDVR0OBBYEFCIqTffYDcKPd0MsT7uJPMPSdFXBMA0GCSqGSIb3DQEBCwUA
-A4IBgQA6x3KG35Lo6+WdDiHc6jItmA3NVtwEa7yP65+e58eDsFwkcZKMpriKT1j6
-oAQLCo9gm90iTMB6Bp3w49Ugff1ZWp8XQDkS5XATB8kuefdclzT8e0l7AZY3XHVP
-wAzc9xIx8fPDzX7EaQWdUKag+xhC3KarIM+fxIi2bpTl/dmqMlfZXnqYD7xwn/d5
-YL+WaojEcT+bAjwBENRveVJzE8F2zP9XWoac+Kq5m+bpUk4mbdsiyopM+JyQbv0v
-LbdC4ymC3I3g7UWdnrOVIxvAmpZSvfcrltBcq3YUYbNUqN0JBi3yp+vM3YC/Wy5z
-1u9OtZv4XRHYhc4MWrHdpQQ9XmM2fP2Z3IUDD6wrt/oD0bsyZikfS+vQyeWKxVpR
-mNH2YgIOVvKd7FdBOG/Azmal9DDVIRBVT71v/UOR3iQKLemFIKbYeLAlDE3bruDF
-pyWYJhS1xRUZKLOk/yUKNAXBGehk9HjEibygik5sJkYKQ4lVNXyXq06saSeR/Sf0
-LAkq68U=
-</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://us.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://us.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://us.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://us.cloudmore.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://us.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://us.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://us.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://us.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://us.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://us.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Cloudmore</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/use-uu.sitevision.se.xml b/swamid-2.0/use-uu.sitevision.se.xml
deleted file mode 100644
index 03943eff..00000000
--- a/swamid-2.0/use-uu.sitevision.se.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://use-uu.sitevision.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-24T15:33:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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="en">Uppsala universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Uppsala University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Här loggar du in till de interna sidorna för studenter och anställda vid Uppsala universitet. Har du frågor om inloggningen eller hur du använder de interna sidorna? Kontakta servicedesk@.uu.se</mdui:Description>
-        <mdui:Description xml:lang="en">On this page you log in to the internal pages for students and employees at Uppsala University. If you have questions about the login function or how to use the internal pages please contact servicedesk@uu.se</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uu.se/om-uu/dataskyddspolicy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.uu.se/en/about-uu/data-protection-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIGAXl6Z5EuMA0GCSqGSIb3DQEBCwUAMD8xJTAjBgNVBAMMHGh0dHBzOi8v
-dXNlLXV1LnNpdGV2aXNpb24uc2UxFjAUBgNVBAsMDXNpdGV2aXNpb24tc3AwHhcNMjEwNTE3MTI1
-NzU4WhcNMzEwNTE1MTI1NzU4WjA/MSUwIwYDVQQDDBxodHRwczovL3VzZS11dS5zaXRldmlzaW9u
-LnNlMRYwFAYDVQQLDA1zaXRldmlzaW9uLXNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAkZpF9FI4GGy1BVD2iFH21yVx+Dmx3XC39vo3wET/xNoZLTSM2DYRotFgeeO6fl/2weNevKJ7
-XKPj45oiFUmApXgNSDdpW029G/4mzlVcCZwPKoSE/9TgSX8fJjRylbL2dRuOMY46HQHijplEEQZA
-QeBQCnuEk3cLWUohXFg9umtHJJKgXmYVHKCLDuVvcO6YHPhmLJ4HPeSxFyBUlD/bZ1jqyIR1tY8K
-XhxwAL2dlshehB9yYvqFd3C/MqJD1ZhlkWX2k6KvRW3kpNosMWirtPmAkx1RsQudTELnBJS1g/0x
-VK0IB3ZbE21ud5bXtK5aaQLPqk29rteah4LGlaSMuwIDAQABo0IwQDAdBgNVHQ4EFgQUszSp3juS
-ZqgVwA6K1pEZNATrmg8wHwYDVR0jBBgwFoAUszSp3juSZqgVwA6K1pEZNATrmg8wDQYJKoZIhvcN
-AQELBQADggEBAEeXZZAhXv8cQb3Z8EMPgbdIfSEeJz44T/dl5VPuGA2JyMCmzHs0hOmf45WZL+YV
-NYMGR+q+9wheRd5zKF000tQnafOa98rRw8yBjTN6Bo71cLmMfIp4Mc7I8f0M/g5shtZeW7FoFH16
-gYxDCI2Mnq6cYBUc077lNclKAlJx4AvaGIsJGz04DWTz4/8tuTktZaH6GDXrsMHM63ZcluGFSrOq
-AccfOhkZn9ZamLQp54W4/Ge2E8zfW7znk7seZiRel4dQn3Cg3Miy9D46BsN7WGulIE81cYtEtWHV
-7PlPpWDWTq6acw0sdjOc9dLtnoeT3RuyOj+nk1iN8LGf/mdR5IE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIGAXl6Z5EuMA0GCSqGSIb3DQEBCwUAMD8xJTAjBgNVBAMMHGh0dHBzOi8v
-dXNlLXV1LnNpdGV2aXNpb24uc2UxFjAUBgNVBAsMDXNpdGV2aXNpb24tc3AwHhcNMjEwNTE3MTI1
-NzU4WhcNMzEwNTE1MTI1NzU4WjA/MSUwIwYDVQQDDBxodHRwczovL3VzZS11dS5zaXRldmlzaW9u
-LnNlMRYwFAYDVQQLDA1zaXRldmlzaW9uLXNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAkZpF9FI4GGy1BVD2iFH21yVx+Dmx3XC39vo3wET/xNoZLTSM2DYRotFgeeO6fl/2weNevKJ7
-XKPj45oiFUmApXgNSDdpW029G/4mzlVcCZwPKoSE/9TgSX8fJjRylbL2dRuOMY46HQHijplEEQZA
-QeBQCnuEk3cLWUohXFg9umtHJJKgXmYVHKCLDuVvcO6YHPhmLJ4HPeSxFyBUlD/bZ1jqyIR1tY8K
-XhxwAL2dlshehB9yYvqFd3C/MqJD1ZhlkWX2k6KvRW3kpNosMWirtPmAkx1RsQudTELnBJS1g/0x
-VK0IB3ZbE21ud5bXtK5aaQLPqk29rteah4LGlaSMuwIDAQABo0IwQDAdBgNVHQ4EFgQUszSp3juS
-ZqgVwA6K1pEZNATrmg8wHwYDVR0jBBgwFoAUszSp3juSZqgVwA6K1pEZNATrmg8wDQYJKoZIhvcN
-AQELBQADggEBAEeXZZAhXv8cQb3Z8EMPgbdIfSEeJz44T/dl5VPuGA2JyMCmzHs0hOmf45WZL+YV
-NYMGR+q+9wheRd5zKF000tQnafOa98rRw8yBjTN6Bo71cLmMfIp4Mc7I8f0M/g5shtZeW7FoFH16
-gYxDCI2Mnq6cYBUc077lNclKAlJx4AvaGIsJGz04DWTz4/8tuTktZaH6GDXrsMHM63ZcluGFSrOq
-AccfOhkZn9ZamLQp54W4/Ge2E8zfW7znk7seZiRel4dQn3Cg3Miy9D46BsN7WGulIE81cYtEtWHV
-7PlPpWDWTq6acw0sdjOc9dLtnoeT3RuyOj+nk1iN8LGf/mdR5IE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://use-uu.sitevision.se/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://use-uu.sitevision.se/saml/LogoutServiceHTTPRedirectResponse"/>
-    <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://use-uu.sitevision.se/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Uppsala universitet</md:ServiceName>
-      <md:ServiceName xml:lang="en">Uppsala University</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/vhs-dev01.dyndns.org-shibboleth-sp.xml b/swamid-2.0/vhs-dev01.dyndns.org-shibboleth-sp.xml
deleted file mode 100644
index d0a420ac..00000000
--- a/swamid-2.0/vhs-dev01.dyndns.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://vhs-dev01.dyndns.org/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>ip-10-228-21-235.eu-west-1.compute.internal</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ip-10-228-21-235.eu-west-1.compute.internal</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAOOKwExQhI7MMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
-BAMTK2lwLTEwLTIyOC0yMS0yMzUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
-HhcNMTAxMDA2MDg0MjExWhcNMjAxMDAzMDg0MjExWjA2MTQwMgYDVQQDEytpcC0x
-MC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv11UTIKVlVN7DfY78bJ187coQZmLt3ey
-J1Qf1EkSufI1Iyz49XkCZslWEMBJiNcH0bcjdLIqm9NCuJtd+Bk0fZxg1yZJ1qAA
-2nt7fQ/wZrnkMlnbOkpzDLh0+CSynD76Z4Iv5BeSOUxSQuqzxB5+pGqDjdrX7NHZ
-vb13fYoMy76zAJnnRBjwnTCNnQiuzsisC9bdEJmFZEzWy0/QZYS8/RNanI8yOpPk
-hEXCm2YToWA+8vWiTo5qKzYwwDjsOwTAh4+NJhSIHS2QVKa3yIDR/LSRsSJHhVT+
-BOr/H+41m3FHebryU+OyM+nr02onkpDDIqAe1BAo1Ae6BlHukkd8jQIDAQABo1kw
-VzA2BgNVHREELzAtgitpcC0xMC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRl
-LmludGVybmFsMB0GA1UdDgQWBBQIudTe1ZcxpNPgLs9PaX2TtzBxvjANBgkqhkiG
-9w0BAQUFAAOCAQEAgr6asZTswOFw7iBfD5mWu2Yon2IRMnEZDmq3aIvbzqeM2K6X
-+CQzlmyP36Ctt3F3yMDfl4AyA4thju3wsCH50sD2g8CACFMUvIk2v8/cbpbURNoV
-1mZwqVS7xQ+CmwWTVgqmPKk7WXQ9kqbknA5jVYzJmRBhylS6kwFGkjQUKlVaS29j
-Ou/sOMAgf9ub7LI0tWT1e6Mz83uFx+vdTuzvUVc+ufuUIDTdVeV9ZdjBRusc/FQe
-OrhnrrEum5QGmuXYb1mFs/TAqiQrGKbLoHAOqqAvDKOg5rX774JGnuv9DSVaeawB
-wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>ip-10-228-21-235.eu-west-1.compute.internal</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ip-10-228-21-235.eu-west-1.compute.internal</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAOOKwExQhI7MMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
-BAMTK2lwLTEwLTIyOC0yMS0yMzUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
-HhcNMTAxMDA2MDg0MjExWhcNMjAxMDAzMDg0MjExWjA2MTQwMgYDVQQDEytpcC0x
-MC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv11UTIKVlVN7DfY78bJ187coQZmLt3ey
-J1Qf1EkSufI1Iyz49XkCZslWEMBJiNcH0bcjdLIqm9NCuJtd+Bk0fZxg1yZJ1qAA
-2nt7fQ/wZrnkMlnbOkpzDLh0+CSynD76Z4Iv5BeSOUxSQuqzxB5+pGqDjdrX7NHZ
-vb13fYoMy76zAJnnRBjwnTCNnQiuzsisC9bdEJmFZEzWy0/QZYS8/RNanI8yOpPk
-hEXCm2YToWA+8vWiTo5qKzYwwDjsOwTAh4+NJhSIHS2QVKa3yIDR/LSRsSJHhVT+
-BOr/H+41m3FHebryU+OyM+nr02onkpDDIqAe1BAo1Ae6BlHukkd8jQIDAQABo1kw
-VzA2BgNVHREELzAtgitpcC0xMC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRl
-LmludGVybmFsMB0GA1UdDgQWBBQIudTe1ZcxpNPgLs9PaX2TtzBxvjANBgkqhkiG
-9w0BAQUFAAOCAQEAgr6asZTswOFw7iBfD5mWu2Yon2IRMnEZDmq3aIvbzqeM2K6X
-+CQzlmyP36Ctt3F3yMDfl4AyA4thju3wsCH50sD2g8CACFMUvIk2v8/cbpbURNoV
-1mZwqVS7xQ+CmwWTVgqmPKk7WXQ9kqbknA5jVYzJmRBhylS6kwFGkjQUKlVaS29j
-Ou/sOMAgf9ub7LI0tWT1e6Mz83uFx+vdTuzvUVc+ufuUIDTdVeV9ZdjBRusc/FQe
-OrhnrrEum5QGmuXYb1mFs/TAqiQrGKbLoHAOqqAvDKOg5rX774JGnuv9DSVaeawB
-wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/vmfront.lan.kth.se-shibboleth.xml b/swamid-2.0/vmfront.lan.kth.se-shibboleth.xml
deleted file mode 100644
index e6102b96..00000000
--- a/swamid-2.0/vmfront.lan.kth.se-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://vmfront.lan.kth.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vmfront.lan.kth.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>vmfront.lan.kth.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vmfront.lan.kth.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAIZPkpPDLV8WMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnZtZnJvbnQubGFuLmt0aC5zZTAeFw0xMDA1MjAxMzM1MTFaFw0yMDA1MTcx
-MzM1MTFaMB0xGzAZBgNVBAMTEnZtZnJvbnQubGFuLmt0aC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANG4IsTSEChitjEA/isd7hZVlzXCUwJWOrXs
-xjtLzFsFaU+3Of99SrRfhlB866d0L6U6VfVkuvonOw/2HCXGA1JpPIfIc10vEIZL
-iLPvPdBDCRk09qUDlyqDj5P2hD8G+pA/luA1DIXTd6bImV+ciCWM1/AOuPhiAt7A
-zsawVY6S0K2rkDO3pPs13pfhJEdC8+w7HDJG5WWA79rp0MVr1REUh2p71EWfVWh/
-ecXdLvMLrBpMToP5e9v1ZUIEFBFlbQiI2wetvcWNdo7kJYfplZ/g3zLxvtMfFa0q
-JWeV01bOKFXprQz8xsqzdhGq9zD3VezIzu6EdWdQ8T0tAgWHpvUCAwEAAaNUMFIw
-MQYDVR0RBCowKIISdm1mcm9udC5sYW4ua3RoLnNlhhJ2bWZyb250Lmxhbi5rdGgu
-c2UwHQYDVR0OBBYEFJuONt6BkLHzl/nbr7xujmkWlT5CMA0GCSqGSIb3DQEBBQUA
-A4IBAQBOEYkvNmbN23mTD5Kt7/gvcsIxIP9MEYNXn04u1oJhWVT4FhbXfdrxeapi
-7Mu7ozsQazUq0wQ7OK5UgYu53gz3lCp9rIr4X51CMDKaXlIIzba/cAw8WTQmvygu
-hPGS63MlZux4dw9N7a4yxffmKhokW2ZAamoMjbojgPUj/2uqLrc4rmxmg2g5XV/s
-lfZ0HfL19JANfzFtjeapBcllg/lnYuCNh/CzMB1z2RQqXNI+kdR3nWTUiaegtdmo
-OX/SIGPWQxxjY47ggv4d3pW5orhZzzM5Qjj8WbZ3hrK0thaZzebh3gzJ9mGEakoF
-nvPUXwQpAourZJSyt5BJwx3dJT1b
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>vmfront.lan.kth.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vmfront.lan.kth.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAIZPkpPDLV8WMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnZtZnJvbnQubGFuLmt0aC5zZTAeFw0xMDA1MjAxMzM1MTFaFw0yMDA1MTcx
-MzM1MTFaMB0xGzAZBgNVBAMTEnZtZnJvbnQubGFuLmt0aC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANG4IsTSEChitjEA/isd7hZVlzXCUwJWOrXs
-xjtLzFsFaU+3Of99SrRfhlB866d0L6U6VfVkuvonOw/2HCXGA1JpPIfIc10vEIZL
-iLPvPdBDCRk09qUDlyqDj5P2hD8G+pA/luA1DIXTd6bImV+ciCWM1/AOuPhiAt7A
-zsawVY6S0K2rkDO3pPs13pfhJEdC8+w7HDJG5WWA79rp0MVr1REUh2p71EWfVWh/
-ecXdLvMLrBpMToP5e9v1ZUIEFBFlbQiI2wetvcWNdo7kJYfplZ/g3zLxvtMfFa0q
-JWeV01bOKFXprQz8xsqzdhGq9zD3VezIzu6EdWdQ8T0tAgWHpvUCAwEAAaNUMFIw
-MQYDVR0RBCowKIISdm1mcm9udC5sYW4ua3RoLnNlhhJ2bWZyb250Lmxhbi5rdGgu
-c2UwHQYDVR0OBBYEFJuONt6BkLHzl/nbr7xujmkWlT5CMA0GCSqGSIb3DQEBBQUA
-A4IBAQBOEYkvNmbN23mTD5Kt7/gvcsIxIP9MEYNXn04u1oJhWVT4FhbXfdrxeapi
-7Mu7ozsQazUq0wQ7OK5UgYu53gz3lCp9rIr4X51CMDKaXlIIzba/cAw8WTQmvygu
-hPGS63MlZux4dw9N7a4yxffmKhokW2ZAamoMjbojgPUj/2uqLrc4rmxmg2g5XV/s
-lfZ0HfL19JANfzFtjeapBcllg/lnYuCNh/CzMB1z2RQqXNI+kdR3nWTUiaegtdmo
-OX/SIGPWQxxjY47ggv4d3pW5orhZzzM5Qjj8WbZ3hrK0thaZzebh3gzJ9mGEakoF
-nvPUXwQpAourZJSyt5BJwx3dJT1b
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmfront.lan.kth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmfront.lan.kth.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmfront.lan.kth.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmfront.lan.kth.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vmfront.lan.kth.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml
deleted file mode 100644
index 34a5da69..00000000
--- a/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://weblogin-test-v4.kau.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-02T12:39:53Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://weblogin-test.kau.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Karlstad University v4 test IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Karlstad University v4 test IdP</mdui:Description>
-        <mdui:Description xml:lang="sv">Karlstads universitet v4 test IdP</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Karlstads universitet v4 test IdP</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/themes/custom/kau16/images/logotype.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/themes/custom/kau16/images/logotype.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin-test.kau.se/information.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin-test.kau.se/information.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kau.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
-        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
-        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-      </mdui:DiscoHints>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kau.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
-        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
-        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFSDCCAzCgAwIBAgIVAK3hJPC38AiIQXjA79Aky/ceGCDUMA0GCSqGSIb3DQEB
-CwUAMCIxIDAeBgNVBAMMF3dlYmxvZ2luLXRlc3QtdjQua2F1LnNlMB4XDTIyMDYy
-MTA4MzIzM1oXDTQyMDYyMTA4MzIzM1owIjEgMB4GA1UEAwwXd2VibG9naW4tdGVz
-dC12NC5rYXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC1k9bL
-++zRcegCvIPwc6c0uoqWbfNsXFreLqEfOzi3fd1Yb8aEBVaATlyqMu6uAZLXrLF6
-IVB0okugeDHKtM3iG/V8aoN++UeIPs35cmqXO0pULaWikGCEBDKVFKx3fpVx8m0E
-K3gN/R6JQa17DGirTWtmmFFWb0Dtj36RYrg19yzMZiWl2Y2O5D9KdEZ5zUEa5U79
-AzipieRolsRb0SXiemN9W8BE1wbiJyKljX7nfQLiZR5TmoQVTmoeJp9eLBFmxLK+
-UXavE8M28aA3pxJeuMDtLDC7NUGI493UYX9SqPXY+1D85ACAlumB+1xY5AQ6eh5o
-EonmhFK3tKhlWn6/fqEs0G9Md01OoxW+s7bfJH82giU5aDLIQZrE3cGIUo6mj4ru
-0RxJgJwY54VtncNhMI405pNFosTORS4YYjwCgr/sW5FDs7c1bKMi87+IOC7upJ/3
-u2uDK/jK0CV+qsk0ZyQ1A2M3zkZMHanj/ZcciQcqoG3F0GKRzEm9i65Vudy2peUX
-oIEgPkKtAPhJqU4sP5yvJeF1KYGi+yVvqIyRTdUux1QBA6UttWLFeYS/2Lp74eqT
-+fI5wbqjgfZEyuk3H0qPWnYuWHBukwqhJVQAb6ZaASnN6BsyRT3ZpPmttxe2NFXR
-AetlcOKqTsEB80OgGjHjePhDWdtXmqC0sWcRxwIDAQABo3UwczAdBgNVHQ4EFgQU
-z5BC4sAbcWPAvEPbEjYx40bC80UwUgYDVR0RBEswSYIXd2VibG9naW4tdGVzdC12
-NC5rYXUuc2WGLmh0dHBzOi8vd2VibG9naW4tdGVzdC12NC5rYXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggIBACDH9lO3dFEOANCHCcljmBEZAtAI
-RTTMiW30fZkuBN3bUu25dHSDSmSt7AfXUjdkLkV0ziPPFAUgldvFyBRyjBxd+5WJ
-7rnP+FJ4YYFj5fol7C0+ZMX+G7T37ya4EmytI4xhQpPWesg1WSFstZnIPeo7o10H
-9bIgFfCQ6IhmfdpiDrUW+fVsLoJcVYOOGfEaoCHV6Q0dfhF6rsgbh66t7lxUa9zD
-/F3yuUzNWEdH0jAcW/wU7mSaeEOAAHuU6h96wGd7Z6tiqLB8/tezMeIkU61HkDNs
-btkXPA1RwuHH6jPtXSefgwAlLM0OeR+uwSBtSN38n4/utx+99at6tpmWQVZkMDj2
-KCUWp8+KNyzW9rZtEvW5bqxWMB8Esj9TbB8cQfYJOuaYNffpHYwTIMKwXL6snLot
-a7RqzY158AmMC4X9Ts7fvsCYsVQG7HMjRofluuEv/v6YFnAk5SifsPJGStDpcifO
-zm75pl9JzrXAyNyj7fkaSKDnzO0O8iGfg0IBs8jz49MhPISdI+vC/mjOYdPydwxn
-Q4BnLQi7CG3VbRhmkEpwkBZ19UvFUfvpxulubcomnfVYse1i+snMo+jbzxxxosm/
-mzx1d1VU1xwEfspoOFI6wKhW/eoWyCMCTXR+mxALDu9/wGbo8+m1TyhUTwzcVaOO
-ZIEHQfl81U/gUVLi
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFSDCCAzCgAwIBAgIVANBSNV8Fym0k+wYlloWqL27Pvhv4MA0GCSqGSIb3DQEB
-CwUAMCIxIDAeBgNVBAMMF3dlYmxvZ2luLXRlc3QtdjQua2F1LnNlMB4XDTIyMDYy
-MTA4MzE1NFoXDTQyMDYyMTA4MzE1NFowIjEgMB4GA1UEAwwXd2VibG9naW4tdGVz
-dC12NC5rYXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFYBAr
-EZKh27UsRvs+r4ihtVWJZ44b3O+FSFsh+1lV+elZwek2nmkfNd431l1Tv+b7S31W
-eqN+6z5+3r6nKdyPo3BB+Erxa3LaW0Vn9gq9gUAyHgV1cNVHcdYO7YbyLympxopX
-Hp/fs6MGzHezpxlsSyxWvK0otnpwfBRUi5PDGBrxQGB8fXzbM7uDgEw6kM678Dz4
-ip580JsiJ8k2+D8isqdVMWSbzMyrzLJNhmUCsvDNOC9j3S97z8c4xxT/nqOBqSDN
-IiGEEFV08/2PL0+sRdIg7u3uXqXPo+/wR1t8xSX4dh7dxxPsdKV+3lQBf9T3N0kq
-8TcOTooJBwX2L3+4QmPSoEg+6CMAELgnsJgg/81312/XmQxohc4C3oilNZdtUo1z
-3HKCfxM8eaXfb0gUKzNCd8NCOWjhntc/Cfkg+fVb9eUvXoHqkp4/oI+VEhLb9MZu
-39oFEBMRTSEUrT/cP113/h+qazwuDIK+9ROzYm74DLOoB6QYEUNqqse+LV7NMUum
-t5wLbxDQmuSWEMh4Gf5mc6FI5C0JV3RUaaFQx8U7JEfdkhSu9Lyv+fUDUYwgbkSR
-Wjnt8jKnpEsEqFoNPN75TExTJFoerVDpLQgeuNDhB4WpiB/hBkru+0Ar+gU9/AAE
-DMiw8/phNnvToZCENisdQQKu3qhau0UHJstcyQIDAQABo3UwczAdBgNVHQ4EFgQU
-PTINVWwKullQ8KBPOEih3ssJVCowUgYDVR0RBEswSYIXd2VibG9naW4tdGVzdC12
-NC5rYXUuc2WGLmh0dHBzOi8vd2VibG9naW4tdGVzdC12NC5rYXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggIBAGdI9pD5p/ZcuchkaEAYItATo81/
-gzv/CZyP4Hg0nYSUG3r+yXOOV1yCv5NPT0FXvdIJm9ONYBOB4ShZKLnQpWnJppPm
-XAg6eJ85wWt+ubvQwHUETey0zfmvUgF+jN1wBaHvMeoELdsxhUOZMjeNnjApLivJ
-HFV2VujXj8zH16MFvADdNLf9qy0AWEnDIaFqGu4dFZJRdXeTYPaCDAgewXIIXjUj
-CTi+buw2svZxV7fp9Cc0/KDxIxWMAICm5+T+r3T7L39OTxcVwFfvzZf+322iMoSl
-NXeoONDHKSxVRWK+Y/DbGlXUIDCtqmTecQF7GrjHcWhxQGJfNdApChsrh/xvZQJQ
-EQ4mkYABcALlB5DAhfGxZMzyyLXufH7OMBe7mC9FpifcxmCaErqtD3iPuR1v/vjP
-ml9iVTDe1cnnKOrz5M3gPxvUOLFFYzn8JZely3F8va4a0FAYIO5XuKL9F1PoLY0N
-5f2cRR6GklzvD/Bew26F4Q6cOW7ttNT9LOFR1PEG7F54FEIPCpEAvCpZBObwCzWP
-HVUqbPa95AcSUn3h8z3d9IxD1X1YlWkwAexZlcecaA1ex8txd2U355X51WZ3BAuN
-XUWnXrKJUDfzJne/dgoq0XPc8GTxsh5asQEtdgegWgAFVdquT/TTQJAkwCZS+vr/
-SQNkhhhQFosZbvKp
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFRzCCAy+gAwIBAgIUHWtZUtNwHkIdfqv6JaH+SnTXRmAwDQYJKoZIhvcNAQEL
-BQAwIjEgMB4GA1UEAwwXd2VibG9naW4tdGVzdC12NC5rYXUuc2UwHhcNMjIwNjIx
-MDgzMTU0WhcNNDIwNjIxMDgzMTU0WjAiMSAwHgYDVQQDDBd3ZWJsb2dpbi10ZXN0
-LXY0LmthdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALV2mu+h
-sBzA8+KNWnFAJh7vi08Rr6KU8NyLyHWK+2Tk3gWmtQLS18kMxlRlRsmxX6t2MEI2
-2OzOgli/6gLbspMlhd2bZSbHz5efqUIYjO832RFIfuQkPKeEYkevx8XdO9S5tjpq
-sY7VOgq6rPfg4DKBTGP8uyXZiAZLjl9rHLYtmKSM0k71eqVTWbsYXQcFO+G6CaAl
-y4ZVpOpWJbhA6tdnER9g2PwQpCyQ+7pTZF43bESnEzEd8aO9dPZMI+UVUjkQ1Vo2
-LUhjnMCnEB3DWtlDf47QVTv2hNNg+8iM3Ux27HJBCDnMcT/uNKVI/0Gp6kuqK6sN
-teelzsz9flmVZ9/gunguw+vV99Gcq+eA7CRXh5gROQceXmk56LSSGzEhAu6BYEka
-vdkerv0N3sBLY7tUsWxynIi38PfAkdKa5HuY83vPNPspZd3iaFSF6PYAcsAKOCV8
-FxaMf5pG75kJpysrKAINJsCIdrui7mR8JfC2tqAj+DV8Jsdm/zquhTwLVc7uWbTB
-Scc9g9oNyJFvFxiJasI98Qhv0wv95E3v8UGHufNhseYBuAlqnmMUBwSj82YwyE9e
-DLdDkR5D2WMJMkKOn531lH0QzhmFULXpCbhedGAnVeRdyb6weqZWsQ7C6D2Urcy6
-GvIE5tvUfCNXEwvQ2S5vU4fnRa860GBoPherAgMBAAGjdTBzMB0GA1UdDgQWBBTH
-OGGY2vifqXvOkoK8au7N2HijVDBSBgNVHREESzBJghd3ZWJsb2dpbi10ZXN0LXY0
-LmthdS5zZYYuaHR0cHM6Ly93ZWJsb2dpbi10ZXN0LXY0LmthdS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAgEAEK0e6L4CTdhKDEsKHy3IOLUs9bP4
-9ohfZZAJhWTTZWy9ULrcDl//zfeCDXMZpE3061skhzEcoMV5rs2ZerHwu2zL0Gw0
-TWnSPFc0B9y2tO21WIQ3OB3Y9xpTMtGHyVJEYbmQYq43KjBkBbuMhM8IjPy+BfO7
-tM/F+uJxDGwtC32zLLF6TtgTu7WxE2aAw6GDYv71zKR5YJubn4nMUSQ/QfGIUGAQ
-r2EjQWOnMW/BHN9IyISas29RTZ3/5A0zLaHR+Ptjs7NEe6TPiVnhuFjMPIrLZ6dX
-iHGL+P76mi1kdoqrzhjFoo5KwMyvInPKTG14mtb2Z2IKon0b2eorxmZXJoNiRzZO
-vNjfgxqkYxGJiTRmlcGldW3jY0vG7ogasnGbvXxwvWXpSb2AE2F+iBpOg9qptbp4
-v3kKn0z0sOOvxAUpT3Nevw9ZuATydoyDyaIyV/qyuHbWN3AUhREwM3pygg6TsV22
-gnrCoE/QqjNbPiwGgHfiAZ2WmZdI96M5p6l43jHexXSwQB+clQtC8qhsGSQqIl0A
-ciNZ3H3meQ+c7qoHb0p50dkBYGi5d/Dlr+MBVCtF8gh/sqvMfwJ1d5lBad4IF7IS
-sGr7Vpsw+kPCOPt1Qsx21X5yhJQCl4Dbv0N54LzOKGFbQU7wcNOvKOPuw1JSVmZX
-YgmmVKJz7UoRoFo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test-v4.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" ns7:supportsRequestedAttributes="true" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kau.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.kau.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 54 700 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
deleted file mode 100644
index 3947cda0..00000000
--- a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://weblogin-test.kau.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-01-18T15:30:16Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://weblogin-test.kau.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karlstads universitet test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlstad University test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test Identity Provider för Karlstads universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Test Identity Provider for Karlstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/themes/custom/kau16/images/logotype.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/themes/custom/kau16/images/logotype.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin-test.kau.se/information.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin-test.kau.se/information.html</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kau.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
-        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUUrhSwzSvtWaZ3Sfu6psWXurK16MwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYxMTE1MTIx
-NzI1WhcNMzYxMTE1MTIxNzI1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI0rC0NVNdCUVfX4
-5/eW0SQRcI+U8BBSQSsxJExYovxZKbQHoInYtq/e8Xeof1OHF/R47jXvUizlid/D
-e879yIW0dK7kfQIhgKx4DY/HrDfvyEirl6rOWbAxcIC/cyQ454a0zAO+97t6Tevk
-kJ5OvXMS+9Z9AvPyahEdUlu6IVRNh+Y06TCik5Nklf8P7xIz7PeRJz9KeLJ1LSOa
-2nzvtQcqhfkQDoGwRWePzqOgsA4bBvkD5KYBKCs9uWlLqWg3WeDORBsKE67GhpeJ
-clxch+qur4yQB+VPfnipKnAvVKGGyLQS+Rk09bEezvZF9ovStA2FMSJeYNmXQoke
-UCYJ41MCAwEAAaNvMG0wHQYDVR0OBBYEFIBqQyfJedY0G2VtXyCRgbmKQgaLMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBQ
-4Gw+2mPSsTQT07wC6ylolVaJa6b9Qs81RXx2yH8A3hxYrIXsj98W/TZx/4T4Oeax
-ckky2CkpU4be9c/+AGt0sf8r2RLsOXjbG8lqNlyyHQYixzyvSYlDPgN0QRMHou9S
-4qltAzINnr0kKBH2TOSsIuwL0xggbj6BkyeqF8UpG/b1+QGvNtRfl7KifPPYboyV
-esym0FXxpLKsgChIE2x/N5iw7pwUwVvOW2v2KvYRMPDpB0iJUFas2kvmu2awmlj1
-yzduSmw52mERZMSVFLOexYdKoOWH9nMPgnyPra5Oc0KqfVchGLJRG1HtVX/Z2wAm
-fCvevJT42mGDX9mPl/QB
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVANO9ZEcWOcaE73HSok8HY1oi589fMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFHdlYmxvZ2luLXRlc3Qua2F1LnNlMB4XDTE2MTExNTEy
-MTcyNFoXDTM2MTExNTEyMTcyNFowHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5r
-YXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBGu7AOcfqPCoO
-IFKKwVVjP0rrp2nm08vG071NAyUgEu0ukcNmlf1lZ6sqZHCspNrlXk1oez6CHGnr
-yUtr9uvQnzglBx8o4lLir+KnPmlrYRMpjIO1tXiRWzEtpaEsU84wMEH23W/GJu8J
-daGftlse0fnPq2hDeO7+w8FZSPV3wFfpL+OTzt36w0MdfuLZKEvk2fbBuG3DiZIy
-fuBlL0sARs5OKFx8o2le8REB6ajQUYfexYxXKsAwA7NLQptg1NoZRex1g2SdfHG5
-XKLE5UH6OFCa9fL7s258sInLosb6mw5FBMvlgOAHzYtLOjrAJH5lhqz+CZectr7f
-nVg56c4RAgMBAAGjbzBtMB0GA1UdDgQWBBTacYJ4P3uc/ZXfv5CbMowF9jDweDBM
-BgNVHREERTBDghR3ZWJsb2dpbi10ZXN0LmthdS5zZYYraHR0cHM6Ly93ZWJsb2dp
-bi10ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-Vb5bTcgigvuPNGNbq+EPMpdtcExsSP4ZKYvqBvDxM168rpLE5F2rG/IOHAU6S9wZ
-4Rc3wKSOE79TkgK3LCjvubnJn+tqXYKPuaN40DWVPUUEmj6ppr+BNmdA1wMe5Jl0
-ap4cMCWh3uy8stgciEXyJXLl4JWTG7Cecvc4m7Z89djzcwAXOTMDeHObwWdm1VLJ
-IrGe9GfEBeelTew/ksD/99/cwfhRaeo0RRE/lh5Ibr6ggTVJDqgkCgBuU69eYBOh
-RDXg7YJCZfGxGPha9x3MDIh080vgMF3APdlj576a7CZnZ5gOSIu6mUwmCOOO1xeQ
-yuEBUW3NO/r+NDLDCkwM7Q==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUchvMI8WNSpt59S81zxzw+PM/rSAwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYxMTE1MTIx
-NzI1WhcNMzYxMTE1MTIxNzI1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIk333N/jPkJPyuD
-n4sz2fPa1HxGusVSO6zZIKc+WA2rBlOxmhjFcM+qDBVDBKwM0yMn3vV4TfouI/Zf
-C6M/HvLRGFoq1uiHXzv4nhvcluMkWhKUZSSRN3P2Ib53iCuvB2ZPDF7DkLkxEZEQ
-rndXvmZh8DyfgmDjN+eHRUQshb3gCjKa5j77clHuBdrb5yAy4eXqZgJC7V2BaW00
-DgyNOJH9L8ML9hxgSfRO8bYwoza2iFFdPaAWZGOkSMWHzQCTOQTcAqOi3tGC4Ayf
-jMc0qj+qI89ZhpQAcW7mOaBmXJUfycO69MRaVsC5q+Pb7Hlr5QFOYCCa0Wy7dgvI
-gvIj1X0CAwEAAaNvMG0wHQYDVR0OBBYEFH+rnSw6NZACHD6P3bgW1n1CtQ+IMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB5
-sNSGtEC55eyN5m6ppYVIvv1LcnZ6wI4vZIQ4adKPScw7u8ipxmXSlFybJpOkbkCH
-/Tybhz8TvvsZoUQdrB7cxYMeKOwhoAU2KiD4E/I3hSYXMZ2HTTnY1mRBwlRXlJ3m
-gBSt/tOnmiEVLDc0/Lvloh3BHHZuTdy5YRfUXEtVVGq5YFf4joMcEKccNhIR5fBu
-u+ijMqlp8OwBWO9Hrbatd0CIzpg1zWT7JvoAHPs68SF1ktPCwH+1+P+cTncww/Wb
-2/K5pAbEiMSlG4vS2jZiGSbW0ELfzPIyxbIwv3X4J+3MdEikuoK4atC/daJhVuxU
-tcbcOrD8hYtnkJ0VE3Ns
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test.kau.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">KAU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.kau.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.kau.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 54 700 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
deleted file mode 100644
index a34145ea..00000000
--- a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://weblogin.kau.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-06T12:42:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://weblogin.kau.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="280" width="248">https://www.kau.se/themes/custom/kau16/images/logotype.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="280" width="248">https://www.kau.se/themes/custom/kau16/images/logotype.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.kau.se/information.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.kau.se/information.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kau.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
-        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAKqRgJlUZAb1CREA2cmklaWM4Hs/MA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMjBa
-Fw0zNjAzMjUxMTAyMjBaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrfx2rTVhTB7Pm0oTIvfBpSwkLk
-D8U7RYZH8vx+tOKWZp2d6g6QBOxpaNAZRKpvJoj/vclG37HKjkNi8xQQSNAWqUqo
-Gg7HTbg7GP/Q4MR5SVKZNsxTg4y9xz18Z2+YmiU26XLZHg1S1Dpvz1QkP/bWK4Ci
-7hIcANs//xJnurUHkxOJELtsx3NgR/SGCS3THcZhzFd1kr8c6vnjO6FBywUkbcdP
-pnyRmJnP17PL6r51f29m8/PDXghA98m04mB6p4bCrHrEsXw5fkqsHxa5a2/T0ULu
-31Tsaqmri6s+pgCyZ4P2itaLw0JG0kOpF5wuGlH7abKFOt2/+julrk0osfsCAwEA
-AaNlMGMwHQYDVR0OBBYEFA0OLDhIJ0KBHqZuAWyDTXLllATDMEIGA1UdEQQ7MDmC
-D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHjo2rrBQJw4w2XerUZad9Bnnj/C
-E+gAidE2Xdz6UaQId+BJ8P4FexxjJbwOz+qEx8lYyWt3ooqIfAbvyebFCRKSjFny
-L1chS4B8WuTPP+8UfPOcSoiOyXHtNqsWWLAIOcFwUUx27hF3IL2DvYi9zebO0uFO
-PiCp6QE0qQ/0HeDbnDjNmS7F8HPgx2IsJyEiEgYdR70w8n1DQB5ccekzpUDCBBNq
-W3q6OazE9V8ZdHjEA8FAJZ7Fo3cjgvkiVtow0CTiB7Aidya8HJc1KTemqUAAwLsT
-J3tGPHwu/RoCjpTvgbZcfT7vb+rMHYjlAaGfAe+dwgLq0XGn+id/ZdMf510=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAKxgqy7GuYcvyA/bSKh2g6NFUiCOMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMTla
-Fw0zNjAzMjUxMTAyMTlaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLpj1x2QOzpy5P769ZzMDBWd/SB
-IamtFwi3yWpGNPFPxgFcRdH9srirVG/jCf8CV63xbqIFw5t5avllFx1sdGDexV0j
-xaikv3IEzUFuAdu1G/Y3gA6WT0Eaz3Wo539B6OMOWm/+S7LhtO92wEmD9QGEnzqK
-hWHafhLNIyatF6nRd8nW6qR1LIeWCJIc6+l9EIN7fgGv91F7qoUmdWWYFEbMaGjg
-aCU+G63qksrn8lme+qYu/mg7PLTkoGpWN5PDF1+ZJ+PWUauWF0BaHkZ1J/2oVBI9
-gTPRAcyapxI/vkbY76ntt9Tpds+ZnjgLt0UvglEHg62QfvjOqkDRn9INMr0CAwEA
-AaNlMGMwHQYDVR0OBBYEFMALZKbkq9w3sXzoVj19Ybn4iHoMMEIGA1UdEQQ7MDmC
-D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFcnLl3I15O+8P1nbTwrl3ON7lYd
-maRmTTShHl3lUH87aRHbiyyoufQ9IZUVx7/lYr9R0956SXUeiXgrBwxGA7GFBR2g
-cOR0d99zxb5O5fp98Q2AsrNsfYkdkufrM07ro5kPUlAvmQyJSjoJ6eN6jn2nOJaQ
-wc5T0ouk9m5goKUJRK7mw6tRTVOw+3sA7Q8R6KW5Hge4uCCJVCnYXLAy/LR117A/
-zAjX3Z+Ui+HQajRXgxc1HyYHWJRnAzE2lb5na1/T6II0rInH7PMeqoUpmFWOOD86
-ZPI4RtsDWZUL5YWyHEokiQxtD9wZmhXrTUiHoVwbFjK+zfFpH/K4vhnweyw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUGpvwFdQDTd5OR/3tImBGs68ViIIwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMB4XDTE2MDMyNTExMDIyMFoX
-DTM2MDMyNTExMDIyMFowGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlWvlRN7Q3Mh8KriChoB80l1JXzQw
-MthELvY6wwzf3fJ4VVIKFn0Kqql0JgwD/VOuA+MPbaqZDNWVcD5EmYhAs4k5cxSq
-jtb7RHdmAfTrnqB8XqM6wGP23sqa7brz7FDpT2kdCHkVn5Reazvltc4aUWepiXu4
-zDOd4fvyTwKcG4R2al6vPPg1ocvYOpOaaskNhjKk7KKF1fm233yLSiZZt/6yGipw
-EB/Vaj6+0ZOzmVCv8RFS5GiHroDzDRFquyrMKNXoqIVgcdsdq1ajeVazOvz+5p7k
-DonBQ31iphDxI3177QPWNIFy5VjvZoHzpiSIOHB7PEpJUkdfxlTS5Q6R6wIDAQAB
-o2UwYzAdBgNVHQ4EFgQUJNaYAquqKRGvgUZVPiWrZ0OSJI8wQgYDVR0RBDswOYIP
-d2VibG9naW4ua2F1LnNlhiZodHRwczovL3dlYmxvZ2luLmthdS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAbsPfGxOUvMCzNS+ZIa+1woB7wRJH
-UdvS+jdnC86qB7pcfeUgqC+hWGzEQjeBpL31lrplfJq5j+c5E4AC97J11cCG7XP7
-6vZniOszZEvPnjI34OL4NrAs4VGSLeF7F9ZC8jyPdWEK2nan3ivWb5tIcfJzd1zp
-1amHFcKAlLVl8kMkLY1GB4kA+/Tz8epC0QDrgRHCdtgKmwfr1vbmAa6KmdldaBAa
-Cn3WZ3K74iMQSSbaR9g9oX/Ag+jeXkBCdEKknolZ+6FWVinu3oeuRiqvWYkLCF0Q
-cHgs7D1QiqGixbmFlSZyPcCPcIzPDzRaoXyb+yKQy31QP/VEt8VGXH5H2A==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.kau.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAKqRgJlUZAb1CREA2cmklaWM4Hs/MA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMjBa
-Fw0zNjAzMjUxMTAyMjBaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrfx2rTVhTB7Pm0oTIvfBpSwkLk
-D8U7RYZH8vx+tOKWZp2d6g6QBOxpaNAZRKpvJoj/vclG37HKjkNi8xQQSNAWqUqo
-Gg7HTbg7GP/Q4MR5SVKZNsxTg4y9xz18Z2+YmiU26XLZHg1S1Dpvz1QkP/bWK4Ci
-7hIcANs//xJnurUHkxOJELtsx3NgR/SGCS3THcZhzFd1kr8c6vnjO6FBywUkbcdP
-pnyRmJnP17PL6r51f29m8/PDXghA98m04mB6p4bCrHrEsXw5fkqsHxa5a2/T0ULu
-31Tsaqmri6s+pgCyZ4P2itaLw0JG0kOpF5wuGlH7abKFOt2/+julrk0osfsCAwEA
-AaNlMGMwHQYDVR0OBBYEFA0OLDhIJ0KBHqZuAWyDTXLllATDMEIGA1UdEQQ7MDmC
-D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHjo2rrBQJw4w2XerUZad9Bnnj/C
-E+gAidE2Xdz6UaQId+BJ8P4FexxjJbwOz+qEx8lYyWt3ooqIfAbvyebFCRKSjFny
-L1chS4B8WuTPP+8UfPOcSoiOyXHtNqsWWLAIOcFwUUx27hF3IL2DvYi9zebO0uFO
-PiCp6QE0qQ/0HeDbnDjNmS7F8HPgx2IsJyEiEgYdR70w8n1DQB5ccekzpUDCBBNq
-W3q6OazE9V8ZdHjEA8FAJZ7Fo3cjgvkiVtow0CTiB7Aidya8HJc1KTemqUAAwLsT
-J3tGPHwu/RoCjpTvgbZcfT7vb+rMHYjlAaGfAe+dwgLq0XGn+id/ZdMf510=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAKxgqy7GuYcvyA/bSKh2g6NFUiCOMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMTla
-Fw0zNjAzMjUxMTAyMTlaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLpj1x2QOzpy5P769ZzMDBWd/SB
-IamtFwi3yWpGNPFPxgFcRdH9srirVG/jCf8CV63xbqIFw5t5avllFx1sdGDexV0j
-xaikv3IEzUFuAdu1G/Y3gA6WT0Eaz3Wo539B6OMOWm/+S7LhtO92wEmD9QGEnzqK
-hWHafhLNIyatF6nRd8nW6qR1LIeWCJIc6+l9EIN7fgGv91F7qoUmdWWYFEbMaGjg
-aCU+G63qksrn8lme+qYu/mg7PLTkoGpWN5PDF1+ZJ+PWUauWF0BaHkZ1J/2oVBI9
-gTPRAcyapxI/vkbY76ntt9Tpds+ZnjgLt0UvglEHg62QfvjOqkDRn9INMr0CAwEA
-AaNlMGMwHQYDVR0OBBYEFMALZKbkq9w3sXzoVj19Ybn4iHoMMEIGA1UdEQQ7MDmC
-D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFcnLl3I15O+8P1nbTwrl3ON7lYd
-maRmTTShHl3lUH87aRHbiyyoufQ9IZUVx7/lYr9R0956SXUeiXgrBwxGA7GFBR2g
-cOR0d99zxb5O5fp98Q2AsrNsfYkdkufrM07ro5kPUlAvmQyJSjoJ6eN6jn2nOJaQ
-wc5T0ouk9m5goKUJRK7mw6tRTVOw+3sA7Q8R6KW5Hge4uCCJVCnYXLAy/LR117A/
-zAjX3Z+Ui+HQajRXgxc1HyYHWJRnAzE2lb5na1/T6II0rInH7PMeqoUpmFWOOD86
-ZPI4RtsDWZUL5YWyHEokiQxtD9wZmhXrTUiHoVwbFjK+zfFpH/K4vhnweyw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUGpvwFdQDTd5OR/3tImBGs68ViIIwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMB4XDTE2MDMyNTExMDIyMFoX
-DTM2MDMyNTExMDIyMFowGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlWvlRN7Q3Mh8KriChoB80l1JXzQw
-MthELvY6wwzf3fJ4VVIKFn0Kqql0JgwD/VOuA+MPbaqZDNWVcD5EmYhAs4k5cxSq
-jtb7RHdmAfTrnqB8XqM6wGP23sqa7brz7FDpT2kdCHkVn5Reazvltc4aUWepiXu4
-zDOd4fvyTwKcG4R2al6vPPg1ocvYOpOaaskNhjKk7KKF1fm233yLSiZZt/6yGipw
-EB/Vaj6+0ZOzmVCv8RFS5GiHroDzDRFquyrMKNXoqIVgcdsdq1ajeVazOvz+5p7k
-DonBQ31iphDxI3177QPWNIFy5VjvZoHzpiSIOHB7PEpJUkdfxlTS5Q6R6wIDAQAB
-o2UwYzAdBgNVHQ4EFgQUJNaYAquqKRGvgUZVPiWrZ0OSJI8wQgYDVR0RBDswOYIP
-d2VibG9naW4ua2F1LnNlhiZodHRwczovL3dlYmxvZ2luLmthdS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAbsPfGxOUvMCzNS+ZIa+1woB7wRJH
-UdvS+jdnC86qB7pcfeUgqC+hWGzEQjeBpL31lrplfJq5j+c5E4AC97J11cCG7XP7
-6vZniOszZEvPnjI34OL4NrAs4VGSLeF7F9ZC8jyPdWEK2nan3ivWb5tIcfJzd1zp
-1amHFcKAlLVl8kMkLY1GB4kA+/Tz8epC0QDrgRHCdtgKmwfr1vbmAa6KmdldaBAa
-Cn3WZ3K74iMQSSbaR9g9oX/Ag+jeXkBCdEKknolZ+6FWVinu3oeuRiqvWYkLCF0Q
-cHgs7D1QiqGixbmFlSZyPcCPcIzPDzRaoXyb+yKQy31QP/VEt8VGXH5H2A==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kau.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.kau.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 54 700 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen Karlstads universitet</md:SurName>
-    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 54 700 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
deleted file mode 100644
index 60111de6..00000000
--- a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://weblogin.smhi.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-02-15T13:03:53Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://weblogin.smhi.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">smhi.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SMHI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SMHI</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SMHIs IDP används av anställda och gäster vid SMHI.</mdui:Description>
-        <mdui:Description xml:lang="en">SMHI's IdP used by employees and guests of SMHI.</mdui:Description>
-        <mdui:Logo xml:lang="en" height="35" width="100">https://weblogin.smhi.se/idp/images/SMHIlogo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="35" width="100">https://weblogin.smhi.se/idp/images/SMHIlogo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">SMHI</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">SMHI</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://www.smhi.se/en/about-smhi/collaboration-tools/saml2-websso-at-smhi-1.187688</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.smhi.se/omsmhi/publika-samarbetsverktyg/saml2-websso-pa-smhi-1.136262</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.smhi.se/omsmhi/hantering-av-personuppgifter/hantering-av-personuppgifter-1.135429</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.smhi.se/omsmhi/hantering-av-personuppgifter/hantering-av-personuppgifter-1.135429</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>smhi.se</mdui:DomainHint>
-        <mdui:IPHint>91.192.28.0/22</mdui:IPHint>
-        <mdui:IPHint>2001:67c:274::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.5811180,16.1450240</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-		MIIF7TCCA9WgAwIBAgIJAPDzGlQqi9j6MA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMT3N0ZXJnb3RsYW5kMRMwEQYDVQQHDApOb3Jya29w
-aW5nMQ0wCwYDVQQKDARTTUhJMQswCQYDVQQLDAJJVDEZMBcGA1UEAwwQd2VibG9n
-aW4uc21oaS5zZTEaMBgGCSqGSIb3DQEJARYLaWRhQHNtaGkuc2UwHhcNMTgwNDI1
-MTQ0MDI4WhcNMjMwNDI0MTQ0MDI4WjCBjDELMAkGA1UEBhMCU0UxFTATBgNVBAgM
-DE9zdGVyZ290bGFuZDETMBEGA1UEBwwKTm9ycmtvcGluZzENMAsGA1UECgwEU01I
-STELMAkGA1UECwwCSVQxGTAXBgNVBAMMEHdlYmxvZ2luLnNtaGkuc2UxGjAYBgkq
-hkiG9w0BCQEWC2lkYUBzbWhpLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAsd7RyM1bv6Xa2X52Rfa0V7YsKMIGzhHrzYQ9v4XK+8Lc0JctPd2DvfsL
-SCflkfV9y7dsKlKicj1xFqQSPMV/ywkxbC9PLI9mlU3Lb9Xwaz1ADb00aiHEvuu0
-wPB2S6VNzyQAVU+Nxz+JJCnKULwefIdLVA6him16gw44aHggmI4AHNMLiZVsO9Cc
-VJkT6GvR0/DQVM8pfM36RVZsrxnhwm/U1hi//JY3qaj/DpB40fyn59tjaHS6cjeH
-0OpWMYhu+/kDQN6FI8MLXxvS96Jgefxp4BOBmeBp7kI4/nqYBi2//MJh9xCP4/m0
-nFLdMjJqA6kjUMviKabSA/Ewz4KvvGDjlPzh9oJFTHmUfRMu7LU5YNK1WPIh+aBJ
-iECAkS+khSfo2iTWTqaXWqVToo9RMlSourdotnMKVAjaU0W2emFGKrUQoyLg81BJ
-GKe7QbhGYnqXsdI5hfAQUKa06z+vInmEe2/6/mqfF77sAwdspK4PEOCR9Ma7chA/
-G0EvE6vWIBfgbzps1Abk6ICO9wRA7TF73O2MOahdDnzkUPvPF4BTrdFS+7HOafox
-z4UB+U0VvOkstm2zSf0A1JaKWCwFy5zspv95MUr+im3p8tn6OU0vcc4pyJjWdwoy
-Yr4hB2NCgmmgHkIU23BDVTuN1PeaCu2tIWa0eASURrwohkRzN8ECAwEAAaNQME4w
-HQYDVR0OBBYEFMBTKGH8RM67MNwBWXJ9yj2NfA5iMB8GA1UdIwQYMBaAFMBTKGH8
-RM67MNwBWXJ9yj2NfA5iMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
-AEUnPnSqiqXZz6ciLoJOfSWeKUX2CKFjYIU297KTecAxOPKkSB/jU+Dq43OduTdv
-Ws1/8OZf8XVj/MlAznnfH2Y1uGOF0WfKpbC0NOSe6Ea5+g07/FcmI4lh7A9jppaq
-/dTGjyqP11GKYekLB8KnyfTBe4Jzc4RfptwC22APQfDaZJLt45Cf7bsbSxGlXdnD
-t9e7vl9k/xOrV5i+vLcH284VvWfggZb48u8YIp/2r8s12MSUy94C02xkngXeaZse
-tKmhg6Be2SYVRs04i0ilI1J2LaVvqqkBrnnoBH79S4Yy4QKKaQytSTyYCpckYl73
-r3SPNo1JCCN9s+9Vqsq1jlMTSH6yxgO/sgDbPgDXEOnw8qHHl1s568X2j3lRDQiV
-t9EtkHMLzqSnu43MbD36GyVcVP6DP6SBzt+ws/iVp9kqckTuI144vNaaVYYLNZIr
-zo0L1wfOOM0ssHCxhA1avgQEm8kR5/luZn8we30y1kBUGQ5+uMWuC1AZJinAz20c
-5Hd3hQp3rFNVZnqhg2Vsl/LLI3QLohMIGIYpyhU12CVK8T19Ei9AJBTsOW3YXhq0
-Sg2Hl0EVvCS4iGEqIwCMhvACufFA8wPQfarWZf1tHS7vKPkUAeSIKk6ikgzzpIZK
-plAt6jVs+phnnWN7Vk5umlo0lIeunmSCwNc6lLO9OzNE
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-		MIIF7TCCA9WgAwIBAgIJAIusLgMpEGxvMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMT3N0ZXJnb3RsYW5kMRMwEQYDVQQHDApOb3Jya29w
-aW5nMQ0wCwYDVQQKDARTTUhJMQswCQYDVQQLDAJJVDEZMBcGA1UEAwwQd2VibG9n
-aW4uc21oaS5zZTEaMBgGCSqGSIb3DQEJARYLaWRhQHNtaGkuc2UwHhcNMTgwNDI1
-MTQ0MDI5WhcNMjMwNDI0MTQ0MDI5WjCBjDELMAkGA1UEBhMCU0UxFTATBgNVBAgM
-DE9zdGVyZ290bGFuZDETMBEGA1UEBwwKTm9ycmtvcGluZzENMAsGA1UECgwEU01I
-STELMAkGA1UECwwCSVQxGTAXBgNVBAMMEHdlYmxvZ2luLnNtaGkuc2UxGjAYBgkq
-hkiG9w0BCQEWC2lkYUBzbWhpLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEArEm+E0kCLNd7/gjGj+Sd/fU8iKaG9FZCGTCyLCipGClMPpMqUHxyEhVn
-9ZwvtabEYgI1h0L1scxQ7JQj6+sIYjV3jnyU81BaHGIvq9y/IOoj3DYll/zV4qLs
-LGq0F6kUhGr9lyENMSVs4OLhNMDNfeI2BboyZ3yNz4Pb0xfSX8JsSaeH8NbGM2Th
-mwlhQtWIpG9GHIP3EuSdiPvWhLF0kBpo2da3QhMlL1i4KB3t/f+e7wKd+0RAg0kj
-alu6MKG6OjQmihsGfkgTlA/yGKc+IrcSIU54K1SsKuc5BWBefJbF2Mu8XQxTO2wc
-+52R6E+A2AaJEUyh6Nj8XtDxw0ukL+9eId7x6SM7xgNP4u+lI6a2/130YVTHMZUW
-d7LIFvaTnpQhg+cl+shxRYqz38BitVnLF5s9y3tCt5utvF/oReHCpaDe31t6NFLc
-5aSR0GhVnTYGSswLeJF8imlZ+x+0w5rCZQrKJ8yrN8eTvZnE9O03tZ5dSU5utRxy
-ORLbbOLO0o9N6rwWdX+q7to02QL01qPs9EQLyLwNpKZ1ZLNCarTLBoDbkalKZWbp
-/roolLMh5K/tvAcKdYfoi2yhRPWaWAi813NU1U3Br0fMZLjHWL6DDqlmJdqEwAvf
-cUqot/HHtAILbG0W/WcUx/wtyORJ6CO5ofvIM83J2wrAGZRqyR8CAwEAAaNQME4w
-HQYDVR0OBBYEFGXQGBfXU92XTFmf4dWfFVV5NYMGMB8GA1UdIwQYMBaAFGXQGBfX
-U92XTFmf4dWfFVV5NYMGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
-AFBDlVkVX0NqL23nz2/xkFgotUKYNVJW/b9gWS6xCBJsKUijgC4Ylkju4PSBZxg8
-37SbwRZIxs+K0llHBIe4Sj2MvlHMekYPFjrP6HAeMpvpRUC5OL4fm+Ms0qRaxMoz
-zWflL/ZW+jmm9kOZrWoTvZaFaK60JLVtouxi9r74WRC4QwlOYQrgikM2Sc7sMXS0
-gwsTEhMQhoeSJ5RZf+wNWN8uYwTiYgUO9rOBrdlBNx9zIJUAun0k1O5wsfwoDsTV
-gonSQFElJZHz1fDnZ6SG3xq6mv+kRiNqbewLN8Y2JXcduHIc/+sNNW9QewGMBOYW
-+1knIeIMKGG3vcvQmKrUXmwam5KzL0FKnmhA/f6CigtkTmTpog/hOnpc4W/aUPRS
-cAp09W/VecOuLR14InuCBx31YgUcKdrsOf86rq0m4g7xBgj3VKIIjCkallkSBkJR
-q7rfIJadUwEYRVyxyzN03hqX/+7dkH3LEZNV6d0w85kp6rolYEUjvyTjHzl/TJs0
-miNSqP+NbuX2z3CUfvVu/g3k7tj+Ctk9aCrat4+hx/S8COgXoexQJellS4AHOz16
-jM3d7TJJbcsmPDj+zCp+xRTc1kY4VleSwpkEcTP4qUoalG+b0+i1BdzTKrnZPcnv
-kIE+WHmcqr7ZfEfWi17pJAil+nNWp+hZpUw566AbqjWq
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.smhi.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.smhi.se/idp/profile/SAML2/POST/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.smhi.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.smhi.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.smhi.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SMHI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SMHI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SMHI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">SMHI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.smhi.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.smhi.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>SMHI</md:Company>
-    <md:SurName>TFO IDA</md:SurName>
-    <md:EmailAddress>mailto:ida@smhi.se</md:EmailAddress>
-    <md:TelephoneNumber>+46114958000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SMHI</md:Company>
-    <md:SurName>TFO IDO</md:SurName>
-    <md:EmailAddress>mailto:ida@smhi.se</md:EmailAddress>
-    <md:TelephoneNumber>+46114958000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>SMHI</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@smhi.se</md:EmailAddress>
-    <md:TelephoneNumber>+46114958000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>SMHI</md:Company>
-    <md:GivenName>Servicedesk</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@smhi.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
deleted file mode 100644
index ac06d3ca..00000000
--- a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://weblogin.test.uu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-22T10:26:32Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://weblogin.test.uu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">test.uu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet TEST</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University TEST</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Gemensam webbinloggning TEST för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University TEST Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://weblogin.test.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogin.test.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.test.uu.se/#2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.test.uu.se/english.html#2</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">uppsala+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>uu.se</mdui:DomainHint>
-        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
-        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
-        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
-        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
-        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
-        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVALH78yF625WD24SZwiOcGOOvPZ27MA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwHhcNMTYwMjA4MTMw
-MDU0WhcNMzYwMjA4MTMwMDU0WjAeMRwwGgYDVQQDDBN3ZWJsb2dpbi50ZXN0LnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0IVKOwzztzBHho99
-3f30KUTepy2rO3rbZCjrLRKmFwXE2+1jXN5Ox6xvwcJxgt4UYMkyu2bEBV2fhJgc
-nKYZ79jn/LRY6SuqII+IjDPluAbJJpWDkjMkE4gaWjgGa6+Smc083cKeDYor3qH3
-crvFPyOHAh8G7NedEvx/n6Q/lgkwcYzVNTH3lObA+IkpCmfwgrWklZZuFruItbR8
-WpNcdV2ZVb85IPSiFRNUAM2YmlXoF82hcwowNQXwORF4QVzj/KaB/LTp/ptVL4Fp
-YJseNRuGk8ZFbDFRUzzIt4l62AYJwUJ1ELoKtI9nR2VTrcAg1XML2EN8SypcWvmu
-es4cfQIDAQABo20wazAdBgNVHQ4EFgQUrFYCH0GaHu1iWwdjpRXQZ6nUi/gwSgYD
-VR0RBEMwQYITd2VibG9naW4udGVzdC51dS5zZYYqaHR0cHM6Ly93ZWJsb2dpbi50
-ZXN0LnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBkE+0t
-2NdsLrAFltZxcaR8fBcgH6Ps4qY4jCAHcXtvj/XZ6oW6R/8V7LLRMhhfkkwEVfwP
-dxGQzFzjn+XdFEKf1AF4d7kma6GnCAexYUggEDnc3RHlE33MvZHhMUa+qgidb5Nc
-z0XSLb/uZVeguusT0lBnVj/4ZChA4nd/JIkTP75XMKJ51b+TS9+i5sQLPVR4D/+e
-pFe422nJTV+yciVwKsuHmu3br2DEtgSSFWGilvGDdlfBAYtUDKG1DL2AVdI3ikZa
-kCyta/hzhS30XO24ZrWeaPKGQri48PsZufzaHcjcVw8IRY8HI226xFya7F8AbGZQ
-qK8gNoxLpQOHlY2i
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUcIyPpnhtGppaMvJ1n+26SdVOQRkwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTd2VibG9naW4udGVzdC51dS5zZTAeFw0xNjAyMDgxMzAw
-NTFaFw0zNjAyMDgxMzAwNTFaMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUu
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMszKAiwTx/7loe8kP
-nDObgCx1N3RgE4X5Eau8e+cPXIeUZGO7MFidEH5jWV0/ZYAUQN+dy+pSpstyZ3MX
-pW7XkJi9t4ttj8CtFa3sZTrzjsrIiOcmFqHYoKzzZ6b0EKdFyGKORNE5flHrVpUG
-6P709YzxpzMLLEcESpmQwtpm/ILxBM4IPhkvOk6f8v0QbZYC4jo0BTHWgdVgyju9
-CzozhQcCuCU4UVwNgen2P+kIFoXiQybUE/yxgBih7bHFto5Mn5oBsE3mOLe0wHA5
-nL6ZLR8Atzi8nC8YOsV3UB86BIoYWgHBJKPRg2z6UhCgbMJxMfCXtYAGxUM7kTKi
-7kJ9AgMBAAGjbTBrMB0GA1UdDgQWBBR5vMupHMEppHPF0vcF7zsykH9LujBKBgNV
-HREEQzBBghN3ZWJsb2dpbi50ZXN0LnV1LnNlhipodHRwczovL3dlYmxvZ2luLnRl
-c3QudXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBABY3Iinr
-k2pjQFB9VhWb0g/nS2NCU0ipnPmHNEBIXIHhwBe1W3QT2tEcSuF2K4G50v5tjUnY
-DfLVqbWtEfwUG0dz25K5Me4S2Zm6AIITYulVv6j0fdIAiLgDwj/Hpg3fvZtbVtkb
-QHOEryJY6wvvI/zwpyOSkOSTt3qFQ3ZnS40wCs34wP/Hj6cHtkrl2OF0XA5M6yU4
-1kAk9gpaiX2Rhapn4W9V3p6CgpXthk+b8nwQeZ22KeG3ompceHJ/+nmS8G63pq56
-efRdH5xJNjTPu6mVHW9W+lW83i7mGlmMJAgl+qjTECSKXe9LcyYMsy6IphbVsDbX
-zMHQwjf5evdJ6lo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAKxjuWw/YZpjuyfHWcbrDOP8tYnkMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwHhcNMTYwMjA4MTMw
-MDU0WhcNMzYwMjA4MTMwMDU0WjAeMRwwGgYDVQQDDBN3ZWJsb2dpbi50ZXN0LnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiF3dhy69bCTFrcPd
-MOKrp8e8XH5jld7KhPAplQQHg79oAzAE/1tn6a8pD0ZqTVqBXTeZKyvKwICa2kbw
-ZcqBQfyqI7IWmgc2u+PWal0JXod5oDXQ1Uw/6xq5InTuoIlNLIpKolaJtr1cANRg
-acTrgIrV1B3cM9PbkcP6EuQpxenWT0fvh3kxesZraBTyy/LBhPZgqsKRcyTX8dOk
-yKLY+bfUCXidlI2juymQ7x0kenDF09B8khRkYr4rmV14wULzWVHfsT9wQEJvlIbx
-ajz5DCqX6wB/a8ik77GdLJP7h7BkStd4+kJ2aCdnsn4qvhXwCCC0oz1um0rNpP1g
-xcxEXQIDAQABo20wazAdBgNVHQ4EFgQUK2d6JMehLr6T8WAM1I9i+rz9Wh0wSgYD
-VR0RBEMwQYITd2VibG9naW4udGVzdC51dS5zZYYqaHR0cHM6Ly93ZWJsb2dpbi50
-ZXN0LnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA18KzE
-t7EuR1DEmAKtqndUPWuKnds2qhur2HRyETgdXh3qfczvgZLnnhNXI0c/M54CYJb+
-7Tc0f5Pv1cV0GmKkfRadEzc0qSiFrn1t/GhRTakzRprh3JxtT++ZstJzf2/nD1PK
-Oktly7qvWX0Qrh0yYfHJaI/WPVxH4jI/1jDwa9Am/jJbOW/uy6s14zjXswi1ZKd0
-EPzW8pfIR9H1gDAU5hoLuGjWF7NIqmRCfYE6n9/oEZfET1dG3zUpBG2EacmZDv8o
-CIpvN4bSlO9wP5fnymBLt+DxfMdmN973aeU529su8I3uj3Q4qaDBk8zGTKFx82Ae
-dqPteAxhBzLEflg+
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.test.uu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.test.uu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.test.uu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.test.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.test.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">test.uu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVALH78yF625WD24SZwiOcGOOvPZ27MA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwHhcNMTYwMjA4MTMw
-MDU0WhcNMzYwMjA4MTMwMDU0WjAeMRwwGgYDVQQDDBN3ZWJsb2dpbi50ZXN0LnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0IVKOwzztzBHho99
-3f30KUTepy2rO3rbZCjrLRKmFwXE2+1jXN5Ox6xvwcJxgt4UYMkyu2bEBV2fhJgc
-nKYZ79jn/LRY6SuqII+IjDPluAbJJpWDkjMkE4gaWjgGa6+Smc083cKeDYor3qH3
-crvFPyOHAh8G7NedEvx/n6Q/lgkwcYzVNTH3lObA+IkpCmfwgrWklZZuFruItbR8
-WpNcdV2ZVb85IPSiFRNUAM2YmlXoF82hcwowNQXwORF4QVzj/KaB/LTp/ptVL4Fp
-YJseNRuGk8ZFbDFRUzzIt4l62AYJwUJ1ELoKtI9nR2VTrcAg1XML2EN8SypcWvmu
-es4cfQIDAQABo20wazAdBgNVHQ4EFgQUrFYCH0GaHu1iWwdjpRXQZ6nUi/gwSgYD
-VR0RBEMwQYITd2VibG9naW4udGVzdC51dS5zZYYqaHR0cHM6Ly93ZWJsb2dpbi50
-ZXN0LnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBkE+0t
-2NdsLrAFltZxcaR8fBcgH6Ps4qY4jCAHcXtvj/XZ6oW6R/8V7LLRMhhfkkwEVfwP
-dxGQzFzjn+XdFEKf1AF4d7kma6GnCAexYUggEDnc3RHlE33MvZHhMUa+qgidb5Nc
-z0XSLb/uZVeguusT0lBnVj/4ZChA4nd/JIkTP75XMKJ51b+TS9+i5sQLPVR4D/+e
-pFe422nJTV+yciVwKsuHmu3br2DEtgSSFWGilvGDdlfBAYtUDKG1DL2AVdI3ikZa
-kCyta/hzhS30XO24ZrWeaPKGQri48PsZufzaHcjcVw8IRY8HI226xFya7F8AbGZQ
-qK8gNoxLpQOHlY2i
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUcIyPpnhtGppaMvJ1n+26SdVOQRkwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTd2VibG9naW4udGVzdC51dS5zZTAeFw0xNjAyMDgxMzAw
-NTFaFw0zNjAyMDgxMzAwNTFaMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUu
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMszKAiwTx/7loe8kP
-nDObgCx1N3RgE4X5Eau8e+cPXIeUZGO7MFidEH5jWV0/ZYAUQN+dy+pSpstyZ3MX
-pW7XkJi9t4ttj8CtFa3sZTrzjsrIiOcmFqHYoKzzZ6b0EKdFyGKORNE5flHrVpUG
-6P709YzxpzMLLEcESpmQwtpm/ILxBM4IPhkvOk6f8v0QbZYC4jo0BTHWgdVgyju9
-CzozhQcCuCU4UVwNgen2P+kIFoXiQybUE/yxgBih7bHFto5Mn5oBsE3mOLe0wHA5
-nL6ZLR8Atzi8nC8YOsV3UB86BIoYWgHBJKPRg2z6UhCgbMJxMfCXtYAGxUM7kTKi
-7kJ9AgMBAAGjbTBrMB0GA1UdDgQWBBR5vMupHMEppHPF0vcF7zsykH9LujBKBgNV
-HREEQzBBghN3ZWJsb2dpbi50ZXN0LnV1LnNlhipodHRwczovL3dlYmxvZ2luLnRl
-c3QudXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBABY3Iinr
-k2pjQFB9VhWb0g/nS2NCU0ipnPmHNEBIXIHhwBe1W3QT2tEcSuF2K4G50v5tjUnY
-DfLVqbWtEfwUG0dz25K5Me4S2Zm6AIITYulVv6j0fdIAiLgDwj/Hpg3fvZtbVtkb
-QHOEryJY6wvvI/zwpyOSkOSTt3qFQ3ZnS40wCs34wP/Hj6cHtkrl2OF0XA5M6yU4
-1kAk9gpaiX2Rhapn4W9V3p6CgpXthk+b8nwQeZ22KeG3ompceHJ/+nmS8G63pq56
-efRdH5xJNjTPu6mVHW9W+lW83i7mGlmMJAgl+qjTECSKXe9LcyYMsy6IphbVsDbX
-zMHQwjf5evdJ6lo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAKxjuWw/YZpjuyfHWcbrDOP8tYnkMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwHhcNMTYwMjA4MTMw
-MDU0WhcNMzYwMjA4MTMwMDU0WjAeMRwwGgYDVQQDDBN3ZWJsb2dpbi50ZXN0LnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiF3dhy69bCTFrcPd
-MOKrp8e8XH5jld7KhPAplQQHg79oAzAE/1tn6a8pD0ZqTVqBXTeZKyvKwICa2kbw
-ZcqBQfyqI7IWmgc2u+PWal0JXod5oDXQ1Uw/6xq5InTuoIlNLIpKolaJtr1cANRg
-acTrgIrV1B3cM9PbkcP6EuQpxenWT0fvh3kxesZraBTyy/LBhPZgqsKRcyTX8dOk
-yKLY+bfUCXidlI2juymQ7x0kenDF09B8khRkYr4rmV14wULzWVHfsT9wQEJvlIbx
-ajz5DCqX6wB/a8ik77GdLJP7h7BkStd4+kJ2aCdnsn4qvhXwCCC0oz1um0rNpP1g
-xcxEXQIDAQABo20wazAdBgNVHQ4EFgQUK2d6JMehLr6T8WAM1I9i+rz9Wh0wSgYD
-VR0RBEMwQYITd2VibG9naW4udGVzdC51dS5zZYYqaHR0cHM6Ly93ZWJsb2dpbi50
-ZXN0LnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA18KzE
-t7EuR1DEmAKtqndUPWuKnds2qhur2HRyETgdXh3qfczvgZLnnhNXI0c/M54CYJb+
-7Tc0f5Pv1cV0GmKkfRadEzc0qSiFrn1t/GhRTakzRprh3JxtT++ZstJzf2/nD1PK
-Oktly7qvWX0Qrh0yYfHJaI/WPVxH4jI/1jDwa9Am/jJbOW/uy6s14zjXswi1ZKd0
-EPzW8pfIR9H1gDAU5hoLuGjWF7NIqmRCfYE6n9/oEZfET1dG3zUpBG2EacmZDv8o
-CIpvN4bSlO9wP5fnymBLt+DxfMdmN973aeU529su8I3uj3Q4qaDBk8zGTKFx82Ae
-dqPteAxhBzLEflg+
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet TEST</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University TEST</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Operations</md:GivenName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Operations</md:GivenName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>IT Support</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
deleted file mode 100644
index a5230e74..00000000
--- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://weblogin.uu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-10-28T12:07:42Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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://weblogin.uu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">uppsala+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>uu.se</mdui:DomainHint>
-        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
-        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
-        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
-        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
-        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
-        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAInKug+xwEy0EG2M50yGgyeNRyMAMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDndlYmxvZ2luLnV1LnNlMB4XDTE2MDcxMDIxMTQwNloX
-DTI2MDcxMDIxMTQwNlowGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIA2BeHbxhYxkqjgv0FQn/7FTDsU5j
-DwDloBMEF8ggNK3cc5o2PIKth9Wrx5LcR5lRyQpGUgI6oMwYKaFOytkLfiVpaDQa
-TF/Y6GMTI33qsfd8F13T0R+tXRASCw0IHhPx87AiYJeoUXaxDcC5kjTHJZB9x2mJ
-n2NMfuTp6M40JmLlbvcib5u44NdXIjKA2hwPvfS4fq0K6LrPn1K7sif/TajZIwDW
-KNqyvmoqdwAFNIEK80zu1G79hNQNWrBuJ4AxuD4NtCNDWeEo/KNGQtl1YI+Z5LdG
-A79qUQWjrzKUzRbZrZHYEp69ZgheJc6+UySL7EUxJRIEB5em6ZUMlHp9AgMBAAGj
-YzBhMB0GA1UdDgQWBBTRiN5Dzf80bGeG1HkCZn/L3khPlTBABgNVHREEOTA3gg53
-ZWJsb2dpbi51dS5zZYYlaHR0cHM6Ly93ZWJsb2dpbi51dS5zZS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAWHGNt0+UXJmUZTGHcrA9vuZicnCDv2cD
-FWIIM+XK5adY7qMc0/drTMg1jQLrvnwy9bq4vBol4M+D2i1s0xPpsauRnzL4szD4
-0QCOTfTMjpSlY0tP2OeqC+dyaAL5uz5Of0ENuVrEvAioa4pZfOCuSGd6Zbwe1ZF/
-vJKjAzCDovXhHnUqRk6Er9b8ljHwu1h0ibvfCaWaEguHipnKLE9cjNVRniqpAAoN
-43MwXOY7v90kCFH9D/bGcQuzUWMhmP8FQJ1YDMNwE/FlOM1HGUwQpYRgsojptuGU
-QyWWjWUBKLPHNYGobKHpdgm0No36NMr10RC92WyaN72cgVbjN1nmHQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAMAqC57ZiqOY9LvU7W7YjaZ2U8GtMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDndlYmxvZ2luLnV1LnNlMB4XDTE2MDcxMDIwNDgxNloX
-DTI2MDcxMDIwNDgxNlowGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXwo9+t6G/fp7dFcap5s8vygdIGWEx
-h7zDfKW43aSXBlT3hQXmyUNR8E1wynpswZz9OG57vklte6BwCpj6/+o/T4S6DDrz
-E80YKwF08Y9JMoyXB6YWk5awu4BBU1k1QDyz6wy+o27NK+dS07ZaEhbiFxZjgjkM
-UQSE1qBeOTX91uyp/Oud3VpyV31AbAN9Wcw33HvoRSeIy3njq3XBmW5Xbuae8SSY
-BDqR+M6Fu+YSk04EblIcl0zFtBDh6N9U+OCR+G8YsZvyUfs8WSx1Y4uOxygxOGgZ
-/f2Raiq8WuE8uy4o2UQL7NqJ9PyhTTk+94HsxT0haLOrS/MNI1l5Zw9XAgMBAAGj
-YzBhMB0GA1UdDgQWBBROpn9mvA5O1XugKjgnthIFsRwCBzBABgNVHREEOTA3gg53
-ZWJsb2dpbi51dS5zZYYlaHR0cHM6Ly93ZWJsb2dpbi51dS5zZS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAXR4BLVIAwqZTzz3iwjGskMw2WzfBQ/nG
-l3rjpj5tpayQ1NrEbidLiyUQD4m9PBS/zTsxIB9TJ5r/Ye3jf39+9plG51tQALUq
-Psz27W4CGdEe0CBeiGTJ0gnlSVNqezXsRzk+EXTkzQbQ4sov9eWeWe9c/5Cbyf6l
-wRUoSoZ5j0Lo9+03ZiNBBD2PRpfyrXjXuIEw5xDeE2YR/2W++3J79hWjydJPlzl/
-K0lTdUS/JfVbNpxufJxPp/R1iLjU4hypLi+N3fh4xh0HOdLskIV+xCPzwn6uLsPG
-AbrZzItGWOuUunKpQBejEO5F+q+z1dU41x2m4oONHzdQ+3IX75GUEg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUU/H0eVODSSmZoDRn6Lz3GR/1kzMwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwHhcNMTYwNzEwMjEwNDMzWhcN
-MjYwNzEwMjEwNDMzWjAZMRcwFQYDVQQDDA53ZWJsb2dpbi51dS5zZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvjMIOzZJS4B6CpNZ2aAcMlHDPloeGm
-cmiAIoC5odr2b1qutyj2X1k0TnlEGLVnQMbgsIZR0qz0/0Dd0RL15+SnNswBB5wa
-ShHiTkkZATaFaed2kmO9DDXV7m3dxgF8a3DWaSWF12jNiGwxmvCIeEmQUsSVY52r
-uoKbv04q+vQB2aJPTdKGzrSqGxZw6pWPjZotiuT/Hn6aWVfSeya6OTgtOgybsWsn
-a4A/ncMhj8tl5lnpQGxWwJWFBQm9T3mEDrzgJND4E+ZxdFmrUZGFSRmkWe+ma9Ii
-Y1z1IXNedOZMshrMelD9UMEnc3ZCZJCeWfsdpe6ecZU+T4l5kWuALqkCAwEAAaNj
-MGEwHQYDVR0OBBYEFM3QZFFxSaebrz860E57FdtWScA7MEAGA1UdEQQ5MDeCDndl
-YmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2luLnV1LnNlL2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCXHAy+YMui0rPK83sEU2MEYvrD7ehI0Wff
-EcrQCroT1i2x2ajBkQ/4TVge2F9KHgiiKfgEG8saqdgTgwq3wP6UPGTMwgdMIlAX
-AN16kAibmTOZ4Kx+yqy+roFj919i9uPI998TlXJG85LpjqsX+gDoVzKw68F2fw8W
-Vgl9zHmoBnf765evetN8aJkQ/t2nNkqHiV83LXQ80fdtu52T2lkb6GM9nXN81jNt
-OiJ3wNKvx2hkOJqEs+p9ESI8IiNxjPyjdk5V9VlIl65W0WO1WfrT0qur5NhdZsl+
-nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.uu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.uu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.uu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAInKug+xwEy0EG2M50yGgyeNRyMAMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDndlYmxvZ2luLnV1LnNlMB4XDTE2MDcxMDIxMTQwNloX
-DTI2MDcxMDIxMTQwNlowGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIA2BeHbxhYxkqjgv0FQn/7FTDsU5j
-DwDloBMEF8ggNK3cc5o2PIKth9Wrx5LcR5lRyQpGUgI6oMwYKaFOytkLfiVpaDQa
-TF/Y6GMTI33qsfd8F13T0R+tXRASCw0IHhPx87AiYJeoUXaxDcC5kjTHJZB9x2mJ
-n2NMfuTp6M40JmLlbvcib5u44NdXIjKA2hwPvfS4fq0K6LrPn1K7sif/TajZIwDW
-KNqyvmoqdwAFNIEK80zu1G79hNQNWrBuJ4AxuD4NtCNDWeEo/KNGQtl1YI+Z5LdG
-A79qUQWjrzKUzRbZrZHYEp69ZgheJc6+UySL7EUxJRIEB5em6ZUMlHp9AgMBAAGj
-YzBhMB0GA1UdDgQWBBTRiN5Dzf80bGeG1HkCZn/L3khPlTBABgNVHREEOTA3gg53
-ZWJsb2dpbi51dS5zZYYlaHR0cHM6Ly93ZWJsb2dpbi51dS5zZS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAWHGNt0+UXJmUZTGHcrA9vuZicnCDv2cD
-FWIIM+XK5adY7qMc0/drTMg1jQLrvnwy9bq4vBol4M+D2i1s0xPpsauRnzL4szD4
-0QCOTfTMjpSlY0tP2OeqC+dyaAL5uz5Of0ENuVrEvAioa4pZfOCuSGd6Zbwe1ZF/
-vJKjAzCDovXhHnUqRk6Er9b8ljHwu1h0ibvfCaWaEguHipnKLE9cjNVRniqpAAoN
-43MwXOY7v90kCFH9D/bGcQuzUWMhmP8FQJ1YDMNwE/FlOM1HGUwQpYRgsojptuGU
-QyWWjWUBKLPHNYGobKHpdgm0No36NMr10RC92WyaN72cgVbjN1nmHQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAMAqC57ZiqOY9LvU7W7YjaZ2U8GtMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDndlYmxvZ2luLnV1LnNlMB4XDTE2MDcxMDIwNDgxNloX
-DTI2MDcxMDIwNDgxNlowGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXwo9+t6G/fp7dFcap5s8vygdIGWEx
-h7zDfKW43aSXBlT3hQXmyUNR8E1wynpswZz9OG57vklte6BwCpj6/+o/T4S6DDrz
-E80YKwF08Y9JMoyXB6YWk5awu4BBU1k1QDyz6wy+o27NK+dS07ZaEhbiFxZjgjkM
-UQSE1qBeOTX91uyp/Oud3VpyV31AbAN9Wcw33HvoRSeIy3njq3XBmW5Xbuae8SSY
-BDqR+M6Fu+YSk04EblIcl0zFtBDh6N9U+OCR+G8YsZvyUfs8WSx1Y4uOxygxOGgZ
-/f2Raiq8WuE8uy4o2UQL7NqJ9PyhTTk+94HsxT0haLOrS/MNI1l5Zw9XAgMBAAGj
-YzBhMB0GA1UdDgQWBBROpn9mvA5O1XugKjgnthIFsRwCBzBABgNVHREEOTA3gg53
-ZWJsb2dpbi51dS5zZYYlaHR0cHM6Ly93ZWJsb2dpbi51dS5zZS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAXR4BLVIAwqZTzz3iwjGskMw2WzfBQ/nG
-l3rjpj5tpayQ1NrEbidLiyUQD4m9PBS/zTsxIB9TJ5r/Ye3jf39+9plG51tQALUq
-Psz27W4CGdEe0CBeiGTJ0gnlSVNqezXsRzk+EXTkzQbQ4sov9eWeWe9c/5Cbyf6l
-wRUoSoZ5j0Lo9+03ZiNBBD2PRpfyrXjXuIEw5xDeE2YR/2W++3J79hWjydJPlzl/
-K0lTdUS/JfVbNpxufJxPp/R1iLjU4hypLi+N3fh4xh0HOdLskIV+xCPzwn6uLsPG
-AbrZzItGWOuUunKpQBejEO5F+q+z1dU41x2m4oONHzdQ+3IX75GUEg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUU/H0eVODSSmZoDRn6Lz3GR/1kzMwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwHhcNMTYwNzEwMjEwNDMzWhcN
-MjYwNzEwMjEwNDMzWjAZMRcwFQYDVQQDDA53ZWJsb2dpbi51dS5zZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvjMIOzZJS4B6CpNZ2aAcMlHDPloeGm
-cmiAIoC5odr2b1qutyj2X1k0TnlEGLVnQMbgsIZR0qz0/0Dd0RL15+SnNswBB5wa
-ShHiTkkZATaFaed2kmO9DDXV7m3dxgF8a3DWaSWF12jNiGwxmvCIeEmQUsSVY52r
-uoKbv04q+vQB2aJPTdKGzrSqGxZw6pWPjZotiuT/Hn6aWVfSeya6OTgtOgybsWsn
-a4A/ncMhj8tl5lnpQGxWwJWFBQm9T3mEDrzgJND4E+ZxdFmrUZGFSRmkWe+ma9Ii
-Y1z1IXNedOZMshrMelD9UMEnc3ZCZJCeWfsdpe6ecZU+T4l5kWuALqkCAwEAAaNj
-MGEwHQYDVR0OBBYEFM3QZFFxSaebrz860E57FdtWScA7MEAGA1UdEQQ5MDeCDndl
-YmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2luLnV1LnNlL2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCXHAy+YMui0rPK83sEU2MEYvrD7ehI0Wff
-EcrQCroT1i2x2ajBkQ/4TVge2F9KHgiiKfgEG8saqdgTgwq3wP6UPGTMwgdMIlAX
-AN16kAibmTOZ4Kx+yqy+roFj919i9uPI998TlXJG85LpjqsX+gDoVzKw68F2fw8W
-Vgl9zHmoBnf765evetN8aJkQ/t2nNkqHiV83LXQ80fdtu52T2lkb6GM9nXN81jNt
-OiJ3wNKvx2hkOJqEs+p9ESI8IiNxjPyjdk5V9VlIl65W0WO1WfrT0qur5NhdZsl+
-nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Operations</md:GivenName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Operations</md:GivenName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>IT Support</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
deleted file mode 100644
index 180567d7..00000000
--- a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://webproxysrv.uniarts.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-12-17T21:58:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://webproxysrv.uniarts.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uniarts.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">student.uniarts.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Identity Provider for uniarts.se.</mdui:Description>
-        <mdui:Description xml:lang="sv">Identity Provider för uniarts.se.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Stockholm University of the Arts</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Stockholms konstnärliga högskola</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.uniarts.se/english/about-uniarts</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://uniarts.se/om-skh</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uniarts.se/ovriga-sidor/service-definition</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.uniarts.se/english/other-pages/service-definition</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="103" width="200">https://www.uniarts.se/storage/ma/ec61f94a5d5e4446ac2b69c2a3cccf5e/72755a4a08d242c3b9de8442e841a3e6/214-40-0-png.Png/27A4856A025F3910DD9E316B93B5211AC48C1686/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="103" width="200">https://www.uniarts.se/storage/ma/ec61f94a5d5e4446ac2b69c2a3cccf5e/72755a4a08d242c3b9de8442e841a3e6/214-40-0-png.Png/27A4856A025F3910DD9E316B93B5211AC48C1686/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHhTCCBW2gAwIBAgIRAKlFc2FaiFNLaQh2keGOAqIwDQYJKoZIhvcNAQEMBQAwRDELMAkGA1UEBhMCTkwxGTAXBgNVBAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0MB4XDTIxMTIyMDAwMDAwMFoXDTIyMTIyMDIzNTk1OVowgYkxCzAJBgNVBAYTAlNFMRgwFgYDVQQIDA9TdG9ja2hvbG1zIGzDpG4xEjAQBgNVBAcTCVN0b2NraG9sbTErMCkGA1UECgwiU3RvY2tob2xtcyBrb25zdG7DpHJsaWdhIGjDtmdza29sYTEfMB0GA1UEAxMWd2VicHJveHlzcnYudW5pYXJ0cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5On/HUBw1L/cei+pafHpmNDJ+Ol78iv4SYnrEj6ZmISRepq4PlLAlrZAZwbMykdHMGmiGE+TYAgixxmdAIonmyAHEkErVLHFh8k2bS9zKnoAk7DNDKEuRyZBlmS9lttYnSc5t22U2dA4iaIvzFjzJfCsZnL/fz6/yOOvyvBGG802722kLWO48vM2Rixgk1BlB219xwVvqYjX4UiN7fzbhw3yUYnPipCwX9niTahuc4vrVOkXBq1JruvhXALkTKtA9yC2PtQM0z7vF0UEKkB0hh+NkGuMtKT6TU2IxIK1KjtTIQPivYEk2MhNRY6z2lYe/6DAuZWBHEs8hkgnXtqBcCAwEAAaOCAyowggMmMB8GA1UdIwQYMBaAFG8dNUkQbDL6WaCevIroH5W+cXoMMB0GA1UdDgQWBBTNyCMWFyl2Xtu5TxjHwV1ntiOWRzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwSQYDVR0gBEIwQDA0BgsrBgEEAbIxAQICTzAlMCMGCCsGAQUFBwIBFhdodHRwczovL3NlY3RpZ28uY29tL0NQUzAIBgZngQwBAgIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL0dFQU5ULmNybC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0LmNybDB1BggrBgEFBQcBAQRpMGcwOgYIKwYBBQUHMAKGLmh0dHA6Ly9HRUFOVC5jcnQuc2VjdGlnby5jb20vR0VBTlRPVlJTQUNBNC5jcnQwKQYIKwYBBQUHMAGGHWh0dHA6Ly9HRUFOVC5vY3NwLnNlY3RpZ28uY29tMIIBfwYKKwYBBAHWeQIEAgSCAW8EggFrAWkAdwBGpVXrdfqRIDC1oolp9PN9ESxBdL79SbiFq/L8cP5tRwAAAX3XBWcMAAAEAwBIMEYCIQCwZwMP9dn4+lPiH8SLezJhceHGrvjxKsZfOpvC+OtldAIhAMsW2wMVBtHJ1T803YmQR6xfiwprEQiuV21zHUFiyQx7AHYAQcjKsd8iRkoQxqE6CUKHXk4xixsD6+tLx2jwkGKWBvYAAAF91wVm3QAABAMARzBFAiAYlpo1gFDPCMq2iYIkkCHV5NGOi2Ifk/FSg5bUZL6DNAIhAI8P3wxPcqWPEARchJc0kAi8udxOwBu2ZbC55d340H54AHYAKXm+8J45OSHwVnOfY6V35b5XfZxgCvj5TV0mXCVdx4QAAAF91wVmtwAABAMARzBFAiEA4pzOtZP8Z6HfOT/6SSDnAYSFI+35gHuDxskdX9Wlm7sCIA4DiWh43vS6SqXoekgwH5jsJHVreQlKtDJ6XXPLqvHjMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDQYJKoZIhvcNAQEMBQADggIBADHDWpQmMF9+yuU52Y5JP3jm1m/ehvdmC9x0Rpoy54perNfw3Pg8367DxU0qOqDLrxiqobfO5GRIcGwneMax01SZWigbg/hzt9pa4dOrsyJqqmzln/V2HnzpccU0me4epvw96YMzThaUSN6jel6wLuv4sM6zwU375BWcm+gFHFOKGRVPL4PCYCdA4EsYymbT+8Ysss+S3pW8vjj2TiNb0h/FjRJ4e9G1itwdFtgtldSgOlWUGJSMRt4hoC8zYk0b1Npe3QQOQM4MWC0rotQ7m+cEEdNLuVugaFF3Y4Uxjon3Zfk2AqpkmSGMih2srhEfYAE6rWwOYJ1NzbdUxRoxopuhJlVq3TZ2V8XM0poyWAgrC5khCtQzetVSFZ6bhc34uR7/R+j43wE5Mc1SyLkbSieXRMHlZO2XOXbQzafi0Qz+/Yowdsa0qf5jz6xda2/hDiV1Jstp2MfD9odBGvcKN6TQW/tztmNDiM0EtKV4pnfW7yT58wK1pfbXkm/dVRSdFB7dgFGtNduSpTeUDjKALMCy/C2WHdl1OxoEdkClPJ70WsclNro2EDlZvuccSbYotYPFuPxtAatzpnR9TTiuyDbexOzN5WpjvWs+zdufILRRiDDFtdvK831cTqjgAlbpMWzprum+eV8GXBOv0A2ZZLI/ow5mod/dMKFX7V3JmBjN</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHhTCCBW2gAwIBAgIRAKlFc2FaiFNLaQh2keGOAqIwDQYJKoZIhvcNAQEMBQAwRDELMAkGA1UEBhMCTkwxGTAXBgNVBAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0MB4XDTIxMTIyMDAwMDAwMFoXDTIyMTIyMDIzNTk1OVowgYkxCzAJBgNVBAYTAlNFMRgwFgYDVQQIDA9TdG9ja2hvbG1zIGzDpG4xEjAQBgNVBAcTCVN0b2NraG9sbTErMCkGA1UECgwiU3RvY2tob2xtcyBrb25zdG7DpHJsaWdhIGjDtmdza29sYTEfMB0GA1UEAxMWd2VicHJveHlzcnYudW5pYXJ0cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5On/HUBw1L/cei+pafHpmNDJ+Ol78iv4SYnrEj6ZmISRepq4PlLAlrZAZwbMykdHMGmiGE+TYAgixxmdAIonmyAHEkErVLHFh8k2bS9zKnoAk7DNDKEuRyZBlmS9lttYnSc5t22U2dA4iaIvzFjzJfCsZnL/fz6/yOOvyvBGG802722kLWO48vM2Rixgk1BlB219xwVvqYjX4UiN7fzbhw3yUYnPipCwX9niTahuc4vrVOkXBq1JruvhXALkTKtA9yC2PtQM0z7vF0UEKkB0hh+NkGuMtKT6TU2IxIK1KjtTIQPivYEk2MhNRY6z2lYe/6DAuZWBHEs8hkgnXtqBcCAwEAAaOCAyowggMmMB8GA1UdIwQYMBaAFG8dNUkQbDL6WaCevIroH5W+cXoMMB0GA1UdDgQWBBTNyCMWFyl2Xtu5TxjHwV1ntiOWRzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwSQYDVR0gBEIwQDA0BgsrBgEEAbIxAQICTzAlMCMGCCsGAQUFBwIBFhdodHRwczovL3NlY3RpZ28uY29tL0NQUzAIBgZngQwBAgIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL0dFQU5ULmNybC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0LmNybDB1BggrBgEFBQcBAQRpMGcwOgYIKwYBBQUHMAKGLmh0dHA6Ly9HRUFOVC5jcnQuc2VjdGlnby5jb20vR0VBTlRPVlJTQUNBNC5jcnQwKQYIKwYBBQUHMAGGHWh0dHA6Ly9HRUFOVC5vY3NwLnNlY3RpZ28uY29tMIIBfwYKKwYBBAHWeQIEAgSCAW8EggFrAWkAdwBGpVXrdfqRIDC1oolp9PN9ESxBdL79SbiFq/L8cP5tRwAAAX3XBWcMAAAEAwBIMEYCIQCwZwMP9dn4+lPiH8SLezJhceHGrvjxKsZfOpvC+OtldAIhAMsW2wMVBtHJ1T803YmQR6xfiwprEQiuV21zHUFiyQx7AHYAQcjKsd8iRkoQxqE6CUKHXk4xixsD6+tLx2jwkGKWBvYAAAF91wVm3QAABAMARzBFAiAYlpo1gFDPCMq2iYIkkCHV5NGOi2Ifk/FSg5bUZL6DNAIhAI8P3wxPcqWPEARchJc0kAi8udxOwBu2ZbC55d340H54AHYAKXm+8J45OSHwVnOfY6V35b5XfZxgCvj5TV0mXCVdx4QAAAF91wVmtwAABAMARzBFAiEA4pzOtZP8Z6HfOT/6SSDnAYSFI+35gHuDxskdX9Wlm7sCIA4DiWh43vS6SqXoekgwH5jsJHVreQlKtDJ6XXPLqvHjMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDQYJKoZIhvcNAQEMBQADggIBADHDWpQmMF9+yuU52Y5JP3jm1m/ehvdmC9x0Rpoy54perNfw3Pg8367DxU0qOqDLrxiqobfO5GRIcGwneMax01SZWigbg/hzt9pa4dOrsyJqqmzln/V2HnzpccU0me4epvw96YMzThaUSN6jel6wLuv4sM6zwU375BWcm+gFHFOKGRVPL4PCYCdA4EsYymbT+8Ysss+S3pW8vjj2TiNb0h/FjRJ4e9G1itwdFtgtldSgOlWUGJSMRt4hoC8zYk0b1Npe3QQOQM4MWC0rotQ7m+cEEdNLuVugaFF3Y4Uxjon3Zfk2AqpkmSGMih2srhEfYAE6rWwOYJ1NzbdUxRoxopuhJlVq3TZ2V8XM0poyWAgrC5khCtQzetVSFZ6bhc34uR7/R+j43wE5Mc1SyLkbSieXRMHlZO2XOXbQzafi0Qz+/Yowdsa0qf5jz6xda2/hDiV1Jstp2MfD9odBGvcKN6TQW/tztmNDiM0EtKV4pnfW7yT58wK1pfbXkm/dVRSdFB7dgFGtNduSpTeUDjKALMCy/C2WHdl1OxoEdkClPJ70WsclNro2EDlZvuccSbYotYPFuPxtAatzpnR9TTiuyDbexOzN5WpjvWs+zdufILRRiDDFtdvK831cTqjgAlbpMWzprum+eV8GXBOv0A2ZZLI/ow5mod/dMKFX7V3JmBjN</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stockholm University of the Arts</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Stockholms konstnärliga högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm University of the Arts</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms konstnärliga högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uniarts.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uniarts.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sven-Erik Wilhelmsson</md:GivenName>
-    <md:SurName>Wilhelmsson</md:SurName>
-    <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ingrid</md:GivenName>
-    <md:SurName>Wallnäs</md:SurName>
-    <md:EmailAddress>mailto:ingrid.wallnas@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400220</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Zacharias</md:GivenName>
-    <md:SurName>Böhm</md:SurName>
-    <md:EmailAddress>mailto:zacharias.bohm@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400012</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/wl07089.sigma.local-shibboleth.xml b/swamid-2.0/wl07089.sigma.local-shibboleth.xml
deleted file mode 100644
index c2e8f743..00000000
--- a/swamid-2.0/wl07089.sigma.local-shibboleth.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://wl07089.sigma.local/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-04-03T09:19:23Z">
-      <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"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://wl07089.sigma.local/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wl07089.sigma.local/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>wl07089.sigma.local</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wl07089.sigma.local</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJALepnD5Ui80lMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3dsMDcwODkuc2lnbWEubG9jYWwwHhcNMTQwNDAyMDgyMzM5WhcNMjQwMzMw
-MDgyMzM5WjAeMRwwGgYDVQQDExN3bDA3MDg5LnNpZ21hLmxvY2FsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnDLOtt0s0jQOv5rp1haep1OgR0ZVOz4W
-4cT8ohIJRzLKcz750kJVSf2F2tqgNAkKUsVgyutTZCOrFgs+xHrKmkogo8j7Dnfy
-gI6hinQnutijsceWLglY2Mt57CV4XstdBuO9k+suQw+RLiXymfW1qWkUeEEtPpP1
-N5YwE5DDBPuuvzM/Tq/JivaSpOdnbDJkWuNFYcekhWPmfB/wJRPUQgnhaKXOsU9l
-TtbFZAF+y0iOtpxSFC5rLlotN1L1gA0d9OvLDVjxFVSmKLTBtJbL0H6kpxGbgcev
-5TxOWHq9AB0nIeFjN5rFuNN+NKxryOtUJN0Xi6p4rPi/vaoLlQeN5QIDAQABo0Ew
-PzAeBgNVHREEFzAVghN3bDA3MDg5LnNpZ21hLmxvY2FsMB0GA1UdDgQWBBTLjA0/
-pU+uBCzjb9SCJpq733OQezANBgkqhkiG9w0BAQUFAAOCAQEAc/j53vQlfVYgY+XQ
-5LrkmOCmuyjqVzrx+XvDrVxwolQGUw9wviuVtTx0dp+Lq4jhZ5eTt4A28VZxrE8n
-DTAWz8d+QkRdt+kuFUeLqAB26jG4avIsiCmRwdi+ee0d/48vO8CMlgzcRRsevX3z
-mQ9cCSKO4nnymdFFIIH5bDtUi3f/dFPj8+HGYwiI3YpC65N/ItU9B0GKJXtuyMNl
-gwlAlgjWaP/QuiyxqXwhrP3u1F7OVh+mDo+QfwoqkVBd35XMe840E+HzQrji7dTa
-I73xyA+mtnSNj4YOabB3nZ/MEhHaU3Ng/Pwv36Oy25XeBRSHiSLNzASWTF3vJrUQ
-u4Wbjw==
-</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="http://wl07089.sigma.local/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://wl07089.sigma.local/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://wl07089.sigma.local/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://wl07089.sigma.local/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://wl07089.sigma.local/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml b/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
deleted file mode 100644
index c3bff844..00000000
--- a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.mediafora.net/simplesaml/module.php/saml/sp/metadata.php/media-network-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-12-19T11:20:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">MediaFora</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="da">MediaFora</mdui:DisplayName>
-        <mdui:Description xml:lang="en">MediaFora aims to provide a platform for exchange of knowledge on media services at higher education</mdui:Description>
-        <mdui:Description xml:lang="da">MediaFora har til hensigt at skabe en platform for udveksling af viden om medietjenester ved de videregående uddannels</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.mediafora.net/simplesaml/privacy-statement/</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" width="120" height="120">https://www.mediafora.net/mediafora-logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="da" width="120" height="120">https://www.mediafora.net/mediafora-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIJAIqDherg0eZhMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkRLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDAREZUlDMR8wHQYJKoZIhvcNAQkBFhBuZXRkcmlmdEBkZWljLmRrMB4XDTE0MTAwNzA4MjI1OVoXDTI0MTAwNjA4MjI1OVowUjELMAkGA1UEBhMCREsxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBERlSUMxHzAdBgkqhkiG9w0BCQEWEG5ldGRyaWZ0QGRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrgS058VIfp1wm87kpbxgAEWGhtTTgd/tIQ7Yyh6jn6CPERxMiQMXyPUadbr3BZeEFucI9OcMXnoLldLUm5l0Pap6FiJ2Gw8Q/Hh4OfvcqyqmZy+0BZFqQhrTLDaFGq9XiJ+/4in/NvY1Eg0f2QwviW7V3vAQWficsV1W0U9wLyfFQPjFJ579psQCD7PETZao2emXEqeMFiasYNeh2h1ccGd1TQDKl6hOKe4gSuo2JC7pzWL5lVPqhEUOdStSTmn+fdxv5FVAZRhM21qebd7KnT4NQc9S3GRuXVml1iRdQ6UX1ZpHt3FgerbW76Px8/dKHtsp2ZnVYN1JyktRBdvvfAgMBAAGjUDBOMB0GA1UdDgQWBBQdTIO6FWQSbpLNwflng1jb8VO9GTAfBgNVHSMEGDAWgBQdTIO6FWQSbpLNwflng1jb8VO9GTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCalmSUGLAWb0s6BbJ6n+F2skZxUrNZNHDjUqXtKfncUb94N5E20pvYhUhET+W5Mk49+6smmUTRc5OUQ14xhoJRElJprOgWYXjGEd8iK3XRwmjmGPQ7Ic9y4gLuuL6zFhJQK3pGd4Kmr8Ny7s7UtBf97IFsXLzBPuv2JprXJ7o3dZLYOfdUvaOrbSFomYFCAH1ImOdHsZZ27hpirEEYIsmh1NeXYOgw/XPfCayIprUeXb4zhUBTzbGvjmMdX742+h4l4sww7kU14KHXNR8m5iqrJFlIHwhUbDCu56JbIbnjhaijHAlBDW4UhJQb/chO1NPKqBNpwxsxUdhhIJ1QxDYb</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIJAIqDherg0eZhMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkRLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDAREZUlDMR8wHQYJKoZIhvcNAQkBFhBuZXRkcmlmdEBkZWljLmRrMB4XDTE0MTAwNzA4MjI1OVoXDTI0MTAwNjA4MjI1OVowUjELMAkGA1UEBhMCREsxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBERlSUMxHzAdBgkqhkiG9w0BCQEWEG5ldGRyaWZ0QGRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrgS058VIfp1wm87kpbxgAEWGhtTTgd/tIQ7Yyh6jn6CPERxMiQMXyPUadbr3BZeEFucI9OcMXnoLldLUm5l0Pap6FiJ2Gw8Q/Hh4OfvcqyqmZy+0BZFqQhrTLDaFGq9XiJ+/4in/NvY1Eg0f2QwviW7V3vAQWficsV1W0U9wLyfFQPjFJ579psQCD7PETZao2emXEqeMFiasYNeh2h1ccGd1TQDKl6hOKe4gSuo2JC7pzWL5lVPqhEUOdStSTmn+fdxv5FVAZRhM21qebd7KnT4NQc9S3GRuXVml1iRdQ6UX1ZpHt3FgerbW76Px8/dKHtsp2ZnVYN1JyktRBdvvfAgMBAAGjUDBOMB0GA1UdDgQWBBQdTIO6FWQSbpLNwflng1jb8VO9GTAfBgNVHSMEGDAWgBQdTIO6FWQSbpLNwflng1jb8VO9GTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCalmSUGLAWb0s6BbJ6n+F2skZxUrNZNHDjUqXtKfncUb94N5E20pvYhUhET+W5Mk49+6smmUTRc5OUQ14xhoJRElJprOgWYXjGEd8iK3XRwmjmGPQ7Ic9y4gLuuL6zFhJQK3pGd4Kmr8Ny7s7UtBf97IFsXLzBPuv2JprXJ7o3dZLYOfdUvaOrbSFomYFCAH1ImOdHsZZ27hpirEEYIsmh1NeXYOgw/XPfCayIprUeXb4zhUBTzbGvjmMdX742+h4l4sww7kU14KHXNR8m5iqrJFlIHwhUbDCu56JbIbnjhaijHAlBDW4UhJQb/chO1NPKqBNpwxsxUdhhIJ1QxDYb</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-logout.php/media-network-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-acs.php/media-network-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml1-acs.php/media-network-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-acs.php/media-network-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml1-acs.php/media-network-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Media network forum</md:ServiceName>
-      <md:ServiceName xml:lang="da">Media netværks forum</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">MediaFora aims to provide a platform for exchange of knowledge on media services at higher education</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">MediaFora har til hensigt at skabe en platform for udveksling af viden om medietjenester ved de videregående uddannels</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Danish e-Infrastructure Cooperation</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Danish e-Infrastructure Cooperation (DeIC)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.deic.dk</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>mailto:netdrift@deic.dk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
author	Björn Mattsson <bjorn@sunet.se>	2022-11-17 16:57:30 +0100
committer	Björn Mattsson <bjorn@sunet.se>	2022-11-17 16:57:30 +0100
commit	c9b4889e429634c798766f7da20b16265c8fd750 (patch)
tree	99efb7ab8f2e062bb5bda4497ed005fa76ab20db /swamid-2.0
parent	fea25a2892a986b21b9790db40213c0d743f9455 (diff)