Moved files to make ths repo signed

author: Björn Mattsson <bjorn@sunet.se> 2023-03-06 11:22:05 +0100
committer: Björn Mattsson <bjorn@sunet.se> 2023-03-06 11:22:05 +0100
commit: 467dbdbf3d7212e25ee69daeaadd8adba7c7c5b8 (patch)
tree: d3576d5f2d4b5cc676c0a12ef8f8c3c83b474bf5 /swamid-edugain
parent: bc1d55080e5d42e6ef2bba892d640aa8f68bbc90 (diff)
91 files changed, 0 insertions, 13161 deletions
diff --git a/swamid-edugain/account.eciu.eu.xml b/swamid-edugain/account.eciu.eu.xml
deleted file mode 100644
index 9d484c99..00000000
--- a/swamid-edugain/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-edugain/account.test.eciu.eu.xml b/swamid-edugain/account.test.eciu.eu.xml
deleted file mode 100644
index a75e0432..00000000
--- a/swamid-edugain/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-edugain/adfs.hv.se-adfs-services-trust.xml b/swamid-edugain/adfs.hv.se-adfs-services-trust.xml
deleted file mode 100644
index 92e564ee..00000000
--- a/swamid-edugain/adfs.hv.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://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: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" 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-edugain/adfs.ju.se-adfs-services-trust.xml b/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
deleted file mode 100644
index 400f6886..00000000
--- a/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,146 +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: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/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</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-edugain/adfs.kb.se-adfs-services-trust.xml b/swamid-edugain/adfs.kb.se-adfs-services-trust.xml
deleted file mode 100644
index eb0750e1..00000000
--- a/swamid-edugain/adfs.kb.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.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>
-      <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>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</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/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://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:GivenName>Mattias</md:GivenName>
-    <md:SurName>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:GivenName>Daniel</md:GivenName>
-    <md:SurName>Jakobsson</md:SurName>
-    <md:EmailAddress>mailto:daniel.jakobsson@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073517</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:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>National Library of Sweden</md:Company>
-    <md:GivenName>Niclas</md:GivenName>
-    <md:SurName>Grynner</md:SurName>
-    <md:EmailAddress>mailto:niclas.grynner@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073203</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/adfs.rkh.se-adfs-services-trust.xml b/swamid-edugain/adfs.rkh.se-adfs-services-trust.xml
deleted file mode 100644
index 352cabd9..00000000
--- a/swamid-edugain/adfs.rkh.se-adfs-services-trust.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="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: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://myacademicid.org/entity-categories/esi</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://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-edugain/adfs.sp.se-adfs-services-trust.xml b/swamid-edugain/adfs.sp.se-adfs-services-trust.xml
deleted file mode 100644
index 000f71da..00000000
--- a/swamid-edugain/adfs.sp.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://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: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://refeds.org/category/anonymous</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-edugain/adfs.umu.se-adfs-services-trust.xml b/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
deleted file mode 100644
index e99efec9..00000000
--- a/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,139 +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>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://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/personalized</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: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-edugain/auth.asiaportal.info.xml b/swamid-edugain/auth.asiaportal.info.xml
deleted file mode 100644
index 425f5bd7..00000000
--- a/swamid-edugain/auth.asiaportal.info.xml
+++ /dev/null
@@ -1,55 +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="2023-01-30T13:46:57Z">
-      <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" AuthnRequestsSigned="true">
-    <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">https://www.asiaportal.info/help/</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>MIIGIzCCBAugAwIBAgIUVesT28GLOdkG8PKTFr3ON3B5VZQwDQYJKoZIhvcNAQELBQAwgaAxCzAJBgNVBAYTAkRLMRMwEQYDVQQHDApDb3BlbmhhZ2VuMSowKAYDVQQKDCFOb3JkaWMgSW5zdGl0dXRlIG9mIEFzaWFuIFN0dWRpZXMxETAPBgNVBAsMCE5JQVNMSU5DMR0wGwYDVQQDDBRhdXRoLmFzaWFwb3J0YWwuaW5mbzEeMBwGCSqGSIb3DQEJARYPIGlsYkBuaWFzLmt1LmRrMB4XDTIzMDEyOTIwNDkxNloXDTMzMDEyNjIwNDkxNlowgaAxCzAJBgNVBAYTAkRLMRMwEQYDVQQHDApDb3BlbmhhZ2VuMSowKAYDVQQKDCFOb3JkaWMgSW5zdGl0dXRlIG9mIEFzaWFuIFN0dWRpZXMxETAPBgNVBAsMCE5JQVNMSU5DMR0wGwYDVQQDDBRhdXRoLmFzaWFwb3J0YWwuaW5mbzEeMBwGCSqGSIb3DQEJARYPIGlsYkBuaWFzLmt1LmRrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtf2BMGtCbRBzYdDEXQH8OpBGFgSXk52DutyHBjLLSzij5haDmgbfc4BW7lMZHKZKEFvW0sf4Rk/tlh9YpF5h/xbIjN2OyY7bM5PmfElP9lfW21X6uLwc/kDk6TmdwAsGCnAo4a9e8vBSH9W35Uy6mmV/A902lbcCISEdIi7cK8G5F36dsZBbgODwRJrSnAn0rzWqo4PsPBZjZ9sV9V2uO6mLjWc8f4hkjgYwNBAsEeFnWt0iC/rP2KGub2K0c36CWW44ID1EdBZobClqqJJTInBgTi9QWCfM1TuE5pthJX18idmx3X6usj8JrCQT902TkZAXn+87+4tFeuhK94r7qXVGj5b1cM758upnAeIdAtiNfPC7L6XKiFj3brXzjjPIb7ZlQ+UkbxfS2SptlI6G9/89Iwx1xfot+0WPF2iaKQ7bHo3S0+1xY154TWlYoXqP/eATh1dRkX6Gacho3eVazzx2aMsaFVbC5on2GxOAs2BiNZhpn7oj/LBSJQ4zWr5EUr0PZ/7tUf1ROlqNVEynfb6MZaRfh7fF7raVL0RyM4prQjds8Qjg/+O3Sz5gG3cPX6V0mNntjn+CGwN4oc/DcPy2ss9H9T4hbHbPSJosF6zdmZWkyiPhoEA2lWbC2DsqScfnw7BHU4UTDQysEJTDxjk2TMV2yjjJcSvAVu2YFykCAwEAAaNTMFEwHQYDVR0OBBYEFEfHS6zUhCCqbc69nazOeVo0T93cMB8GA1UdIwQYMBaAFEfHS6zUhCCqbc69nazOeVo0T93cMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGiG6200XOu3VXfct4Ghe61o4pTt/YQW0I97J8TWGc578WYqRAvD1UuT65I/8bCLpTM8fK0yEQTMVYNnIwPouqA/DWnbvmZ3Xttc9GCklN4lfA3f40rhKKpyDSGd8+nerRdjhRCqATw4eouQnfi9WQyQdTmrAZCaG42Agb+GZfTm4S8f6nUGf8rR30BYj+SFCr6MKcFvR6ArwLW8tAYdfxZ2MVsHdcRF7nKQJh/WrIDr/RvUd2eL67bPAnlE0utuWXKrl75H5qqPO53pxio8RY0vXcLUNy/dxCYDdHsX9CusBcBFViBha0GXx/6OU4PONE6OgNK23TYnHAM+40pW56HdJ/POhtp0ppLa6o2qTDFZ5fKykccV+s6RVP9WBCG+f29d3wEtM08mWpGRe+lPc3oQRK6d04x+m3Y1B/d/pZQdjfchNmyVYtdTT38AmYP8iG/KU3crQUZwk9Ou0erSEg45HslBjO6qA5RyD/v4zmqhPgEdYi7u3lu0Vv8/rD2KUKftXm1JTqMfLREYBUnqqBHEnEa9APVftTKWbee3qBbgds1mRB/76Bun6ALufmsQHIowRM3hDqUJmYKOM1YyjZXTF7QR2d5AG0Bkm5gdtnCOuSOsPafjyJSmI+29BDV9/YmrKkHmlCRm4OS6xvhKbsAqzM3wOMJARFNq2OxUNLsI</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIGIzCCBAugAwIBAgIUVesT28GLOdkG8PKTFr3ON3B5VZQwDQYJKoZIhvcNAQELBQAwgaAxCzAJBgNVBAYTAkRLMRMwEQYDVQQHDApDb3BlbmhhZ2VuMSowKAYDVQQKDCFOb3JkaWMgSW5zdGl0dXRlIG9mIEFzaWFuIFN0dWRpZXMxETAPBgNVBAsMCE5JQVNMSU5DMR0wGwYDVQQDDBRhdXRoLmFzaWFwb3J0YWwuaW5mbzEeMBwGCSqGSIb3DQEJARYPIGlsYkBuaWFzLmt1LmRrMB4XDTIzMDEyOTIwNDkxNloXDTMzMDEyNjIwNDkxNlowgaAxCzAJBgNVBAYTAkRLMRMwEQYDVQQHDApDb3BlbmhhZ2VuMSowKAYDVQQKDCFOb3JkaWMgSW5zdGl0dXRlIG9mIEFzaWFuIFN0dWRpZXMxETAPBgNVBAsMCE5JQVNMSU5DMR0wGwYDVQQDDBRhdXRoLmFzaWFwb3J0YWwuaW5mbzEeMBwGCSqGSIb3DQEJARYPIGlsYkBuaWFzLmt1LmRrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtf2BMGtCbRBzYdDEXQH8OpBGFgSXk52DutyHBjLLSzij5haDmgbfc4BW7lMZHKZKEFvW0sf4Rk/tlh9YpF5h/xbIjN2OyY7bM5PmfElP9lfW21X6uLwc/kDk6TmdwAsGCnAo4a9e8vBSH9W35Uy6mmV/A902lbcCISEdIi7cK8G5F36dsZBbgODwRJrSnAn0rzWqo4PsPBZjZ9sV9V2uO6mLjWc8f4hkjgYwNBAsEeFnWt0iC/rP2KGub2K0c36CWW44ID1EdBZobClqqJJTInBgTi9QWCfM1TuE5pthJX18idmx3X6usj8JrCQT902TkZAXn+87+4tFeuhK94r7qXVGj5b1cM758upnAeIdAtiNfPC7L6XKiFj3brXzjjPIb7ZlQ+UkbxfS2SptlI6G9/89Iwx1xfot+0WPF2iaKQ7bHo3S0+1xY154TWlYoXqP/eATh1dRkX6Gacho3eVazzx2aMsaFVbC5on2GxOAs2BiNZhpn7oj/LBSJQ4zWr5EUr0PZ/7tUf1ROlqNVEynfb6MZaRfh7fF7raVL0RyM4prQjds8Qjg/+O3Sz5gG3cPX6V0mNntjn+CGwN4oc/DcPy2ss9H9T4hbHbPSJosF6zdmZWkyiPhoEA2lWbC2DsqScfnw7BHU4UTDQysEJTDxjk2TMV2yjjJcSvAVu2YFykCAwEAAaNTMFEwHQYDVR0OBBYEFEfHS6zUhCCqbc69nazOeVo0T93cMB8GA1UdIwQYMBaAFEfHS6zUhCCqbc69nazOeVo0T93cMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGiG6200XOu3VXfct4Ghe61o4pTt/YQW0I97J8TWGc578WYqRAvD1UuT65I/8bCLpTM8fK0yEQTMVYNnIwPouqA/DWnbvmZ3Xttc9GCklN4lfA3f40rhKKpyDSGd8+nerRdjhRCqATw4eouQnfi9WQyQdTmrAZCaG42Agb+GZfTm4S8f6nUGf8rR30BYj+SFCr6MKcFvR6ArwLW8tAYdfxZ2MVsHdcRF7nKQJh/WrIDr/RvUd2eL67bPAnlE0utuWXKrl75H5qqPO53pxio8RY0vXcLUNy/dxCYDdHsX9CusBcBFViBha0GXx/6OU4PONE6OgNK23TYnHAM+40pW56HdJ/POhtp0ppLa6o2qTDFZ5fKykccV+s6RVP9WBCG+f29d3wEtM08mWpGRe+lPc3oQRK6d04x+m3Y1B/d/pZQdjfchNmyVYtdTT38AmYP8iG/KU3crQUZwk9Ou0erSEg45HslBjO6qA5RyD/v4zmqhPgEdYi7u3lu0Vv8/rD2KUKftXm1JTqMfLREYBUnqqBHEnEa9APVftTKWbee3qBbgds1mRB/76Bun6ALufmsQHIowRM3hDqUJmYKOM1YyjZXTF7QR2d5AG0Bkm5gdtnCOuSOsPafjyJSmI+29BDV9/YmrKkHmlCRm4OS6xvhKbsAqzM3wOMJARFNq2OxUNLsI</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 Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" FriendlyName="schacHomeOrganization" isRequired="true" 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.10" FriendlyName="eduPersonTargetedID" 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</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://nias.ku.dk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Inga-Lill Blomkvist</md:GivenName>
-    <md:EmailAddress>mailto:ilb@nias.ku.dk</md:EmailAddress>
-  </md:ContactPerson>
-  <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-edugain/auth.fieldsites.se-saml-cpauth.xml b/swamid-edugain/auth.fieldsites.se-saml-cpauth.xml
deleted file mode 100644
index 2ac094c1..00000000
--- a/swamid-edugain/auth.fieldsites.se-saml-cpauth.xml
+++ /dev/null
@@ -1,119 +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.fieldsites.se/saml/cpauth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-03-22T15:55: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://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://auth.fieldsites.se/saml/login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SITES Authentication Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Single sign on for SITES data services</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://auth.fieldsites.se/saml/privacyStatement</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://www.fieldsites.se/sv-SE</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.fieldsites.se/en-GB</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://auth.fieldsites.se/saml/privacyStatement</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="sv">SITES inloggningstjänst</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inloggning för SITES data tjänster</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>auth.fieldsites.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=auth.fieldsites.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIJAInunDnNa8QOMA0GCSqGSIb3DQEBCwUAMIHHMQswCQYD
-VQQGEwJTRTERMA8GA1UECAwIU2vDg8KlbmUxDTALBgNVBAcMBEx1bmQxNTAzBgNV
-BAoMLFN3ZWRpc2ggSW5mcmFzdHJ1Y3R1cmUgZm9yIEVjb3N5c3RlbSBTY2llbmNl
-MR8wHQYDVQQLDBZBdXRoZW50aWNhdGlvbiBTZXJ2aWNlMRswGQYDVQQDDBJhdXRo
-LmZpZWxkc2l0ZXMuc2UxITAfBgkqhkiG9w0BCQEWEmluZm9AZmllbGRzaXRlcy5z
-ZTAeFw0xODAzMTQxNTAxMjhaFw0yODAzMTExNTAxMjhaMIHHMQswCQYDVQQGEwJT
-RTERMA8GA1UECAwIU2vDg8KlbmUxDTALBgNVBAcMBEx1bmQxNTAzBgNVBAoMLFN3
-ZWRpc2ggSW5mcmFzdHJ1Y3R1cmUgZm9yIEVjb3N5c3RlbSBTY2llbmNlMR8wHQYD
-VQQLDBZBdXRoZW50aWNhdGlvbiBTZXJ2aWNlMRswGQYDVQQDDBJhdXRoLmZpZWxk
-c2l0ZXMuc2UxITAfBgkqhkiG9w0BCQEWEmluZm9AZmllbGRzaXRlcy5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL57JL9mbGSUjK6UgD73yGK3FLmW
-9JSoob2BoiXlO5AEcnqVBgINzAhPHTDdEfrjh3LChz1tDSOjIubcGAEd9KAV7lmE
-6Xf+wnRXgKKsyqF2As+vlT5JQF3JbuD+ezuE8i4sTzW2o/ach0nptAh3SUT47Qc/
-4YE6YA7gQncdsFi1w4j69Z8tGAOJydl4Z/ATspGiNSCYw5e8vpjuK06QHOq3pE8n
-Bq7Qn9CYO9f3dPsLm6qQcDHeLGrwFlcXDjPRu3eefhTKOyoCq5Yvar6vGdnvE9XV
-7laikYCR/Eq8LibfNjs85jY+VzFsIOJHSLztWaBIhWUKGf6HswPxjATrDvECAwEA
-AaNQME4wHQYDVR0OBBYEFBgKc06pZUImnNxea4xv7FvcqJaLMB8GA1UdIwQYMBaA
-FBgKc06pZUImnNxea4xv7FvcqJaLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
-BQADggEBAF9xJfdi7tErpxRe0yCw+M12SrkfiBWp/skwPSfps5DxrR5Kq3/D8H5X
-b8UpNU6UUQ12GBHhUP7OFv4VLz1OS3bwWxujRdMxjttW85rtjFCDnzjht2w1K3sJ
-+Wix+T8xHE8NVtg8wvEOr53/TKq0U1MwonVJLjbxRY8F3QexxXYGmDore/PtxDIb
-to63TmmP1EIbqrj1LGv23EngIG0wfhrKkV5cT1/TJ/0xJfLim6e66SO3crc9L2Q/
-r2UZOu21reg8IOKK+GgCBXVyc6ihEFpUF5sg/k4EThNjZM5PDDRYnwOwg8WdnOjF
-ut7vQ9gFxIHIfE526gVIlHUomwr6JGU=</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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.fieldsites.se/saml/logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.fieldsites.se/saml/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SITES SAML service</md:ServiceName>
-      <md:ServiceName xml:lang="sv">SITES SAML tjänst</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Single sign on for SITES data services</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Enskild inloggning för SITES data tjänster</md:ServiceDescription>
-      <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">SITES Data Portal</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SITES data portalen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SITES Data Portal</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">SITES data portalen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.fieldsites.se/en-GB</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.fieldsites.se/sv-SE</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:ContactPerson contactType="administrative">
-    <md:GivenName>Holger</md:GivenName>
-    <md:SurName>Villwock</md:SurName>
-    <md:EmailAddress>mailto:holger.villwock@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jonathan</md:GivenName>
-    <md:SurName>Thiry</md:SurName>
-    <md:EmailAddress>mailto:jonathan.thiry@nateko.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 009ab894..00000000
--- a/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.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://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://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 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:InformationURL xml:lang="sv">https://box.com</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://box-idp.nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://box-idp.nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
-      </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:ServiceName xml:lang="sv">NORDUnet Box Service Access</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NORDUnet Box Service Access (box.com)</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">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="sn" 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 A/S</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">NORDUnet A/S</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">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="technical">
-    <md:GivenName>NORDUNet</md:GivenName>
-    <md:SurName>NOC</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:ContactPerson contactType="administrative">
-    <md:Company>NORDUnet</md:Company>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <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-edugain/connect.eduid.se-sunet.xml b/swamid-edugain/connect.eduid.se-sunet.xml
deleted file mode 100644
index 38155c60..00000000
--- a/swamid-edugain/connect.eduid.se-sunet.xml
+++ /dev/null
@@ -1,84 +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.eduid.se/sunet">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-01-12T11:57: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>
-    </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/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"/>
-  </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://connect.eduid.se/sunet">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Login for SUNET employees - Connect</mdui:Description>
-        <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:Logo xml:lang="en" 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:Description xml:lang="sv">Inloggning för anställda på SUNET - Connect</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">SUNET - Connect</mdui:DisplayName>
-        <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="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <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:DisplayName xml:lang="en">SUNET - Connect</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEojCCAooCCQCk/Y2XZX1lrjANBgkqhkiG9w0BAQsFADATMREwDwYDVQQDDAhtZXRhZGF0YTAeFw0yMzAxMTExMjEwNDVaFw0zMzAxMDgxMjEwNDVaMBMxETAPBgNVBAMMCG1ldGFkYXRhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnYOOu8S/btaeICPNOFULDUnR0xJUWwnFNi6qkaZPXBbaJwd8LLzzpkVumNnjV46lWX4qzZxkzoPUZESgDz5ssxEI64ZP/1IxL6mda74ueaoH9mNU1zKzN0pu6u00C6oqOO9fML6ft66OkReKJvcIhkyyxEMzcOfrao8m9i5mcxr0S4qlDOVeW1NHKALa30/rz7sUmvzex37GRDIg2Ln8Asx1FWb0BraUVMEjVuBtLXvoGAqW21pvbEkmk9CwHFbL0DVVNK3ioVB5ld9W8rx4ovaVM88YD8kxTjGJphhXt46Eq8wRpkDJDxkfivWsuNrld/sgRT6zcskOddXNdbU2V6LhU7G9/Vjsc2AFmkNDvKJ7mChO/S6/AGw0q7m7xOmhIfgvlQ4x+oi0Kf2I2YOVNKLhAennv3nZ/WL2ut4A0Xr1LiVyD1BG0JejuYNIEagUpba6J/LCZAhKj6AWtK+tviqwJ9w2ePtW4XAOFCO/rWWBwyGLFreRJ5jedsCUPnfH1I0S8bOJcQyEzoEcXNjsSu0mrXZhxY6ISzhTRLeKNv3LRwvxBjcOCBohnm/qT6cX0rgNWb16nG/v3P5jD9cjcYQmH5Pp7BJS5FzixS3ehI6CKNyIDteda5XB64PlWfZ484eiAlyxiFZNBZxiy1N7ImhGiAuuegALeavLaQmmaZMCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAU93OHvb/DKzB8gzY+Y01olUwMWQegsR1B67BgwRIVxeCbFy6W+jAAd0nwqM+Aj5nReqh0fqhfyccdywnoNTUyMyUChxZVwdqVsshBDeeB08+u1WhBKV7dcpw8H6KtI6zqns4EZduK1AZXWbaBgKsO4DsemvUvK8kcx17PyCc19jao3GB6jzodg8nGUxRm/cnzm3rqzYPVzqBu1q7TVWcDanPkkEqS3KS7IKa6AFvatukBliesAfO01VXdevWCBkOaBANo3fQnMJdogYNVSgeNQxF2SKShjs36vjHZ+5BusNGzqMj/16AMoE8X1q6n8HUfZVOFaxOumf1+/+AdzB47O+lJsGXuGOEjbIBvynhw0ApFfds81gv9x+bYmvM+kRS1UBoY4BcHnCkQuMm6HUmTvzh5JGALSPUmqwUAal0swM6fJuVJW4qxU0DkAmdKctC2DcUEnTuZ4zEeC6vdCeiF66CZMykmsQtNy86O0iLyT/bop9+QyAb/E07mD4RFiGP90UhPLnlzotS0c4+3NoalU0i9kk3XnpnIJl7DLJb7mK9ghQ0o+zyHFm+6v+pZGjacKzP364nQvwmWzFYjjkuXLFZJAq9GC63OCs+gEjRcfHjIE5gBj254Ub98fxH1EnD1Pm37nRPRHOVQkSavVu3llJRlF7wsr260EuVEZDgj84=</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://connect.eduid.se/EduidSP/SunetIDP/sso/post"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.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-edugain/cpauth.icos-cp.eu-saml-cpauth.xml b/swamid-edugain/cpauth.icos-cp.eu-saml-cpauth.xml
deleted file mode 100644
index 3eb08186..00000000
--- a/swamid-edugain/cpauth.icos-cp.eu-saml-cpauth.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://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.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:InformationURL xml:lang="en">https://www.icos-cp.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.icos-cp.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">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 SAML service</md:ServiceName>
-      <md:ServiceName xml:lang="sv">ICOS Kolportalens SAML tjänst</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:OrganizationName xml:lang="sv">ICOS Kolportalen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Carbon Portal</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Kolportalen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.icos-cp.eu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.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:ContactPerson contactType="administrative">
-    <md:GivenName>Alex</md:GivenName>
-    <md:SurName>Vermeulen</md:SurName>
-    <md:EmailAddress>mailto:alex.vermeulen@nateko.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/crowd.nordu.net-shibboleth.xml b/swamid-edugain/crowd.nordu.net-shibboleth.xml
deleted file mode 100644
index fd89ad19..00000000
--- a/swamid-edugain/crowd.nordu.net-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://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://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 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: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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFTCCAf2gAwIBAgIUMyScM5ekvspV/J5JBwJghR+bEocwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPY3Jvd2Qubm9yZHUubmV0MB4XDTIyMTIwMjA5NTYwOFoX
-DTMyMTEyOTA5NTYwOFowGjEYMBYGA1UEAwwPY3Jvd2Qubm9yZHUubmV0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9fZ1P1V1x8XDG7tUDTQoHsyYmPjf
-9F6m0tk0XWoQgRgu6uATreBGlqULVEs3HjRXRrr3Zp72+VQnCvlJK48T//8pwgZ7
-syopirEw1HQRVQyCQuX8jCzpfogo9dkWD9Z4T8L9yZTo7NpPB08GaDfrRiz295Q6
-e3/f911GFIZGWv9CGsUnBml5FAb8bt/zAiu9VPoe+xjVA6NbphXjd+ifx4wEXPVZ
-Xt0ADHgvl3UldfcQf69jprWdGP3ypk9dnsxjgcExLy5T8Hb/NM3430MUGlvAdha9
-lDKci+IatSWAaLpsMwkfaT6xMaDL0QZlxoCpvYAQIyJ2ZcmTf+c6xflwUQIDAQAB
-o1MwUTAdBgNVHQ4EFgQU70elO3fc3ZqmyJfoN0i2vfAgob8wHwYDVR0jBBgwFoAU
-70elO3fc3ZqmyJfoN0i2vfAgob8wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAKwNIM+xrZnqoCr9RNBkZQgSnn1mYaY2YsvUwKnz7S82SOSa9EWBr
-FEsVgTJY12UAcXYP4KyOrSgHqPLT9Ak6ErqxhJDzkBhSwo5Of00cXBe51kfYAI6f
-oexG4GFLKDSqlNlym+JlTaYRwU2MX0LxWyUqeuDjrX3S4+Xy/d/J7I92+7vNLdlQ
-Xudf+Dvk9Q3s0+/q3keVBvHxHXXiX4OisNgSIr04boxdvVbmPKU5jyZEC3xkK8e5
-akr4R7hmmM4CLrxYWcCAwr5fBqlQa5C+H/JwTrieTW1gVvupbWJO36yLH0kwBKnr
-NfrvWSvloEF2ucdPRsR3nLg2ZOuYu9OY0w==</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:ServiceName xml:lang="sv">NORDUnet Tools</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NORDUnet Tools (confluence, jira)</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">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:OrganizationName xml:lang="sv">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">NORDUnet A/S</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="technical">
-    <md:Company>NORDUnet</md:Company>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <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: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-edugain/crowd.sunet.se-shibboleth.xml b/swamid-edugain/crowd.sunet.se-shibboleth.xml
deleted file mode 100644
index 73392372..00000000
--- a/swamid-edugain/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-edugain/demo.beta.seamlessaccess.org-shibboleth.xml b/swamid-edugain/demo.beta.seamlessaccess.org-shibboleth.xml
deleted file mode 100644
index 65fc0f36..00000000
--- a/swamid-edugain/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-edugain/demo.seamlessaccess.org-shibboleth.xml b/swamid-edugain/demo.seamlessaccess.org-shibboleth.xml
deleted file mode 100644
index 3402c5a0..00000000
--- a/swamid-edugain/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-edugain/drive-idp-proxy.sunet.se-sp.xml b/swamid-edugain/drive-idp-proxy.sunet.se-sp.xml
deleted file mode 100644
index 3fbd12f8..00000000
--- a/swamid-edugain/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-edugain/edusign.sunet.se-shibboleth.xml b/swamid-edugain/edusign.sunet.se-shibboleth.xml
deleted file mode 100644
index 630e2ca0..00000000
--- a/swamid-edugain/edusign.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,164 +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:RequestedAttribute FriendlyName="mailLocalAddress" Name="urn:oid:2.16.840.1.113730.3.1.13" 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-edugain/errorurl-sp-demo.swamid.se-shibboleth.xml b/swamid-edugain/errorurl-sp-demo.swamid.se-shibboleth.xml
deleted file mode 100644
index 91c2c238..00000000
--- a/swamid-edugain/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-edugain/fds.idp.hhs.se-adfs-services-trust.xml b/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
deleted file mode 100644
index 1a4fc966..00000000
--- a/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,127 +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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</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://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-edugain/federation.uniarts.se-adfs-services-trust.xml b/swamid-edugain/federation.uniarts.se-adfs-services-trust.xml
deleted file mode 100644
index 951bd91b..00000000
--- a/swamid-edugain/federation.uniarts.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,86 +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: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:PrivacyStatementURL xml:lang="en">https://www.uniarts.se/english/other-pages/service-definition</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uniarts.se/ovriga-sidor/service-definition</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHbTCCBVWgAwIBAgIRAIFT5MlhX88ok6DGmaqiYzUwDQYJKoZIhvcNAQEMBQAwRDELMAkGA1UEBhMCTkwxGTAXBgNVBAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0MB4XDTIyMDkxNDAwMDAwMFoXDTIzMDkxNDIzNTk1OVowdDELMAkGA1UEBhMCU0UxGDAWBgNVBAgMD1N0b2NraG9sbXMgbMOkbjErMCkGA1UECgwiU3RvY2tob2xtcyBrb25zdG7DpHJsaWdhIGjDtmdza29sYTEeMBwGA1UEAxMVZmVkZXJhdGlvbi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApiB7DQ9UZ5eFoRA9F+oEyvUnKM+pUjqSNZcTHt3XF3CeBEFb45TeC8lyhNGops3uIMhUtFrXZZ+qY5zJTpolpFZ329YWzHmz51NMGy6Bpv+OP9GyOARclG/hL9nkVtGpcX59TJ7Kple0z6Wk5FRjhC1ZkkMSzjqLKkblSWjaXOIxHH/uJ4lFU3c25xEoQwNoepL2k/HkY0mLBEBKR7NHxaeGNLH3qFVv7AYa+mMN5Y7BzkL3J0Mr8Nu6b1vj7F9bUFJusaxhy9545rxirfQj+l+QpyjIqd7g4naizMg7TvNDGPJEL/SrKezvjvNPAZ7ZK8Hhaw05EpQ0jCzbpoQg5QIDAQABo4IDKDCCAyQwHwYDVR0jBBgwFoAUbx01SRBsMvpZoJ68iugflb5xegwwHQYDVR0OBBYEFIKRQL9LUELEysRMI7vxEbCLHWExMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgJPMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAECAjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vR0VBTlQuY3JsLnNlY3RpZ28uY29tL0dFQU5UT1ZSU0FDQTQuY3JsMHUGCCsGAQUFBwEBBGkwZzA6BggrBgEFBQcwAoYuaHR0cDovL0dFQU5ULmNydC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0LmNydDApBggrBgEFBQcwAYYdaHR0cDovL0dFQU5ULm9jc3Auc2VjdGlnby5jb20wggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2AK33vvp8/xDIi509nB4+GGq0Zyldz7EMJMqFhjTr3IKKAAABgzx/M44AAAQDAEcwRQIhAOQJxE5nN7VoWpxV1A74H2m2/SGtcN/hp7VqNKLXlXb0AiB3pHs0TOyVe0mop7ziIufTZzOTqKN7qU5exNdzQbEYhAB2AHoyjFTYty22IOo44FIe6YQWcDIThU070ivBOlejUutSAAABgzx/M3kAAAQDAEcwRQIgNA0QWxy5W+j9rA2ogiKxwnNrj4dXeGVgt6FDgqE2wHgCIQCGNZTWwJoe3xu+ysPODWvjiTnmM9I8yL1Ie/0l9iod0gB2AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1uAAABgzx/M0gAAAQDAEcwRQIhAOmZKM/wEdQWzRNLCylz25pYFJDZjzqPORG8ioJTvEd6AiAJ2prIM8UcjWRRnSXLzsSVWQzL4IfzIXVUKlE/hO+1bjAgBgNVHREEGTAXghVmZWRlcmF0aW9uLnVuaWFydHMuc2UwDQYJKoZIhvcNAQEMBQADggIBAEmvrrA3obvWmf0PBWu9MAS4PqtAommYsD2GK5m7g2wsDKZjI5kCqucKyqUjtRLAkf27c3o7YG05LV+EPALKkULIl18l5gfib6SJisS3YmWo29Q+mw/Zh7D8fsdz9ra7MypGwKsW+mLmDm+eaDfpXbQ3wN+CwLQR0fRHqGDn1ts1rmRceXTr6FKUNTJGVcjO6X2Ewn3NofnDUm5SUQKOUv8oVRj2hs4p3kVPQn382sB9vCQAK0hzILYW1O/hJKKZhsuFtRzIgUtHhCvHjcnbWcHdAyqGFUYrK6dP8QYYebujiKdXsRsY5vmR2lvDYqasXwkYGDhRKwrq1lGiFV0v7Ri0LlCxmVRflxvpEQgvvCddWmnDWxInZYCNo6nAL0g7r2aDpdMTEkk2uv0fOrBuoLeDeLMiqx5mRJx5N+GRoha0zNBnkUpHIloDD9v6xkhEDWhl/2J0j3L/16paEhn0U9ZnCBFhyvGKrxbJD9pMZFnsVmiJn0/HgFfRMl/cWI31zUXuqvfMKoQAOlBxNDEwCo7vGNc8jv83fEC36Bn6Ns/CCGUbNAYwGvtexhy0S1dFzE/6s6hvmeRs6QamTNQ2qTFGKA3SMISmW3vNQPYYCtj1rHxOWx0nr4poH8VP7Qg7qEv5LildbcODvipVidMcjl5TSzanRws/rBx4e8zcos3m</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHbTCCBVWgAwIBAgIRAIFT5MlhX88ok6DGmaqiYzUwDQYJKoZIhvcNAQEMBQAwRDELMAkGA1UEBhMCTkwxGTAXBgNVBAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0MB4XDTIyMDkxNDAwMDAwMFoXDTIzMDkxNDIzNTk1OVowdDELMAkGA1UEBhMCU0UxGDAWBgNVBAgMD1N0b2NraG9sbXMgbMOkbjErMCkGA1UECgwiU3RvY2tob2xtcyBrb25zdG7DpHJsaWdhIGjDtmdza29sYTEeMBwGA1UEAxMVZmVkZXJhdGlvbi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApiB7DQ9UZ5eFoRA9F+oEyvUnKM+pUjqSNZcTHt3XF3CeBEFb45TeC8lyhNGops3uIMhUtFrXZZ+qY5zJTpolpFZ329YWzHmz51NMGy6Bpv+OP9GyOARclG/hL9nkVtGpcX59TJ7Kple0z6Wk5FRjhC1ZkkMSzjqLKkblSWjaXOIxHH/uJ4lFU3c25xEoQwNoepL2k/HkY0mLBEBKR7NHxaeGNLH3qFVv7AYa+mMN5Y7BzkL3J0Mr8Nu6b1vj7F9bUFJusaxhy9545rxirfQj+l+QpyjIqd7g4naizMg7TvNDGPJEL/SrKezvjvNPAZ7ZK8Hhaw05EpQ0jCzbpoQg5QIDAQABo4IDKDCCAyQwHwYDVR0jBBgwFoAUbx01SRBsMvpZoJ68iugflb5xegwwHQYDVR0OBBYEFIKRQL9LUELEysRMI7vxEbCLHWExMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgJPMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAECAjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vR0VBTlQuY3JsLnNlY3RpZ28uY29tL0dFQU5UT1ZSU0FDQTQuY3JsMHUGCCsGAQUFBwEBBGkwZzA6BggrBgEFBQcwAoYuaHR0cDovL0dFQU5ULmNydC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0LmNydDApBggrBgEFBQcwAYYdaHR0cDovL0dFQU5ULm9jc3Auc2VjdGlnby5jb20wggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2AK33vvp8/xDIi509nB4+GGq0Zyldz7EMJMqFhjTr3IKKAAABgzx/M44AAAQDAEcwRQIhAOQJxE5nN7VoWpxV1A74H2m2/SGtcN/hp7VqNKLXlXb0AiB3pHs0TOyVe0mop7ziIufTZzOTqKN7qU5exNdzQbEYhAB2AHoyjFTYty22IOo44FIe6YQWcDIThU070ivBOlejUutSAAABgzx/M3kAAAQDAEcwRQIgNA0QWxy5W+j9rA2ogiKxwnNrj4dXeGVgt6FDgqE2wHgCIQCGNZTWwJoe3xu+ysPODWvjiTnmM9I8yL1Ie/0l9iod0gB2AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1uAAABgzx/M0gAAAQDAEcwRQIhAOmZKM/wEdQWzRNLCylz25pYFJDZjzqPORG8ioJTvEd6AiAJ2prIM8UcjWRRnSXLzsSVWQzL4IfzIXVUKlE/hO+1bjAgBgNVHREEGTAXghVmZWRlcmF0aW9uLnVuaWFydHMuc2UwDQYJKoZIhvcNAQEMBQADggIBAEmvrrA3obvWmf0PBWu9MAS4PqtAommYsD2GK5m7g2wsDKZjI5kCqucKyqUjtRLAkf27c3o7YG05LV+EPALKkULIl18l5gfib6SJisS3YmWo29Q+mw/Zh7D8fsdz9ra7MypGwKsW+mLmDm+eaDfpXbQ3wN+CwLQR0fRHqGDn1ts1rmRceXTr6FKUNTJGVcjO6X2Ewn3NofnDUm5SUQKOUv8oVRj2hs4p3kVPQn382sB9vCQAK0hzILYW1O/hJKKZhsuFtRzIgUtHhCvHjcnbWcHdAyqGFUYrK6dP8QYYebujiKdXsRsY5vmR2lvDYqasXwkYGDhRKwrq1lGiFV0v7Ri0LlCxmVRflxvpEQgvvCddWmnDWxInZYCNo6nAL0g7r2aDpdMTEkk2uv0fOrBuoLeDeLMiqx5mRJx5N+GRoha0zNBnkUpHIloDD9v6xkhEDWhl/2J0j3L/16paEhn0U9ZnCBFhyvGKrxbJD9pMZFnsVmiJn0/HgFfRMl/cWI31zUXuqvfMKoQAOlBxNDEwCo7vGNc8jv83fEC36Bn6Ns/CCGUbNAYwGvtexhy0S1dFzE/6s6hvmeRs6QamTNQ2qTFGKA3SMISmW3vNQPYYCtj1rHxOWx0nr4poH8VP7Qg7qEv5LildbcODvipVidMcjl5TSzanRws/rBx4e8zcos3m</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:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</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:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/fs.bth.se-adfs-services-trust.xml b/swamid-edugain/fs.bth.se-adfs-services-trust.xml
deleted file mode 100644
index 62f094aa..00000000
--- a/swamid-edugain/fs.bth.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://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: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>
-    </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-edugain/fs.liu.se-adfs-services-trust.xml b/swamid-edugain/fs.liu.se-adfs-services-trust.xml
deleted file mode 100644
index ba35b0c9..00000000
--- a/swamid-edugain/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-edugain/gdb.vr.se.xml b/swamid-edugain/gdb.vr.se.xml
deleted file mode 100644
index 8bc19f0c..00000000
--- a/swamid-edugain/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-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml b/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
deleted file mode 100644
index c4db2007..00000000
--- a/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.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://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.su.se/english/about-this-website-1.517563?open-collapse-boxes=ccbd-personaldata</mdui:PrivacyStatementURL>
-        <mdui:Description xml:lang="sv">Fysikum Gitlab</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Fysikum Gitlab</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.su.se/fysikum/om-institutionen/internt/systemgruppens-hj%C3%A4lpsidor-1.566463</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/om-webbplatsen-1.517562?open-collapse-boxes=ccbd-personuppgiftsbehandling</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">Stockholm University</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.su.se/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fysikum</md:GivenName>
-    <md:SurName>Alex Kastanas</md:SurName>
-    <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Fysikum</md:GivenName>
-    <md:SurName>Alex Kastanas</md:SurName>
-    <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Fysikum</md:GivenName>
-    <md:SurName>Fysikum, Stockholms Universitet</md:SurName>
-    <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/graylog.nordu.net-shibboleth.xml b/swamid-edugain/graylog.nordu.net-shibboleth.xml
deleted file mode 100644
index 2e6b1682..00000000
--- a/swamid-edugain/graylog.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,119 +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.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://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:PrivacyStatementURL xml:lang="en">https://graylog.nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://graylog.nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://www.graylog.org/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.graylog.org/</mdui:InformationURL>
-      </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:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NORDUnet Graylog</md:ServiceName>
-      <md:ServiceName xml:lang="sv">NORDUnet Graylog</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="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="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">NORDUnet A/S</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">NORDUnet A/S</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">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="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-edugain/idp-proxy.drive.test.sunet.se-sp.xml b/swamid-edugain/idp-proxy.drive.test.sunet.se-sp.xml
deleted file mode 100644
index 18582672..00000000
--- a/swamid-edugain/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-edugain/idp-shib.slu.se-idp.xml b/swamid-edugain/idp-shib.slu.se-idp.xml
deleted file mode 100644
index f5c944d5..00000000
--- a/swamid-edugain/idp-shib.slu.se-idp.xml
+++ /dev/null
@@ -1,259 +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: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/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: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://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: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-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: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-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 Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IT Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Helpdesk</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 Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml b/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml
deleted file mode 100644
index 5ebdc487..00000000
--- a/swamid-edugain/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-edugain/idp-v2.suni.se-adfs-services-trust.xml b/swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml
deleted file mode 100644
index 78ed5964..00000000
--- a/swamid-edugain/idp-v2.suni.se-adfs-services-trust.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://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:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</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: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-edugain/idp.chalmers.se-adfs-services-trust.xml b/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
deleted file mode 100644
index 7396ef74..00000000
--- a/swamid-edugain/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: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=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://intranet.chalmers.se/media/1056/chalmers_black.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="81" width="625">https://intranet.chalmers.se/media/1056/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-edugain/idp.esh.se-idp-shibboleth.xml b/swamid-edugain/idp.esh.se-idp-shibboleth.xml
deleted file mode 100644
index 01723001..00000000
--- a/swamid-edugain/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-edugain/idp.hb.se-idp-shibboleth.xml b/swamid-edugain/idp.hb.se-idp-shibboleth.xml
deleted file mode 100644
index 07e0c33d..00000000
--- a/swamid-edugain/idp.hb.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,340 +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>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="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE7jCCAtagAwIBAgIVAOYUZM0zUB7/ElZFFERtsrXKrs5YMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTAeFw0yMjEyMTAxOTEwNTZaFw0zMjEy
-MTAxOTEwNTZaMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAKTBjJZFXeE6TY1ZPIj++2iLbIjO30NVTgjeuwSpUkiK
-WdbPE3gTyEI6EgVCy7iDxp1p9gSw0RxExEGA5KRqJWorMd3mEXWTf4SHp7uOIy7O
-J8WBqE0UuWuCY8q4ByZ4KC+CylFNhObAZG9PRJOJ/bIG319fY/Su1kzNypLf1h2w
-BJXM5DHBcqPv+7HF+MwpV0eoyXuHXAc857ldh+8RinzfOk77H5+zqE0ywIisDFLD
-eQ29gNWzFgvMghy4jBBCHU7GFFUuR/BBQlSowrGnZej0fRncHK8cvSvxIU8KRLmh
-RlykiOPCHm8MiIa/TJ8tgAQ5044qhrx/BWQ8uHPMUIMv8zrC9HdoFHrz3H+5NEYi
-gK00zzKoAcC5zZGKFyOB3qPE0DTX+mrxXX0NYE2rlkR0rXUiWfdYVXhnp6bZOJoA
-yXhcl0QG//U9/AsEUjOH+MqKkxjbH0tB5/x+C4LUbnYgG1/dbyKMBk7XS1IZAsSz
-R4FOmXI8ck3X94JsVX11wWeTnCxvodEE5OnV76Mmvg3k3UuGkNPtKnxPZyil20R3
-Iihtl/Zn9/KjhvGiO0/gz01OGswPhudJtZhnguf4Bapp50oAJEpIGQldfGvdGDEN
-48NsdSAAuQc44VtpumW01nhyq0v+h5DO8VrHZfBeBNYFzIPM0W8+sm7HAbcGBN0N
-AgMBAAGjNzA1MB0GA1UdDgQWBBTGVb6Zdk6HiQmWLM2hH4YZVl6R9TAUBgNVHREE
-DTALgglpZHAuaGIuc2UwDQYJKoZIhvcNAQELBQADggIBAGei1HYlxqXG1m6MGFtm
-5Uf95HMq9qA7RRPTM8+S822WNqAZl9tUdiLkrHP/iH7+1/8KjqhlHW54M7RRlQhu
-Ixb6SKp4hIFk9WCm6uZHCtmWE4eZwgCezp0ENpmXXz9/4P70F95kq9d+CTe+pFnB
-lDQQtxxWk05C5kjwEJ1HqubgKO/5OEdOE9/2nofyu2X8TLRArZjKHbZ7MaFLYGdF
-n7OXnLZRBybgddqSSyxTiEeWBSO2nyazBdzogiYhy5BsuHyZFgy0Ixx1dWrqgE0Z
-0j3gIkTeH1NKqslP3qCGsoI0zGGGHtlULMwqp1yhFfk03s/0KfKrkg1b6uN9yQGW
-iv1RJ77S3IAN7SZSd5slLbRm7kPC6OeEyhKBk3JDdNHpT7W43O4EccuYl9no7eBG
-AiFNYCAm4GTjapg268Me3Bpn6Sxrn0ONIM1410gMDvYvOUbvuL1FW8Ar4idVPgPR
-zCuWjqX3+225kpZ44nLloeEsx1EL3JGjo5RBScJfH4GsU9JVKfvZSlIc+rn8mf6y
-alUMbrX1ESgB0AlHxQt4XwyAqilGIA7yevE5KpfoWhb5E4W1mDLO2E+QGRH3Zo8g
-YnA8moDJE3mVOIaBMXZHptScEd9TbPYd8xOXTf8dpnr9/+EyhpCdHcsL0s73zGvY
-R17u+ZLh6q7ZL8grOV2cmboW</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE7jCCAtagAwIBAgIVAK9TocGkbu27kocUI2wmAd4f3RRJMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTAeFw0yMjEyMTAxOTEwMTBaFw0zMjEy
-MTAxOTEwMTBaMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAJ52NiWPWp9PXJc7QKGbLkSZ3mB11UCv1EA6v19hdJD6
-ZFwMQzy0dZP1Ak17/dcpr7Sdb4fMOfCwNaCF0AoX+37nSFrpvFDQqUrH5tU9YhIC
-H1lZgxBdIJyyEwLmPSf2I0+kZ0IA7CsZrhOWJtZFl6UIGv3+4HQ/trmZbKA11xUe
-o5txqLGzQpeSaInt/b3sMSqPpsHtdnN3QD2yfcCNIV46kLisFS1K1SRfz2vStL67
-uwUMmf/JrqHwKoa3iF5Eq7B04EbXY+qFx4OsfZEJB9JyqhLgMaQw5k9kHgDtGK0k
-5G/fPeoHoM6WtKxJDGYCtrAU1FtwCfiiqCnqy6YFXuun4big48XD3z+P8rkZqjZR
-T1OB8uxAtV01K5CHy6YYqaltPJki/s3D19L5CuYHQKSrrPRJ/mAvDW9IAbougHM+
-MTT87xGgHQP9dUBB9Ovp6+Ck1hCoVFi7XuO3qIwbzVzyCjT00J0yI8C6VGXe4GOD
-WGCfVudfNFP02NxqotErBeypESgrMl1QoEJ62d/owRpBb1jFNq/6hKlN52DvmFNy
-4jnALiYAcg4H/lCRK6MUaFY072RORz5Eeb7GRAphZNl+GwOqlIiCpwzdhY2p3RqD
-DSBaCU4X5nqt1YQWfIWR9sCVgakuv19W1BpFzB3eJ9ooYLzh5fFzKYoyI9/0O4BB
-AgMBAAGjNzA1MB0GA1UdDgQWBBQBNHKBXOXnMBaWXKMsyADo9IG7TjAUBgNVHREE
-DTALgglpZHAuaGIuc2UwDQYJKoZIhvcNAQELBQADggIBADFK3LdeHIr66YdSrv51
-fy5ybcQJbsxNMWCmUNWcObNDjqlwH1VZL51GjXQ5GheAXCgWxCtTY65ttE5hR3Kp
-uxItVSgia9npP7vAEeBrY07yZItXlIOtz+GDqsua8Z39IK9GXa9f7a9q5LurUHZA
-kVVC9D9OY/JWbMUefLmc5R8AFPmrrMqEgwvqXgeujzCIti+Tp9X6I1sxA4X5Cby5
-jUrb4scXlWqH+mQ83FUn2mb/dDOjhV/hM7uv7KR4eHEEWih2M60jYDhzeXzbwp1a
-2Xod3B0g7Kk7I682fERMHnDzpcRxybYVPZwHzo1sfrJpspO0QK2OSZOH5pEcNYhL
-W/aeXKwvqlZ23l0DlEa51iGrRvqKy0dMh4vjC7pDxL6sJsF8XCfCaYMB+SEcT/rh
-gp/CVuy0WJ7876fmAHOrvIM2ciSzWQtINM/3W3hRsenX12/MIpcLXSeUST5TJm2q
-t/tZf+cxsj4NPI+i/Ba9v3DLnKvnFIGviCyxnYxMb26sElwpf52pgSCuLK6PTR7z
-FPaPk7oAQHwfrf0dS8hSr1Sz//cEII1e1id1yh/mFxvS5Sg4ZPND5//KhZ/bd9md
-eoLhA94GnVrAaIQRD0m/DxGNxe/mxtq5alAl/J1G5punm7b9OacD8uWwAdZtO9ty
-aLtt49myHKbt5+lsrnCgqff6</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="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE7jCCAtagAwIBAgIVAOYUZM0zUB7/ElZFFERtsrXKrs5YMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTAeFw0yMjEyMTAxOTEwNTZaFw0zMjEy
-MTAxOTEwNTZaMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAKTBjJZFXeE6TY1ZPIj++2iLbIjO30NVTgjeuwSpUkiK
-WdbPE3gTyEI6EgVCy7iDxp1p9gSw0RxExEGA5KRqJWorMd3mEXWTf4SHp7uOIy7O
-J8WBqE0UuWuCY8q4ByZ4KC+CylFNhObAZG9PRJOJ/bIG319fY/Su1kzNypLf1h2w
-BJXM5DHBcqPv+7HF+MwpV0eoyXuHXAc857ldh+8RinzfOk77H5+zqE0ywIisDFLD
-eQ29gNWzFgvMghy4jBBCHU7GFFUuR/BBQlSowrGnZej0fRncHK8cvSvxIU8KRLmh
-RlykiOPCHm8MiIa/TJ8tgAQ5044qhrx/BWQ8uHPMUIMv8zrC9HdoFHrz3H+5NEYi
-gK00zzKoAcC5zZGKFyOB3qPE0DTX+mrxXX0NYE2rlkR0rXUiWfdYVXhnp6bZOJoA
-yXhcl0QG//U9/AsEUjOH+MqKkxjbH0tB5/x+C4LUbnYgG1/dbyKMBk7XS1IZAsSz
-R4FOmXI8ck3X94JsVX11wWeTnCxvodEE5OnV76Mmvg3k3UuGkNPtKnxPZyil20R3
-Iihtl/Zn9/KjhvGiO0/gz01OGswPhudJtZhnguf4Bapp50oAJEpIGQldfGvdGDEN
-48NsdSAAuQc44VtpumW01nhyq0v+h5DO8VrHZfBeBNYFzIPM0W8+sm7HAbcGBN0N
-AgMBAAGjNzA1MB0GA1UdDgQWBBTGVb6Zdk6HiQmWLM2hH4YZVl6R9TAUBgNVHREE
-DTALgglpZHAuaGIuc2UwDQYJKoZIhvcNAQELBQADggIBAGei1HYlxqXG1m6MGFtm
-5Uf95HMq9qA7RRPTM8+S822WNqAZl9tUdiLkrHP/iH7+1/8KjqhlHW54M7RRlQhu
-Ixb6SKp4hIFk9WCm6uZHCtmWE4eZwgCezp0ENpmXXz9/4P70F95kq9d+CTe+pFnB
-lDQQtxxWk05C5kjwEJ1HqubgKO/5OEdOE9/2nofyu2X8TLRArZjKHbZ7MaFLYGdF
-n7OXnLZRBybgddqSSyxTiEeWBSO2nyazBdzogiYhy5BsuHyZFgy0Ixx1dWrqgE0Z
-0j3gIkTeH1NKqslP3qCGsoI0zGGGHtlULMwqp1yhFfk03s/0KfKrkg1b6uN9yQGW
-iv1RJ77S3IAN7SZSd5slLbRm7kPC6OeEyhKBk3JDdNHpT7W43O4EccuYl9no7eBG
-AiFNYCAm4GTjapg268Me3Bpn6Sxrn0ONIM1410gMDvYvOUbvuL1FW8Ar4idVPgPR
-zCuWjqX3+225kpZ44nLloeEsx1EL3JGjo5RBScJfH4GsU9JVKfvZSlIc+rn8mf6y
-alUMbrX1ESgB0AlHxQt4XwyAqilGIA7yevE5KpfoWhb5E4W1mDLO2E+QGRH3Zo8g
-YnA8moDJE3mVOIaBMXZHptScEd9TbPYd8xOXTf8dpnr9/+EyhpCdHcsL0s73zGvY
-R17u+ZLh6q7ZL8grOV2cmboW</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE7jCCAtagAwIBAgIVAK9TocGkbu27kocUI2wmAd4f3RRJMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTAeFw0yMjEyMTAxOTEwMTBaFw0zMjEy
-MTAxOTEwMTBaMBQxEjAQBgNVBAMMCWlkcC5oYi5zZTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAJ52NiWPWp9PXJc7QKGbLkSZ3mB11UCv1EA6v19hdJD6
-ZFwMQzy0dZP1Ak17/dcpr7Sdb4fMOfCwNaCF0AoX+37nSFrpvFDQqUrH5tU9YhIC
-H1lZgxBdIJyyEwLmPSf2I0+kZ0IA7CsZrhOWJtZFl6UIGv3+4HQ/trmZbKA11xUe
-o5txqLGzQpeSaInt/b3sMSqPpsHtdnN3QD2yfcCNIV46kLisFS1K1SRfz2vStL67
-uwUMmf/JrqHwKoa3iF5Eq7B04EbXY+qFx4OsfZEJB9JyqhLgMaQw5k9kHgDtGK0k
-5G/fPeoHoM6WtKxJDGYCtrAU1FtwCfiiqCnqy6YFXuun4big48XD3z+P8rkZqjZR
-T1OB8uxAtV01K5CHy6YYqaltPJki/s3D19L5CuYHQKSrrPRJ/mAvDW9IAbougHM+
-MTT87xGgHQP9dUBB9Ovp6+Ck1hCoVFi7XuO3qIwbzVzyCjT00J0yI8C6VGXe4GOD
-WGCfVudfNFP02NxqotErBeypESgrMl1QoEJ62d/owRpBb1jFNq/6hKlN52DvmFNy
-4jnALiYAcg4H/lCRK6MUaFY072RORz5Eeb7GRAphZNl+GwOqlIiCpwzdhY2p3RqD
-DSBaCU4X5nqt1YQWfIWR9sCVgakuv19W1BpFzB3eJ9ooYLzh5fFzKYoyI9/0O4BB
-AgMBAAGjNzA1MB0GA1UdDgQWBBQBNHKBXOXnMBaWXKMsyADo9IG7TjAUBgNVHREE
-DTALgglpZHAuaGIuc2UwDQYJKoZIhvcNAQELBQADggIBADFK3LdeHIr66YdSrv51
-fy5ybcQJbsxNMWCmUNWcObNDjqlwH1VZL51GjXQ5GheAXCgWxCtTY65ttE5hR3Kp
-uxItVSgia9npP7vAEeBrY07yZItXlIOtz+GDqsua8Z39IK9GXa9f7a9q5LurUHZA
-kVVC9D9OY/JWbMUefLmc5R8AFPmrrMqEgwvqXgeujzCIti+Tp9X6I1sxA4X5Cby5
-jUrb4scXlWqH+mQ83FUn2mb/dDOjhV/hM7uv7KR4eHEEWih2M60jYDhzeXzbwp1a
-2Xod3B0g7Kk7I682fERMHnDzpcRxybYVPZwHzo1sfrJpspO0QK2OSZOH5pEcNYhL
-W/aeXKwvqlZ23l0DlEa51iGrRvqKy0dMh4vjC7pDxL6sJsF8XCfCaYMB+SEcT/rh
-gp/CVuy0WJ7876fmAHOrvIM2ciSzWQtINM/3W3hRsenX12/MIpcLXSeUST5TJm2q
-t/tZf+cxsj4NPI+i/Ba9v3DLnKvnFIGviCyxnYxMb26sElwpf52pgSCuLK6PTR7z
-FPaPk7oAQHwfrf0dS8hSr1Sz//cEII1e1id1yh/mFxvS5Sg4ZPND5//KhZ/bd9md
-eoLhA94GnVrAaIQRD0m/DxGNxe/mxtq5alAl/J1G5punm7b9OacD8uWwAdZtO9ty
-aLtt49myHKbt5+lsrnCgqff6</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-edugain/idp.hh.se-idp-shibboleth.xml b/swamid-edugain/idp.hh.se-idp-shibboleth.xml
deleted file mode 100644
index 1f4f8d0b..00000000
--- a/swamid-edugain/idp.hh.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://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>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://myacademicid.org/entity-categories/esi</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/pseudonymous</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://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>+46 35 167800</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Halmstad University</md:Company>
-    <md:GivenName>IRT Halmstad University</md:GivenName>
-    <md:EmailAddress>mailto:helpdesk.irt@hh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 35 167800</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/idp.his.se-idp-shibboleth.xml b/swamid-edugain/idp.his.se-idp-shibboleth.xml
deleted file mode 100644
index 1a5c69aa..00000000
--- a/swamid-edugain/idp.his.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,191 +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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</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: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:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>HiS Netadmin</md:GivenName>
-    <md:SurName>HiS Netadmin</md:SurName>
-    <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/idp.hkr.se-idp-shibboleth.xml b/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
deleted file mode 100644
index 31952a5c..00000000
--- a/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,141 +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: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://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">Kristianstad University Sweden</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan Kristianstad</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-edugain/idp.it.su.se-idp-shibboleth.xml b/swamid-edugain/idp.it.su.se-idp-shibboleth.xml
deleted file mode 100644
index 93ce4a14..00000000
--- a/swamid-edugain/idp.it.su.se-idp-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://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: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.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-edugain/idp.kmh.se-idp-shibboleth.xml b/swamid-edugain/idp.kmh.se-idp-shibboleth.xml
deleted file mode 100644
index 76352811..00000000
--- a/swamid-edugain/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-edugain/idp.kva.se-idp-shibboleth.xml b/swamid-edugain/idp.kva.se-idp-shibboleth.xml
deleted file mode 100644
index 733a3a47..00000000
--- a/swamid-edugain/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-edugain/idp.lnu.se-idp-shibboleth.xml b/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
deleted file mode 100644
index 41db3c9a..00000000
--- a/swamid-edugain/idp.lnu.se-idp-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://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: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>
-    </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-edugain/idp.ltu.se-idp-shibboleth.xml b/swamid-edugain/idp.ltu.se-idp-shibboleth.xml
deleted file mode 100644
index b247b4a1..00000000
--- a/swamid-edugain/idp.ltu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,236 +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>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 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-edugain/idp.mah.se-idp-shibboleth.xml b/swamid-edugain/idp.mah.se-idp-shibboleth.xml
deleted file mode 100644
index d76c45c8..00000000
--- a/swamid-edugain/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-edugain/idp.mdh.se-idp-shibboleth.xml b/swamid-edugain/idp.mdh.se-idp-shibboleth.xml
deleted file mode 100644
index 1b12d253..00000000
--- a/swamid-edugain/idp.mdh.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://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: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>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/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>
-    </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">https://idp.mdh.se/idp.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idp.mdh.se/idp.html</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@mdu.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>MDU Drift</md:SurName>
-    <md:EmailAddress>mailto:drift.ita@mdu.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 MDU</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@mdu.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-edugain/idp.nordu.net-idp-shibboleth.xml b/swamid-edugain/idp.nordu.net-idp-shibboleth.xml
deleted file mode 100644
index 793b09b1..00000000
--- a/swamid-edugain/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-edugain/idp.oru.se-idp-shibboleth.xml b/swamid-edugain/idp.oru.se-idp-shibboleth.xml
deleted file mode 100644
index 4bb86edc..00000000
--- a/swamid-edugain/idp.oru.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,190 +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: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.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://sp-01.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="65" width="90">https://sp-01.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>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: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-edugain/idp.sunet.se-idp.xml b/swamid-edugain/idp.sunet.se-idp.xml
deleted file mode 100644
index ba937a17..00000000
--- a/swamid-edugain/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-edugain/idp.ths.se-idp-shibboleth.xml b/swamid-edugain/idp.ths.se-idp-shibboleth.xml
deleted file mode 100644
index 16cb6dd8..00000000
--- a/swamid-edugain/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-edugain/idp.vr.se-adfs-services-trust.xml b/swamid-edugain/idp.vr.se-adfs-services-trust.xml
deleted file mode 100644
index 0c536cd2..00000000
--- a/swamid-edugain/idp.vr.se-adfs-services-trust.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="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: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=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-edugain/idp01.gih.se-idp-shibboleth.xml b/swamid-edugain/idp01.gih.se-idp-shibboleth.xml
deleted file mode 100644
index 089161ac..00000000
--- a/swamid-edugain/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-edugain/idp2.bth.se-idp-shibboleth.xml b/swamid-edugain/idp2.bth.se-idp-shibboleth.xml
deleted file mode 100644
index 2173671b..00000000
--- a/swamid-edugain/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-edugain/idp2.kkh.se-idp-shibboleth.xml b/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml
deleted file mode 100644
index 3b8255c0..00000000
--- a/swamid-edugain/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-edugain/idp3.hig.se-idp-shibboleth.xml b/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
deleted file mode 100644
index 4d9b6a6b..00000000
--- a/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,232 +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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</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://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://reset.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://reset.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-edugain/idp3.it.gu.se-idp-shibboleth.xml b/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
deleted file mode 100644
index 12632e25..00000000
--- a/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,224 +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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</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 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-edugain/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
deleted file mode 100644
index 34286ff3..00000000
--- a/swamid-edugain/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-edugain/idpv4.lu.se-idp-shibboleth.xml b/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
deleted file mode 100644
index a8a1a3f3..00000000
--- a/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,254 +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>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: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 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</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-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml b/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml
deleted file mode 100644
index 8828b4e4..00000000
--- a/swamid-edugain/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="140" width="732">https://inacademia.org/wp-content/uploads/2023/01/inacademia_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="de" height="140" width="732">https://inacademia.org/wp-content/uploads/2023/01/inacademia_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="140" width="732">https://inacademia.org/wp-content/uploads/2023/01/inacademia_logo.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: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-edugain/indico.fysik.su.se-Shibboleth.sso.xml b/swamid-edugain/indico.fysik.su.se-Shibboleth.sso.xml
deleted file mode 100644
index 65140451..00000000
--- a/swamid-edugain/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-edugain/indico.nordu.net-mellon.xml b/swamid-edugain/indico.nordu.net-mellon.xml
deleted file mode 100644
index 04242c02..00000000
--- a/swamid-edugain/indico.nordu.net-mellon.xml
+++ /dev/null
@@ -1,74 +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="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="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:PrivacyStatementURL xml:lang="sv">https://indico.nordu.net/privacy-statement/</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://indico.nordu.net/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://indico.nordu.net/</mdui:InformationURL>
-      </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="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="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="o" Name="urn:oid:2.5.4.10" 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="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.nordu.net</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">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:ContactPerson contactType="administrative">
-    <md:Company>NORDUnet</md:Company>
-    <md:EmailAddress>mailto:sei@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/indico.uu.se-shibboleth.xml b/swamid-edugain/indico.uu.se-shibboleth.xml
deleted file mode 100644
index d2bc0711..00000000
--- a/swamid-edugain/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-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml b/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml
deleted file mode 100644
index 45a948f2..00000000
--- a/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.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://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://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:PrivacyStatementURL xml:lang="sv">https://www.safespring.com/dokument/sunet/safespring-swamid-privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.safespring.com/dokument/sunet/safespring-swamid-privacy-policy/</mdui:PrivacyStatementURL>
-      </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: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="administrative">
-    <md:Company>Safespring</md:Company>
-    <md:GivenName>Safespring Operations</md:GivenName>
-    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Safespring Operations</md:SurName>
-    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/login.du.se-idp-shibboleth.xml b/swamid-edugain/login.du.se-idp-shibboleth.xml
deleted file mode 100644
index 9487a60d..00000000
--- a/swamid-edugain/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-edugain/login.epsectra.com-oidc-authenticate-ephome_broker.xml b/swamid-edugain/login.epsectra.com-oidc-authenticate-ephome_broker.xml
deleted file mode 100644
index 204ef30d..00000000
--- a/swamid-edugain/login.epsectra.com-oidc-authenticate-ephome_broker.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://login.epsectra.com/oidc/authenticate/ephome_broker">
-  <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>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-12-14T12:21:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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">Sectra Medical Education AB</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sectra Medical Education AB</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Sectra Medical Education AB</mdui:Description>
-        <mdui:Description xml:lang="en">Sectra Medical Education AB</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://medical.sectra.com/solutionarea/medical-education/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://medical.sectra.com/solutionarea/medical-education/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://resourcehub.epsectra.com/end-user-license-agreement-for-sectra-education-portal/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://resourcehub.epsectra.com/end-user-license-agreement-for-sectra-education-portal/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFdTCCA12gAwIBAgIUJY44pNaNrU5i68TLeg8As/UOXU0wDQYJKoZIhvcNAQELBQAwSjELMAkG A1UEBhMCU0UxFTATBgNVBAgMDE9zdGVyZ290bGFuZDEkMCIGA1UECgwbU2VjdHJhIE1lZGljYWwg RWR1Y2F0aW9uIEFCMB4XDTIyMTIxNDA4NTEwN1oXDTIzMTIxNDA4NTEwN1owSjELMAkGA1UEBhMC U0UxFTATBgNVBAgMDE9zdGVyZ290bGFuZDEkMCIGA1UECgwbU2VjdHJhIE1lZGljYWwgRWR1Y2F0 aW9uIEFCMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuMSz6PY7zH0biF92VaRKLwFG v0Aqipf81lWpyoypp5F95lkthv4lCkFK6V45joytc+AXE2kdxbxpsPk0hDH/O3YjLMfuy6H4kLEz VSDPOYcXAHwzoDMkjpXRvcB/jjGD8zZbrO79PO+O2fZG0UIYBZsKDwikG0N01tweIZySfPOJ5UOY 6DJqZlYrHqYNGDcsNNgU05BlXrFf4mPtond5Mc/O1YkMppMKUnlz9SM3nTGLZx5AfTcX9dpqARvK 4o+qMpO04R9uOgzctplZB+0ARwdF7uXLEdCN/58fswkNCNoUIZEszTdrHOfkqpDndN+FSENbhJVt lLf+7w3ciApo3rZUalyyPN+DoNe5C4bnpDqNie9gsJ40iZiiHjIyFPgSLhnGX+LhrU6PAS5co9wr ohrfjODjtCKnkU6jwk4Qkn4khXgKgX5adHoFV0pgihR20gD9fKsdmqELXm2aesIgySx13w8tp28Q JnKFC9uTl4NL1og5WF5Ezp9xf+bLiN2Wb1z8RsSjde0DwPpQUXVZRBSUNRLp4x7iltgXZkjpSb1U zdZycT94lEuCgUDbZrQbsHZ5tMxvyDAd1vkRJ8PPzh4RHB0vQkqoHNG04u6x/64ufyEKseu/5oHS eZrMbTEXo+QU7zHbB3eoQqcq+Vwu+5dvwLRAHTM7AP6xiS0suTcCAwEAAaNTMFEwHQYDVR0OBBYE FK1J8B+tHOFg2n6/j5Hi09yqMZNXMB8GA1UdIwQYMBaAFK1J8B+tHOFg2n6/j5Hi09yqMZNXMA8G A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAKxrHQo+ikGKf2aFpFyOddA/UmEngcfQ MsZvkqnmgLf4pV25hKgTNjfrMYqmhQ43wGKEdvoVO7v4DGDSDn+5AuEbuKLhC9pvh3Z0GGz3VFAO dSwTjEVpEYMCxX8WtQ1KgdrDK1M2bIe1u2B7BjL+j2IDi11p+wsFYZVtwTezQC2vQbaLLjGYlAG0 8sntMlwkP8szEoRGx/uxVFrJArC7xi6b62EgXntnlcQQABexXl09N7Hzfw10pzsIi0AZMQzSRnRP CafObPkvn7Absg1/7Jn8nF45jENvn/q4F3UtNDzeMxXA6XbhoTybYiZBr0A2FJnTRhgktXCYYuxq 2bQ0b/aixdaR6yzd8c35ugLhYpmO8tycyRDTBHYpkEUOQ17LL/nrFSNS2Ke3Rk+1G+ULnDrJqNZT yFI4R2GR+nvxJG7M4XU3elzm5WXRR455677EyhbG5x0WzbVt2JcCelmE81Qw5Auem3RIz8wSMDY0 VNiglj4OYkInmBQrUOVUzPvufST8cdEDcN2bbfDIadoRCqIjEMioa02gFDQUnrE3n4C0Z0BY1CmA oPsYjxOYQ/CojHz7zJLHEygid10E4oMIEI9GYwJs1vGAjb8PBmj8HOtk9HfkaV208TESnOBIi9sV WLBVC+3Hxtr/h+qijLZiiHshxejBK3VyGsofMVqDfKZk</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFdTCCA12gAwIBAgIUJY44pNaNrU5i68TLeg8As/UOXU0wDQYJKoZIhvcNAQELBQAwSjELMAkG A1UEBhMCU0UxFTATBgNVBAgMDE9zdGVyZ290bGFuZDEkMCIGA1UECgwbU2VjdHJhIE1lZGljYWwg RWR1Y2F0aW9uIEFCMB4XDTIyMTIxNDA4NTEwN1oXDTIzMTIxNDA4NTEwN1owSjELMAkGA1UEBhMC U0UxFTATBgNVBAgMDE9zdGVyZ290bGFuZDEkMCIGA1UECgwbU2VjdHJhIE1lZGljYWwgRWR1Y2F0 aW9uIEFCMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuMSz6PY7zH0biF92VaRKLwFG v0Aqipf81lWpyoypp5F95lkthv4lCkFK6V45joytc+AXE2kdxbxpsPk0hDH/O3YjLMfuy6H4kLEz VSDPOYcXAHwzoDMkjpXRvcB/jjGD8zZbrO79PO+O2fZG0UIYBZsKDwikG0N01tweIZySfPOJ5UOY 6DJqZlYrHqYNGDcsNNgU05BlXrFf4mPtond5Mc/O1YkMppMKUnlz9SM3nTGLZx5AfTcX9dpqARvK 4o+qMpO04R9uOgzctplZB+0ARwdF7uXLEdCN/58fswkNCNoUIZEszTdrHOfkqpDndN+FSENbhJVt lLf+7w3ciApo3rZUalyyPN+DoNe5C4bnpDqNie9gsJ40iZiiHjIyFPgSLhnGX+LhrU6PAS5co9wr ohrfjODjtCKnkU6jwk4Qkn4khXgKgX5adHoFV0pgihR20gD9fKsdmqELXm2aesIgySx13w8tp28Q JnKFC9uTl4NL1og5WF5Ezp9xf+bLiN2Wb1z8RsSjde0DwPpQUXVZRBSUNRLp4x7iltgXZkjpSb1U zdZycT94lEuCgUDbZrQbsHZ5tMxvyDAd1vkRJ8PPzh4RHB0vQkqoHNG04u6x/64ufyEKseu/5oHS eZrMbTEXo+QU7zHbB3eoQqcq+Vwu+5dvwLRAHTM7AP6xiS0suTcCAwEAAaNTMFEwHQYDVR0OBBYE FK1J8B+tHOFg2n6/j5Hi09yqMZNXMB8GA1UdIwQYMBaAFK1J8B+tHOFg2n6/j5Hi09yqMZNXMA8G A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAKxrHQo+ikGKf2aFpFyOddA/UmEngcfQ MsZvkqnmgLf4pV25hKgTNjfrMYqmhQ43wGKEdvoVO7v4DGDSDn+5AuEbuKLhC9pvh3Z0GGz3VFAO dSwTjEVpEYMCxX8WtQ1KgdrDK1M2bIe1u2B7BjL+j2IDi11p+wsFYZVtwTezQC2vQbaLLjGYlAG0 8sntMlwkP8szEoRGx/uxVFrJArC7xi6b62EgXntnlcQQABexXl09N7Hzfw10pzsIi0AZMQzSRnRP CafObPkvn7Absg1/7Jn8nF45jENvn/q4F3UtNDzeMxXA6XbhoTybYiZBr0A2FJnTRhgktXCYYuxq 2bQ0b/aixdaR6yzd8c35ugLhYpmO8tycyRDTBHYpkEUOQ17LL/nrFSNS2Ke3Rk+1G+ULnDrJqNZT yFI4R2GR+nvxJG7M4XU3elzm5WXRR455677EyhbG5x0WzbVt2JcCelmE81Qw5Auem3RIz8wSMDY0 VNiglj4OYkInmBQrUOVUzPvufST8cdEDcN2bbfDIadoRCqIjEMioa02gFDQUnrE3n4C0Z0BY1CmA oPsYjxOYQ/CojHz7zJLHEygid10E4oMIEI9GYwJs1vGAjb8PBmj8HOtk9HfkaV208TESnOBIi9sV WLBVC+3Hxtr/h+qijLZiiHshxejBK3VyGsofMVqDfKZk</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://login.epsectra.com/oidc/authenticate/ephome_broker" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.epsectra.com/saml/authenticate/testidp_auth" index="1" isDefault="false"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.epsectra.com/saml/authenticate/liu_auth" index="2" isDefault="false"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.epsectra.com/saml/authenticate/umu_auth" index="3" isDefault="false"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.epsectra.com/saml/authenticate/adelaide_auth" index="4" isDefault="false"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.epsectra.com/saml/authenticate/melbourne_auth" index="5" isDefault="false"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Education Portal</md:ServiceName>
-      <md:ServiceName xml:lang="en">Education Portal</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="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="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" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Sectra Medical Education AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Sectra Medical Education AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sectra Medical Education AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sectra Medical Education AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://medical.sectra.com/solutionarea/medical-education/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://medical.sectra.com/solutionarea/medical-education/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Carl von Koch</md:GivenName>
-    <md:EmailAddress>mailto:carl.vonkoch@sectra.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sectra Servicdesk</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@sectra.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan Larsson</md:GivenName>
-    <md:EmailAddress>mailto:johan.larsson@sectra.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Johan Larsson</md:GivenName>
-    <md:EmailAddress>mailto:johan.larsson@sectra.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/login.idp.eduid.se-idp.xml.xml b/swamid-edugain/login.idp.eduid.se-idp.xml.xml
deleted file mode 100644
index e9b261fe..00000000
--- a/swamid-edugain/login.idp.eduid.se-idp.xml.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://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>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/code-of-conduct/v2</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="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFOzCCAyOgAwIBAgIUWPwkNYJTtm4tfV5sDpn5ftnQ+UkwDQYJKoZIhvcNAQEL
-BQAwLTELMAkGA1UEBhMCU0UxHjAcBgNVBAMMFTIwMjMwMTE2LmlkcC5lZHVpZC5z
-ZTAeFw0yMzAxMTYxNTI3NDNaFw0zMzAxMTMxNTI3NDNaMC0xCzAJBgNVBAYTAlNF
-MR4wHAYDVQQDDBUyMDIzMDExNi5pZHAuZWR1aWQuc2UwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCnoqAT/8cAhJHcOhlGrMky7REiMS06ulLbo7AgRJ9N
-6o7n162pqva+s0CkV1su8TEyyi11VWdUruIApHTM37zt4HEqvRJcf+SvhhfecI58
-QWobWQAnl5c2BbYxkp1m9bvLGR+H93/DumeECmcA78dHx+igQRa+t/wixXOoj2yY
-tFDUKvguHYXesJxpdZYhj7hgH5pG1Zlx8pa3ADcVAp7A1yFiio1cAJemgXY8BjaO
-1UOHlzBfEXZaKIu0m0vhFSQg0tCsgt1/os6RbEEXAIoJuEc4lOz2k4O3WB74lljH
-UGvjgATfRA3hl//suQr7sIwQGnnerc9Is64Qt14e+QWqnp1/8Rd/S6f2ODLkSdaG
-WBN3LZO/97YtywYGQXxROnFmHfzOPd3i5DHCB+00PslFRexYkdLRk4P+W1ufnkNa
-JGmjyRnyRIrFLWfnyc22W4T4PKACoBLVX3+hAHUBeFRXyKp0+0yKOhphSIdjqtOj
-2mOhMwmPC26naizV61Q+t7/8Lj4sfZRp4NNNcWJWo+2oxxx0wuaRK0i/TGVI11Ot
-220yJpMa+Tp6pTchPKBGKfiIcmh40I73IdEKdoYTP071pg1C70JE7R/1GPLXUfbE
-vYtuOmm1mfpWKo09Uq6BSTX0+En/tn0aJjmWbu63fif1Qr3M9czKVyCRtrccRbqv
-6wIDAQABo1MwUTAdBgNVHQ4EFgQUeuKNxUdIdpLeygKLXmTAdXeSMAswHwYDVR0j
-BBgwFoAUeuKNxUdIdpLeygKLXmTAdXeSMAswDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAgEAS1WSpDfd2+9DzZZAbcU17QOQIdz0mYvpqSJjjYRZZYPf
-nKY7j9hmZeIOsq4uPhTlUs7/hlALXqCt5nNJ9Af1oVgeeslSRGiaPtfELXsN4qav
-Mr7XcUqR+ybwhr1lSWbhykdyhFTrtKEYbe73nbDWJqSbRR8efhqzLtqpqjIVr84q
-Pu0mnzWsu/kbH3T6zP3dp3OedNv7XBeoZVnD9DrOCPZaQoSAP/012KtpZUiM5k6B
-sHK9ZtREiBmMLpQMUVluwXNUXfUh/2T2vWTUAEL0Pym48VKYi+WtjtIqKFu41COE
-CNsUTeu+Ff/WPVfyLNgHJOnzlCrkfcVsiFr7rX0jPnXA+JGrM+lS0DTu5YwMjegY
-xDhMPikaZbhygNPQnYhLbKkq8QRxa4T8CyQiNm0DOjmHNiUNijFIzrw9yFsjqoZV
-MWe8oDG5JTAJmnnlQ4lUuWe2rOZ7HOeK1v5KRxsDOeswjsVQQC0JwvgE+3UqAvc2
-iYQBJlLYaAOLzvJu3B39rf0YqfQskV9mZsmRC9jZJo0e1Z45ND/elfDi42/162dY
-bOWj6fPl9bldSE3e7SAqnU4vlRVGXJM+CEQB7L3Tsc6JONrskQLyXuyQf2yr9HAx
-RVtD2xG8+6W5O+PpWCZOnshCVVSv4c3UmUSJt1nEEr4FJUdugvnAojwsxCjBabA=</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>Zacharias</md:GivenName>
-    <md:SurName>Törnblom</md:SurName>
-    <md:EmailAddress>mailto:zacharias@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET eduID team</md:GivenName>
-    <md:EmailAddress>mailto:feedback@eduid.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-edugain/login.idp.hhs.se-idp-shibboleth.xml b/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml
deleted file mode 100644
index da0c9edf..00000000
--- a/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,175 +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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</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 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: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: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: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</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</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-edugain/login.ki.se-idp-shibboleth.xml b/swamid-edugain/login.ki.se-idp-shibboleth.xml
deleted file mode 100644
index fbfe8647..00000000
--- a/swamid-edugain/login.ki.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://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>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:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</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: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-edugain/login2.fhs.se-adfs-services-trust.xml b/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
deleted file mode 100644
index 147d3d89..00000000
--- a/swamid-edugain/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-edugain/mfa-check.test.uu.se-Shibboleth.sso-Metadata.xml b/swamid-edugain/mfa-check.test.uu.se-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index ec7080c8..00000000
--- a/swamid-edugain/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-edugain/miunidp.miun.se-idp-shibboleth.xml b/swamid-edugain/miunidp.miun.se-idp-shibboleth.xml
deleted file mode 100644
index 3c458dc0..00000000
--- a/swamid-edugain/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-edugain/mp.uu.se-Shibboleth.sso.xml b/swamid-edugain/mp.uu.se-Shibboleth.sso.xml
deleted file mode 100644
index ba58f45e..00000000
--- a/swamid-edugain/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-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml b/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
deleted file mode 100644
index 6d099cc5..00000000
--- a/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
+++ /dev/null
@@ -1,109 +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:Description xml:lang="sv">Fysikum Nextcloud är en molnlagring, backup och onlineredigeringssvit för Fysikums personal och medarbetare.</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Fysikum Nextcloud</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.su.se/fysikum/om-institutionen/internt/systemgruppens-hj%C3%A4lpsidor-1.566463</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/om-webbplatsen</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:OrganizationName xml:lang="sv">Stockholms Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fysikum</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Fysikum, Stockholms Universitet</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:SurName>Kastanas</md:SurName>
-    <md:EmailAddress>mailto:kastanas@fysik.su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46855378724</md:TelephoneNumber>
-  </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:ContactPerson contactType="administrative">
-    <md:GivenName>Alex</md:GivenName>
-    <md:SurName>Kastanas</md:SurName>
-    <md:EmailAddress>mailto:kastanas@fysik.su.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>Holger</md:GivenName>
-    <md:SurName>Motzkau</md:SurName>
-    <md:EmailAddress>mailto:holger.motzkau@fysik.su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46855378668</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml b/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
deleted file mode 100644
index 64e81714..00000000
--- a/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,175 +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:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</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://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-edugain/secure.ouriginal.com.xml b/swamid-edugain/secure.ouriginal.com.xml
deleted file mode 100644
index 6e5c43b2..00000000
--- a/swamid-edugain/secure.ouriginal.com.xml
+++ /dev/null
@@ -1,127 +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: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.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:ServiceName xml:lang="sv">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:EntityDescriptor>
diff --git a/swamid-edugain/secure.urkund.com-shibboleth.xml b/swamid-edugain/secure.urkund.com-shibboleth.xml
deleted file mode 100644
index ba9cbd17..00000000
--- a/swamid-edugain/secure.urkund.com-shibboleth.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://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://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.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-edugain/signservice.edusign.sunet.se-sigservice.xml b/swamid-edugain/signservice.edusign.sunet.se-sigservice.xml
deleted file mode 100644
index 02c186ed..00000000
--- a/swamid-edugain/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-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 16d12f39..00000000
--- a/swamid-edugain/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-edugain/sp.spraakbanken.gu.se-shibboleth.xml b/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
deleted file mode 100644
index 8bb2df7d..00000000
--- a/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.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="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://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>
-    <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 Text</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Språkbanken Text</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Språkbanken Text är en forskningsenhet vid Institutionen för svenska, flerspråkighet och språkteknologi, Göteborgs universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Språkbanken Text is a nationally and internationally acknowledged research unit at the Department of Swedish, Multilinguality, Language Technology, 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:PrivacyStatementURL xml:lang="en">https://repo.spraakbanken.gu.se/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://repo.spraakbanken.gu.se/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
-      </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 Text</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Språkbanken Text</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">Göteborgs universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Institutionen för svenska, flerspråkighet och språkteknologi, Göteborgs universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Department of Swedish, Multilingualism, Language Technology University of Gothenburg</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>Leif-Jöran</md:GivenName>
-    <md:SurName>Olsson</md:SurName>
-    <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Leif-Jöran</md:GivenName>
-    <md:SurName>Olsson</md:SurName>
-    <md:EmailAddress>mailto:sb-sysadmin@svenska.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:GivenName>Leif-Jöran</md:GivenName>
-    <md:SurName>Olsson</md:SurName>
-    <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/sp.sprakochfolkminnen.se-.xml b/swamid-edugain/sp.sprakochfolkminnen.se-.xml
deleted file mode 100644
index 6ac448c8..00000000
--- a/swamid-edugain/sp.sprakochfolkminnen.se-.xml
+++ /dev/null
@@ -1,66 +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.isof.se/vart-uppdrag/om-myndigheten</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.isof.se/other-languages/english/about-the-institute</mdui:InformationURL>
-        <mdui:Logo width="236" height="146" xml:lang="sv">https://sp.sprakochfolkminnen.se/ISOF-logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="236">https://sp.sprakochfolkminnen.se/ISOF-logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.isof.se/vart-uppdrag/om-myndigheten/om-webbplatsen/hantering-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.isof.se/vart-uppdrag/om-myndigheten/om-webbplatsen/hantering-av-personuppgifter</mdui:PrivacyStatementURL>
-      </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.isof.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.isof.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Magnus</md:GivenName>
-    <md:SurName>Ahltorp</md:SurName>
-    <md:EmailAddress>mailto:magnus.ahltorp@isof.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Magnus</md:GivenName>
-    <md:SurName>Ahltorp</md:SurName>
-    <md:EmailAddress>mailto:magnus.ahltorp@isof.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 30bb9a82..00000000
--- a/swamid-edugain/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 xml:lang="en" height="140" width="732">https://inacademia.org/wp-content/uploads/2023/01/inacademia_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="140" width="732">https://inacademia.org/wp-content/uploads/2023/01/inacademia_logo.png</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: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-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index dcd66cfa..00000000
--- a/swamid-edugain/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 xml:lang="en" height="140" width="732">https://inacademia.org/wp-content/uploads/2023/01/inacademia_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="140" width="732">https://inacademia.org/wp-content/uploads/2023/01/inacademia_logo.png</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: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-edugain/sts.mah.se-adfs-services-trust.xml b/swamid-edugain/sts.mah.se-adfs-services-trust.xml
deleted file mode 100644
index 5f343f48..00000000
--- a/swamid-edugain/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-edugain/sts.mau.se-adfs-services-trust.xml b/swamid-edugain/sts.mau.se-adfs-services-trust.xml
deleted file mode 100644
index 298ac702..00000000
--- a/swamid-edugain/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-edugain/swamid2.shh.se-idp-shibboleth.xml b/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
deleted file mode 100644
index 5896bc3b..00000000
--- a/swamid-edugain/swamid2.shh.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://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: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>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>
-    </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">https://www.shh.se/sv/om-webbplatsen/behandling-av-personuppgifter/swamid-tjanstedefinition/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.shh.se/en/general-description-of-saml2-websso/</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:PrivacyStatementURL xml:lang="sv">https://www.shh.se/sv/om-webbplatsen/behandling-av-personuppgifter/swamid-tjanstedefinition/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.shh.se/en/general-description-of-saml2-websso/</mdui:PrivacyStatementURL>
-      </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 use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFUTCCAzmgAwIBAgIUYtW40kX9Os5BrbuxP5VDmHW+SzcwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc3dhbWlkMi5zaGguc2UwHhcNMjIxMjAxMTMyMjA1WhcN
-MzIxMTI4MTMyMjA1WjAZMRcwFQYDVQQDDA5zd2FtaWQyLnNoaC5zZTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJvOeM8ZlLmvlVqv+MeQNGqp6uv7NK6c
-fstRN+LjUCFWUiDUCl7tV8UQVQ8Pbe90B7G6mVWx7zYelUocwukcVAHvDEmDUb+v
-LaI00ZM8bCqF28Xhlgd/XAUOJF+EFG3Lej83EDFniMDy497NDQt/b6/GRH3zTV+6
-Bx4ebmy0igYz2VhimpFtF3R+BGzdzLwoMGmn3BKfGoAfiMGL6RLBgivgWcZ3eT7F
-I7vpwOpJ6WotDX2hxZr29Dw6667Uw2Xw1wwMILCU9YZ80SG6kUSsPfpO+N74Uvu0
-uk9nB+Ow8AMtVi/Aqc/bTwwmfoyYE1uLBXD36IjWgtQysgpFmaabsRbQMAw+5duD
-zqYyGaK6i/fNquaymU3oq0VE6EWRpUECtRW4OaDSDFZ2U5fF+NVTzYPfKcvxamm/
-RMMrbP66LPNjo5M0hdc9srKZhDdYk2nDYM1oeQVNCAUqKOGLiXo0URLQaUToM+xF
-8DNsB496qEXu1Awq71mz/81zw3hiAkZxASCOmim1L7uHeSWONOtHqxJn0YOLP3NE
-c/gF//4UfTJTC92b4E02cgPdejkPpD5N3dQjsK8b5Ix4w1RbSvq/apmH5qb4ufHP
-te3WKlzUEG23p2i2+hFU0goUi2jcmQNY6VPZz8Q36p9uP2ic5yfuuMkuuFgUwrLg
-jIPYZ9czh0RLAgMBAAGjgZAwgY0wHQYDVR0OBBYEFLkcaE1wrT7fsYxra6gM1Fvv
-jrP9MB8GA1UdIwQYMBaAFLkcaE1wrT7fsYxra6gM1FvvjrP9MEAGA1UdEQQ5MDeC
-DnN3YW1pZDIuc2hoLnNlhiVodHRwczovL3N3YW1pZDIuc2hoLnNlL2lkcC9zaGli
-Ym9sZXRoMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggIBADvxF3/T14Ijh4fC
-znR4p+DktvsFOOETH80JH6+sBnHm/HQZ0eXPbXBpQWL7lWJF0xcPAa8ltJj7z36j
-uXEiYYJfOLv4QeV9KVrNutsSO1lgmY/PR6UtAY9r/yqUgQZkskCfgk96y5IOaw6/
-vXWOeWivk8GyAXPPychlGG6oj7R6Dm2MrgOJjtFEiwhRzQIWLkXo8qwe/vMifjhl
-tNty11o4gNYCAYJOp07l8O5ktqqcbtzXKsp6k7VmJVau8E50TjFSQLCi1knTwMDJ
-x9/jO0FczgpYQ3J9SKuyng+7wMOdEj2Eyls2QnpZXtQ7crIfJbrOsFx3JWO99G7M
-XdpaYrykQ8LPHdBhpP7XJWgFG02KSq4NiO2Epk2YSRUNC22y5aKvr3zzznT7heC+
-xdUc21T7W7nRnOMJ9EX97gIYdG/GY/qC+NtOyla/qGwQDyjqpMYdxjZzbMjzuTja
-QSz5wa5zCWNr4pyuUNGXJxzFPLo0Lpu7OWzN6JiDTWPOt3zL+LU7bPrKdsMPHaH3
-OZVo1Pf8ZsrpOaNfojkbpUD46mhSIlsNcKwHUKcgwmibjGtQYC1umHzjIBFWbd4p
-kw5ti/pEEskP2VckNurqIgZyapKoqaalCTIwt9AD3exaKStVh77At9iGSZeQ7HUn
-HD2+pHunlzmcSQJV7ayp41nSYm/H</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFUTCCAzmgAwIBAgIUYtW40kX9Os5BrbuxP5VDmHW+SzcwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc3dhbWlkMi5zaGguc2UwHhcNMjIxMjAxMTMyMjA1WhcN
-MzIxMTI4MTMyMjA1WjAZMRcwFQYDVQQDDA5zd2FtaWQyLnNoaC5zZTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJvOeM8ZlLmvlVqv+MeQNGqp6uv7NK6c
-fstRN+LjUCFWUiDUCl7tV8UQVQ8Pbe90B7G6mVWx7zYelUocwukcVAHvDEmDUb+v
-LaI00ZM8bCqF28Xhlgd/XAUOJF+EFG3Lej83EDFniMDy497NDQt/b6/GRH3zTV+6
-Bx4ebmy0igYz2VhimpFtF3R+BGzdzLwoMGmn3BKfGoAfiMGL6RLBgivgWcZ3eT7F
-I7vpwOpJ6WotDX2hxZr29Dw6667Uw2Xw1wwMILCU9YZ80SG6kUSsPfpO+N74Uvu0
-uk9nB+Ow8AMtVi/Aqc/bTwwmfoyYE1uLBXD36IjWgtQysgpFmaabsRbQMAw+5duD
-zqYyGaK6i/fNquaymU3oq0VE6EWRpUECtRW4OaDSDFZ2U5fF+NVTzYPfKcvxamm/
-RMMrbP66LPNjo5M0hdc9srKZhDdYk2nDYM1oeQVNCAUqKOGLiXo0URLQaUToM+xF
-8DNsB496qEXu1Awq71mz/81zw3hiAkZxASCOmim1L7uHeSWONOtHqxJn0YOLP3NE
-c/gF//4UfTJTC92b4E02cgPdejkPpD5N3dQjsK8b5Ix4w1RbSvq/apmH5qb4ufHP
-te3WKlzUEG23p2i2+hFU0goUi2jcmQNY6VPZz8Q36p9uP2ic5yfuuMkuuFgUwrLg
-jIPYZ9czh0RLAgMBAAGjgZAwgY0wHQYDVR0OBBYEFLkcaE1wrT7fsYxra6gM1Fvv
-jrP9MB8GA1UdIwQYMBaAFLkcaE1wrT7fsYxra6gM1FvvjrP9MEAGA1UdEQQ5MDeC
-DnN3YW1pZDIuc2hoLnNlhiVodHRwczovL3N3YW1pZDIuc2hoLnNlL2lkcC9zaGli
-Ym9sZXRoMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggIBADvxF3/T14Ijh4fC
-znR4p+DktvsFOOETH80JH6+sBnHm/HQZ0eXPbXBpQWL7lWJF0xcPAa8ltJj7z36j
-uXEiYYJfOLv4QeV9KVrNutsSO1lgmY/PR6UtAY9r/yqUgQZkskCfgk96y5IOaw6/
-vXWOeWivk8GyAXPPychlGG6oj7R6Dm2MrgOJjtFEiwhRzQIWLkXo8qwe/vMifjhl
-tNty11o4gNYCAYJOp07l8O5ktqqcbtzXKsp6k7VmJVau8E50TjFSQLCi1knTwMDJ
-x9/jO0FczgpYQ3J9SKuyng+7wMOdEj2Eyls2QnpZXtQ7crIfJbrOsFx3JWO99G7M
-XdpaYrykQ8LPHdBhpP7XJWgFG02KSq4NiO2Epk2YSRUNC22y5aKvr3zzznT7heC+
-xdUc21T7W7nRnOMJ9EX97gIYdG/GY/qC+NtOyla/qGwQDyjqpMYdxjZzbMjzuTja
-QSz5wa5zCWNr4pyuUNGXJxzFPLo0Lpu7OWzN6JiDTWPOt3zL+LU7bPrKdsMPHaH3
-OZVo1Pf8ZsrpOaNfojkbpUD46mhSIlsNcKwHUKcgwmibjGtQYC1umHzjIBFWbd4p
-kw5ti/pEEskP2VckNurqIgZyapKoqaalCTIwt9AD3exaKStVh77At9iGSZeQ7HUn
-HD2+pHunlzmcSQJV7ayp41nSYm/H</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">Sophiahemmet University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Sophiahemmet Högskola</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:OrganizationURL xml:lang="sv">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:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Sophiahemmet University</md:Company>
-    <md:GivenName>Sophiahemmet IT</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml b/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml
deleted file mode 100644
index 80fff703..00000000
--- a/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,247 +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>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-edugain/weblogin.smhi.se-idp-shibboleth.xml b/swamid-edugain/weblogin.smhi.se-idp-shibboleth.xml
deleted file mode 100644
index 60111de6..00000000
--- a/swamid-edugain/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-edugain/weblogin.uu.se-idp-shibboleth.xml b/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml
deleted file mode 100644
index 6ac2d1aa..00000000
--- a/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,247 +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: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>
-    </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:IPHint>193.11.8.0/21</mdui:IPHint>
-        <mdui:IPHint>212.25.152.0/22</mdui:IPHint>
-        <mdui:GeolocationHint>geo:57.639379,18.288630</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-edugain/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-edugain/webproxysrv.uniarts.se-adfs-services-trust.xml
deleted file mode 100644
index 6fd7aefc..00000000
--- a/swamid-edugain/webproxysrv.uniarts.se-adfs-services-trust.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="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: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:PrivacyStatementURL xml:lang="en">https://www.uniarts.se/english/other-pages/service-definition</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uniarts.se/ovriga-sidor/service-definition</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHbjCCBVagAwIBAgIRAMB2Bs72B56ZVrC2JkX3hA0wDQYJKoZIhvcNAQEMBQAwRDELMAkGA1UEBhMCTkwxGTAXBgNVBAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0MB4XDTIyMTIwODAwMDAwMFoXDTIzMTIwODIzNTk1OVowdTELMAkGA1UEBhMCU0UxGDAWBgNVBAgMD1N0b2NraG9sbXMgbMOkbjErMCkGA1UECgwiU3RvY2tob2xtcyBrb25zdG7DpHJsaWdhIGjDtmdza29sYTEfMB0GA1UEAxMWd2VicHJveHlzcnYudW5pYXJ0cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMO76EPzmeru3SPzqIeYvQi2WGyEVXXygCpMljAJqmbR6NxuSfv75AlL5kNbsFXhMiYjkRVGMXl6P4oKspjLzDLy3XZ3NCPc9gORybno943Quk9juB6m3FXgRDHhefjEUzP7f2mdTB3mI6QXQAwIdxk2TD74wffLv3OtTevF1DFjVk2dZ+pY4rKCKYeCVRD5cq1zBejXZNbDqeocFUMrvHQDj0+qbykGtsbY6NK6GFzqxQFa6mFOmG6nyiLgkqDQ9iIdQ0+S7TVXAFpYvvcN02L93yP9w27y6f3yepPewvS4/lgmOQWLJe9c6W0MFKNvukVEaCB2uMVuB0forF/9SfcCAwEAAaOCAygwggMkMB8GA1UdIwQYMBaAFG8dNUkQbDL6WaCevIroH5W+cXoMMB0GA1UdDgQWBBTtvl431VxLsvRHI63Qu8n4ZiVNdTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwSQYDVR0gBEIwQDA0BgsrBgEEAbIxAQICTzAlMCMGCCsGAQUFBwIBFhdodHRwczovL3NlY3RpZ28uY29tL0NQUzAIBgZngQwBAgIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL0dFQU5ULmNybC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0LmNybDB1BggrBgEFBQcBAQRpMGcwOgYIKwYBBQUHMAKGLmh0dHA6Ly9HRUFOVC5jcnQuc2VjdGlnby5jb20vR0VBTlRPVlJTQUNBNC5jcnQwKQYIKwYBBQUHMAGGHWh0dHA6Ly9HRUFOVC5vY3NwLnNlY3RpZ28uY29tMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYTx3RjqAAAEAwBGMEQCIFPmcXSgP2Kce9bhjdqcEbvbhT+B7ULzJhX1jYgxiFJWAiBhsdHU6p2Ydfd9RWFkbuIZQ7EaQ790rE4XU0ejc7e+bAB2ALc++yTfnE26dfI5xbpY9Gxd/ELPep81xJ4dCYEl7bSZAAABhPHdGIUAAAQDAEcwRQIgTwVWt0vTxw3iXXB86c0nuTZspu+1UbtFMHwLbQT2B0ICIQCoDIs6cZldcm5+4szeRrk3wdInDoCYDNn6wbGKpuuo6AB2AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1uAAABhPHdGIgAAAQDAEcwRQIhAMkm4fySFSVN0rZ5DtIARc3+jJuCFoICyGVQ4yaLUIlDAiBAQaBmJpJbzixSURiiqCmug4wspSPpz/q0SM2ifWcKAzAhBgNVHREEGjAYghZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMA0GCSqGSIb3DQEBDAUAA4ICAQAYLMa4wNaX5Hkpbw2+8mwBxdmINHzcZUhEqo1etbu8Vuepit0Ef//LTuldIt2qHGEHajCJBFAGuw0IGNd5LMZXTDQoreml8QYpeeimnsd7e4NjEfVOsRvLRGC139FmJw0/JdDGOwFgwyGB2sP5hJp0OhSaxtnFChIPx/2NZ4Bfm4LBhwqnWgloGYQAxAcQM5jOWU/B5oKlj4UrNCcCpDW0DwHBIj4ZRYC2ldh9mnwtQv7uvYym+wF0IQhcaYPTRvMwsFsGgF+ES7cRCp+85r9XQme85QP1O5ftHcWegOvhAtwz9B/HDkw+QMyBtEaSVuBsLyp0vjf3boJvc9TgGVh91iVKggiRgMmzVGkmEdJ2h8lTLk8fYI8m/mioS7zrAYt46/tOgE1fJTJBlfvWEBEv3hn5a74dVp7VGLQrWeV+ID68v5Jv7ODxztYBB/lWwK2b5gydQ86Y+aIexoK9fEC5PSPPerol6ZSD8EDuhEUgd1D/5Ye6Anpzq17rg/AxmQ4LvJTDBVZDvcIXd2iNTFHrhIDPGpjn1EIvW+P+LCdt7q0jgMlV+cLpGWkIMP2l+5VxQFR+yM4bi+7OljlP0Makx88urCz9DWVjyXHycUj6deExerUwpmuONG9K20qC37fWqoYA66ZmXOQ45hxDBg1NyEFvhSVpsa9PIRhU9QqKgA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHbjCCBVagAwIBAgIRAMB2Bs72B56ZVrC2JkX3hA0wDQYJKoZIhvcNAQEMBQAwRDELMAkGA1UEBhMCTkwxGTAXBgNVBAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0MB4XDTIyMTIwODAwMDAwMFoXDTIzMTIwODIzNTk1OVowdTELMAkGA1UEBhMCU0UxGDAWBgNVBAgMD1N0b2NraG9sbXMgbMOkbjErMCkGA1UECgwiU3RvY2tob2xtcyBrb25zdG7DpHJsaWdhIGjDtmdza29sYTEfMB0GA1UEAxMWd2VicHJveHlzcnYudW5pYXJ0cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMO76EPzmeru3SPzqIeYvQi2WGyEVXXygCpMljAJqmbR6NxuSfv75AlL5kNbsFXhMiYjkRVGMXl6P4oKspjLzDLy3XZ3NCPc9gORybno943Quk9juB6m3FXgRDHhefjEUzP7f2mdTB3mI6QXQAwIdxk2TD74wffLv3OtTevF1DFjVk2dZ+pY4rKCKYeCVRD5cq1zBejXZNbDqeocFUMrvHQDj0+qbykGtsbY6NK6GFzqxQFa6mFOmG6nyiLgkqDQ9iIdQ0+S7TVXAFpYvvcN02L93yP9w27y6f3yepPewvS4/lgmOQWLJe9c6W0MFKNvukVEaCB2uMVuB0forF/9SfcCAwEAAaOCAygwggMkMB8GA1UdIwQYMBaAFG8dNUkQbDL6WaCevIroH5W+cXoMMB0GA1UdDgQWBBTtvl431VxLsvRHI63Qu8n4ZiVNdTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwSQYDVR0gBEIwQDA0BgsrBgEEAbIxAQICTzAlMCMGCCsGAQUFBwIBFhdodHRwczovL3NlY3RpZ28uY29tL0NQUzAIBgZngQwBAgIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL0dFQU5ULmNybC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0LmNybDB1BggrBgEFBQcBAQRpMGcwOgYIKwYBBQUHMAKGLmh0dHA6Ly9HRUFOVC5jcnQuc2VjdGlnby5jb20vR0VBTlRPVlJTQUNBNC5jcnQwKQYIKwYBBQUHMAGGHWh0dHA6Ly9HRUFOVC5vY3NwLnNlY3RpZ28uY29tMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYTx3RjqAAAEAwBGMEQCIFPmcXSgP2Kce9bhjdqcEbvbhT+B7ULzJhX1jYgxiFJWAiBhsdHU6p2Ydfd9RWFkbuIZQ7EaQ790rE4XU0ejc7e+bAB2ALc++yTfnE26dfI5xbpY9Gxd/ELPep81xJ4dCYEl7bSZAAABhPHdGIUAAAQDAEcwRQIgTwVWt0vTxw3iXXB86c0nuTZspu+1UbtFMHwLbQT2B0ICIQCoDIs6cZldcm5+4szeRrk3wdInDoCYDNn6wbGKpuuo6AB2AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1uAAABhPHdGIgAAAQDAEcwRQIhAMkm4fySFSVN0rZ5DtIARc3+jJuCFoICyGVQ4yaLUIlDAiBAQaBmJpJbzixSURiiqCmug4wspSPpz/q0SM2ifWcKAzAhBgNVHREEGjAYghZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMA0GCSqGSIb3DQEBDAUAA4ICAQAYLMa4wNaX5Hkpbw2+8mwBxdmINHzcZUhEqo1etbu8Vuepit0Ef//LTuldIt2qHGEHajCJBFAGuw0IGNd5LMZXTDQoreml8QYpeeimnsd7e4NjEfVOsRvLRGC139FmJw0/JdDGOwFgwyGB2sP5hJp0OhSaxtnFChIPx/2NZ4Bfm4LBhwqnWgloGYQAxAcQM5jOWU/B5oKlj4UrNCcCpDW0DwHBIj4ZRYC2ldh9mnwtQv7uvYym+wF0IQhcaYPTRvMwsFsGgF+ES7cRCp+85r9XQme85QP1O5ftHcWegOvhAtwz9B/HDkw+QMyBtEaSVuBsLyp0vjf3boJvc9TgGVh91iVKggiRgMmzVGkmEdJ2h8lTLk8fYI8m/mioS7zrAYt46/tOgE1fJTJBlfvWEBEv3hn5a74dVp7VGLQrWeV+ID68v5Jv7ODxztYBB/lWwK2b5gydQ86Y+aIexoK9fEC5PSPPerol6ZSD8EDuhEUgd1D/5Ye6Anpzq17rg/AxmQ4LvJTDBVZDvcIXd2iNTFHrhIDPGpjn1EIvW+P+LCdt7q0jgMlV+cLpGWkIMP2l+5VxQFR+yM4bi+7OljlP0Makx88urCz9DWVjyXHycUj6deExerUwpmuONG9K20qC37fWqoYA66ZmXOQ45hxDBg1NyEFvhSVpsa9PIRhU9QqKgA==</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:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</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:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400300</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml b/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
deleted file mode 100644
index a9ad3dd9..00000000
--- a/swamid-edugain/www.integrationstest.ladok.se-gui-sp.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://www.integrationstest.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-12-13T09:59:05Z">
-      <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://www.integrationstest.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok för personal www.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok for employees www.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
-        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.integrationstest.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.integrationstest.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.integrationstest.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.integrationstest.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.integrationstest.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAOfifxZbao7mMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNVBAMTHXd3dy5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMB4XDTE4MTIxMzA4NDMyN1oXDTI4MTIxMDA4NDMyN1owKDEmMCQGA1UEAxMdd3d3LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5lmjzPJRC3fZ4VxhaY0VVGwp8swciwoSBQeO9NnGJ+IQfdmjxGme1MvIcpN0osEnah7kmljHczxmI0j52pmxtJblazB9KVTQBtmRXGUwJtS9j5xnMwdiE2JrMPX9SA+4TxgNGfwNr/5u6HJn06yzVpLagiCF5fabmkHQD7woMW7ewMca9CirzxKtOGT/x2kTTUpvVnY5oAMxoTZWSg1Y6tfx22Gh8zlIw1AePhWSqyTXPmO/z+b8/k8DjVDO/P7zbQrAxzoVZ6dc3xXf0974WaThs7wMCYYNAwSLSu8IAOaCg5R0M9aqqmTMw8Y9585Ioh6kMllYSVhpRW0mb8as3AgMBAAGjeTB3MFYGA1UdEQRPME2CHXd3dy5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlhixodHRwczovL3d3dy5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUqiaQksw8f2VI8MWBOvxje2xpp+0wDQYJKoZIhvcNAQELBQADggEBABQ7NHvIUTeNbepLr2t6OZBWpQZeKfG+zeoP6ehqth10MOE9atah+pzRgh8Lm4xR8RrMSxGfuv3TvMAwLul8jVKTCNsFHxbfp3GHmRB/DwScCYtSnW8pJot9CKiX7pFRPe8t5ExUh3utqSP6s93m7lVOpJwu+7b5W9F2X6THf4yNaOtPYXtaAmNx0VNANcpLhLXtgTnmtzzagaFYm+6vyMbA0cxUXzvp9us0+4xF966Lx/STbDuhpfCsE+Gg/8A2Byzz2lXfLSV0kjHxYnpybLISk/lhSTZ2jkjxg4jFRanM7+3107TsPXmOcNtzisOUhhodSkhOr9wBrs1RV2Cj/0M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
-      <md:ServiceName xml:lang="en">Ladok for employees</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="sn" Name="urn:oid:2.5.4.4" 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="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="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/www.start.ladok.se-gui-sp.xml b/swamid-edugain/www.start.ladok.se-gui-sp.xml
deleted file mode 100644
index d20af34b..00000000
--- a/swamid-edugain/www.start.ladok.se-gui-sp.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://www.start.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-26T09:06:33Z">
-      <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://www.start.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.start.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
-        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.start.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="en">Ladok for employees</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Ladok för personal</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.start.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.start.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.start.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDIDCCAgigAwIBAgIJAJ9ZObDxOs3/MA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEnd3dy5zdGFydC5sYWRvay5zZTAeFw0xNjA0MjUxMDA1NTRaFw0yNjA0MjMxMDA1NTRaMB0xGzAZBgNVBAMTEnd3dy5zdGFydC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJoQ9FWIadS9qwygHOArRhD2zsKwK8AvOn00tZDk2atdpYO+ZZNnd2GjmdZg1ZLchfr3odvGDHzAtmuob3eTdWr+FSVkN2gs4zsqcYXOcyuHeO++xxuW7p0RVDG4Yoh/losV/Gc/DWHVtzlih85UWx1JUwk3r+5sprB2GxJEyR+0K8OA0pKnO4HY+I229g4b+gDVeiZT2mgpRdv5ZiKkSCCXDfktTxCzBr5rEORpjcQeGphJmkS2NrwAhz7LD8jmZCSn8C1HndhB6+syAh9uckcVgwo9TXqznTu9xx1He23MjYsZo79u7DuoMiDXY+8A7v4/CQ9DdFqcqfDfW7VcEi0CAwEAAaNjMGEwQAYDVR0RBDkwN4ISd3d3LnN0YXJ0LmxhZG9rLnNlhiFodHRwczovL3d3dy5zdGFydC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFBTI2HIkkPdufvJjk7xyMM1ElUR3MA0GCSqGSIb3DQEBCwUAA4IBAQBiG3egtaHpHUefSZwdZtKe6TMV0WCDjHLVaBtGN8VYTJgkVwb3dU4nU5J1BnK4nRAEvxoOPRjy6QVvWuVhfWWa2wUJO2W+qbefu4UNFoB/q4SUYuzlMzZBcSheN/Xp1GtyfLY/0htNuL+V5dqCXqpDUDL+w/p920OUohQvStSkBn05CcRrrj+u9OvSDjEka1eMhx3QjRHyMQ4pytf/d5Z16aLE1Y5ow0IXKQ4/j63DbELE2yMbs7iEBCtgHuu/KlG8qhCWwhlP7QNHFhv3D0wKwREAtnOrDsuNVwKdafKPx82ANlnCVaJVclgEH/S2/fMYv1ZvrsvqK0siDLr5EEpH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.start.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
-      <md:ServiceName xml:lang="en">Ladok for employees</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="sn" Name="urn:oid:2.5.4.4" 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="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="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/www.test.ladok.se-gui-sp.xml b/swamid-edugain/www.test.ladok.se-gui-sp.xml
deleted file mode 100644
index f6f488a7..00000000
--- a/swamid-edugain/www.test.ladok.se-gui-sp.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://www.test.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-17T16:34:15Z">
-      <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://www.test.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.test.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok för personal www.test.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok for employees www.test.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
-        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.test.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.test.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.test.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.test.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.test.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFHDCCAwSgAwIBAgIJAIbDYkZWg5D9MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEXd3dy50ZXN0LmxhZG9rLnNlMB4XDTE2MDIxMDEzMzUzNloXDTI2MDIwNzEzMzUzNlowHDEaMBgGA1UEAxMRd3d3LnRlc3QubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+W5Gi4u6RApYh068l1O/jZB1LKHMYfBa7BeR1nGjZXTI15BhJJDeaIqiIyZCwmPiki66Ma5frzSERCki1u7rfP38/bddLtvCCpYhPxmQhOFWXQ3SXaWQETSZ3mVLnZmUk7rrnANnfKFLst0AGAAZGJ1M2CTT9yLXhzm4v/klsaoVjpOmfpmNlMV+wWj35fpm2Ni8XL1aSQnz0Q6/vUtbP+zbRUwMpXFC/8NO/+JT5HMOq6fAJpVJvozwOcPQ83ZaZRYYk2dcOPWgEG5Y4ooEnGdLNfiKQ6DyaMEevKGfaLdapWntSi4aeQoqDnGU13nbaRAMvOs389phEHQDpq28qGL3Njwgdg+yLGzJj9jUlkYkz7CvR+GQLsZqOeudX/3P1EhavPpk1aG7bGhUUhuLI67m0I5u6axXZi7UQHKqOL4zjNvz1YpL4fel/47WcteYHarumJmuBpmvCqJAfjn9hZMqOkCLbY3NW/qaiTRznyxNiK+bYZ0VfUcDCvsac0+NcU9a42j5fo1a2Y9q/7MMq76TJ3176t+rYWqJi199jmKfyffcrriV4HXkYwYywDyWAn+imSuso+PW7SNDxFu7gY7pPgU2Dnov31lq8zJVpN3ssOEWaAJcbPcS4Ho/9o2kL6Hpp42yhNn0ZCnTeOQKpariM8BRN/12v9zXDaoPC6QIDAQABo2EwXzA+BgNVHREENzA1ghF3d3cudGVzdC5sYWRvay5zZYYgaHR0cHM6Ly93d3cudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFHtJ6TbmFAeA4BaaLUhwxUHgEszoMA0GCSqGSIb3DQEBCwUAA4ICAQCnQhO2mDJe2HGQzC0Hts9rCxgSUQSR23e8FbXWFBniYByYPc786HJsoeDI3YvEO00rOSIRX45Mya5Iapbnj4F3f/ya6agLSjMk6ce9u+kqIeXii3JvFcV/biDdHSEdVgOEr39YMWP5tyaJhmesZLfy1SnJzlW3PrvFdgaKIfVJ2lfukx3OESJ10/CgRllf91eKpfTPB2g8vU0RAUq+odkkX7tSbGDpRtOYfym6FXZpdh2ZBft1QJV7E7jMJZ1dWx7gvp7w06JJozaXaiyIPKClEIYvEppBO+Hs7IbDS4kUSKdzF14wof7qpzQQ+yULmOkrfC80MHGXkKaYNB+mzQ2CAm+tmUDwu+6JNeNDlrN72AlojvsDObgsCHoQIVsSx2wFYDM2zTvA/MR71KHASEi8eGdXcOgn3UMS/ehYrnDq0m/bAjsn/AHjGjIqsFQUpzwqG3N2djGtOD2dzcxOOKCL31aHDlUTgv1hdCpa5+NiIzRrahJoJrfmli/NBlX5wQbQ0s1UVlbgy5Xw0Ttr4IIyLDCJR8LVHDuZcx5GKkrwQE6fWwLJM8JI8JZF0w9j8bsrU3WUfCwfMaCKvwFlYgQQY6TwKaxgtHgm3WFnPMMTXkKWeKq3sp5fajwzptV1MA/uS2aOuboQ7qm6J2aFy0yXQOr7nPNnNq2e/M/T2ugEMg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.test.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
-      <md:ServiceName xml:lang="en">Ladok for employees</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="sn" Name="urn:oid:2.5.4.4" 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="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="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml b/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
deleted file mode 100644
index d2017ff9..00000000
--- a/swamid-edugain/www.utbildning.ladok.se-gui-sp.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://www.utbildning.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-20T16:31:43Z">
-      <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://www.utbildning.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.utbildning.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok för personal www.utbildning.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok for employees www.utbildning.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
-        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.utbildning.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.utbildning.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.utbildning.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.utbildning.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.utbildning.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAIp99LvTbKyqMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNVBAMTF3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlMB4XDTE3MDMyNDE0NDcyMFoXDTI3MDMyMjE0NDcyMFowIjEgMB4GA1UEAxMXd3d3LnV0YmlsZG5pbmcubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYI2lcthIZKs43KEJXYhwlRZfRHYehs0OOPRClgWVf1eH2CZtFuPoEFE7sXM5N16Ujfnqc8vVn5pbc60UHDrTsZvycIfH6CwcrBL1iJLdpMzMAk37StPY84dY5YVNfNnBIuQNuXQSNPw5sPPHkxiqM/BsUMnJZTAQsX7n+WaP/rshu5cmztYlcJ67kOYVcv3hzUFSrqO4Zrx+UZPZL9CFqOtkyJZaPVTjzsyKml3U1cuVbNsv1o4baFyWPXp//ddGwh3OMSTSPn3j8H5BHbVK6Hkh2wAEIqXUn+SNGoUX6QcQAALIzal5jocJ1iY+H3NHuqNBdfU+7OYtErBK5Y5dtAgMBAAGjbTBrMEoGA1UdEQRDMEGCF3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlhiZodHRwczovL3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQU2WCwheUwJClRqisBK/bkVSC212AwDQYJKoZIhvcNAQELBQADggEBAHnsRGKyoh54cx2ecnsC0RDxHB7j5Y8dybPpivA4SHgtDnbjb2jQh3c2d1UMi9N7ZOxnA5RnoSj0Hs3bkvWSvOMrKSxNincKtAsp9BBclf/PLDlSN625vn3rpKhjbYLYo3LHlBqg3wNbskqc+3opaiFJ8zkRcCwdlgNObUzE4szRlnJJbEMqq2XSHsSbp7wpvI5tWIuzKmlatN2uV6cdX8AgOf4/vWc5AAwt16j9gLyFepruXj1EV8ZjLmT282EDdyrMF/ZWwrd/jvN+gJiBff8D5IUrBcEMarP5A1p3ipvDHedGUgFhtjt8XSHJ5SaeBFZxhmvWPAGQQSA5AL5ESjY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utbildning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utbildning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utbildning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utbildning.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utbildning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
-      <md:ServiceName xml:lang="en">Ladok for employees</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="sn" Name="urn:oid:2.5.4.4" 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="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="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:GivenName>Ladok-supporten</md:GivenName>
-    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
author	Björn Mattsson <bjorn@sunet.se>	2023-03-06 11:22:05 +0100
committer	Björn Mattsson <bjorn@sunet.se>	2023-03-06 11:22:05 +0100
commit	467dbdbf3d7212e25ee69daeaadd8adba7c7c5b8 (patch)
tree	d3576d5f2d4b5cc676c0a12ef8f8c3c83b474bf5 /swamid-edugain
parent	bc1d55080e5d42e6ef2bba892d640aa8f68bbc90 (diff)