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

author: Fredrik Åslund <fredrik.aslund@umu.se> 2014-03-11 10:55:41 +0100
committer: Fredrik Åslund <fredrik.aslund@umu.se> 2014-03-11 10:55:41 +0100
commit: f42e9ed213788b0335c80cb25408d89270313cbc (patch)
tree: 205fe0b17b12783e64c032476641eb2db3105929 /swamid-interfederations-2.0
parent: b26bbb98b31766b432cc74f4905a9e1966a5ab4b (diff)
parent: 503169139d1f1974e3be567c905d623d65d233d8 (diff)
245 files changed, 3536 insertions, 22883 deletions
diff --git a/swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml b/swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml
deleted file mode 100644
index d4a61330..00000000
--- a/swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ID-Prov.fh-ludwigshafen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-ludwigshafen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ID-Prov.fh-ludwigshafen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ID-Prov.fh-ludwigshafen.de,OU=Rechenzentrum,O=Fachhochschule Ludwigshafen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIHErZepkyoSzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTExMDEzMTMwMTEwWhcNMTYx
-MDExMTMwMTEwWjBwMQswCQYDVQQGEwJERTEkMCIGA1UEChMbRmFjaGhvY2hzY2h1
-bGUgTHVkd2lnc2hhZmVuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMwIQYDVQQD
-ExpJRC1Qcm92LmZoLWx1ZHdpZ3NoYWZlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKKu4OkCyCrzFDkpnh4cktypjR0fOMoAn6LpHztDJqtv/07H
-GIsD8ReJJ5GmK6wOSgclOkbC+f/gG9nvbsT+KyaOdxtAE9W4g/Hh6Prn7frWWG3q
-EKxeHSmxIqXVnchxNxt12nSZrKXV/5+afQop9ERCsPo2eJAw9AsPm/qOiDlwzSpW
-lGyV8+ZclVi1+b+H4+NQfYFai4bw2wRaJWPSUQPA7B32ZWNHMRAsbF40p62s1L7P
-h3X1uVMVrYZKpMcSxu1AOEUoqqCi16Jedk5FUxchEOJBB7tURxGDDD7eNqNw11tB
-/ghdsYS50pf/R2aXy96NWhzEdlL1E4cqG3jtWyECAwEAAaOCAZUwggGRMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUY5uUBWAA2xmQVmyLFbSG1EKtSo4wHwYDVR0jBBgwFoAUL90T
-mGNcC8NvuO2G4AMnwW+6tgIwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
-MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
-BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAMQwCC1UDZejZ5rdnEZLaOk
-mxEPSZ7MxAgZV1pY5uZbSlaMhu2g4XYVvZ7rlgLOZurI/cDRXeZm/6omDhFR+z0J
-B/Pc5C0bQWopw63U9IE3bVP7ienlqx8Rul/I8loMxJMz6U4D8cAoCdFsbtznCfHe
-bBPddbpJ06W/KOBcv7hVn8MPFbrnwFKNdtZeMGB+0Rx/uLUZxvF5s2ZOPOmAen8X
-9W6k5N/GRfQFZm9DuU2DDAEzl8Pe2yQ/DBguegNkwbBDd7vmV2fLVlnTAaeFacmd
-30+7Ch1H/AQu8KqQdO0SkYor6auC3ZMH3uE8Z3BGfyRWuXB3KSRmY77RiDwHBtE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-ludwigshafen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ID-Prov.fh-ludwigshafen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ID-Prov.fh-ludwigshafen.de,OU=Rechenzentrum,O=Fachhochschule Ludwigshafen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIHErZepkyoSzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTExMDEzMTMwMTEwWhcNMTYx
-MDExMTMwMTEwWjBwMQswCQYDVQQGEwJERTEkMCIGA1UEChMbRmFjaGhvY2hzY2h1
-bGUgTHVkd2lnc2hhZmVuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMwIQYDVQQD
-ExpJRC1Qcm92LmZoLWx1ZHdpZ3NoYWZlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKKu4OkCyCrzFDkpnh4cktypjR0fOMoAn6LpHztDJqtv/07H
-GIsD8ReJJ5GmK6wOSgclOkbC+f/gG9nvbsT+KyaOdxtAE9W4g/Hh6Prn7frWWG3q
-EKxeHSmxIqXVnchxNxt12nSZrKXV/5+afQop9ERCsPo2eJAw9AsPm/qOiDlwzSpW
-lGyV8+ZclVi1+b+H4+NQfYFai4bw2wRaJWPSUQPA7B32ZWNHMRAsbF40p62s1L7P
-h3X1uVMVrYZKpMcSxu1AOEUoqqCi16Jedk5FUxchEOJBB7tURxGDDD7eNqNw11tB
-/ghdsYS50pf/R2aXy96NWhzEdlL1E4cqG3jtWyECAwEAAaOCAZUwggGRMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUY5uUBWAA2xmQVmyLFbSG1EKtSo4wHwYDVR0jBBgwFoAUL90T
-mGNcC8NvuO2G4AMnwW+6tgIwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
-MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
-BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAMQwCC1UDZejZ5rdnEZLaOk
-mxEPSZ7MxAgZV1pY5uZbSlaMhu2g4XYVvZ7rlgLOZurI/cDRXeZm/6omDhFR+z0J
-B/Pc5C0bQWopw63U9IE3bVP7ienlqx8Rul/I8loMxJMz6U4D8cAoCdFsbtznCfHe
-bBPddbpJ06W/KOBcv7hVn8MPFbrnwFKNdtZeMGB+0Rx/uLUZxvF5s2ZOPOmAen8X
-9W6k5N/GRfQFZm9DuU2DDAEzl8Pe2yQ/DBguegNkwbBDd7vmV2fLVlnTAaeFacmd
-30+7Ch1H/AQu8KqQdO0SkYor6auC3ZMH3uE8Z3BGfyRWuXB3KSRmY77RiDwHBtE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Fachhochschule Ludwigshafen am Rhein</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">FH Ludwigshafen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-ludwigshafen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Müller</SurName>
-    <EmailAddress>Andreas.Mueller@fh-ludwigshafen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
index 5805b05b..07f974ca 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-17T08:45:13Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-25T14:39:29Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -9,10 +9,24 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">SWITCH</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SWITCH</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SWITCH operates the education and research network for the Swiss Higher Education organisations.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">SWITCH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">SWITCH</mdui:DisplayName>
+        <mdui:Description xml:lang="de">SWITCH erbringt innovative, einzigartige Internet-Dienstleistungen für die Schweizer Hochschulen und Internetbenutzer.</mdui:Description>
+        <mdui:Description xml:lang="en">SWITCH provides innovative, unique internet services for the Swiss universities and internet users.</mdui:Description>
+        <mdui:Description xml:lang="fr">SWITCH fournit des prestations innovantes et uniques pour les hautes écoles suisses et les utilisateurs d\'Internet.</mdui:Description>
+        <mdui:Description xml:lang="it">SWITCH eroga servizi Internet innovativi e unici per le scuole universitarie svizzere e per gli utenti di Internet.</mdui:Description>
+        <mdui:Keywords xml:lang="en">Zurich</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">Zürich</mdui:Keywords>
+        <mdui:Keywords xml:lang="fr">Zurich</mdui:Keywords>
+        <mdui:Keywords xml:lang="it">Zurigo</mdui:Keywords>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAgFJREFUeJxi+P//P8PHXd1nfj484w1ik4rBxNsVeR+f1Kr+/7ira/Pfr++USTbg3aqCj4/LJP8/Lpf6/6LP8ce38+tb/v/7y0W8AWtKnj8qFvn/pFrp/+NKOTB+syD+0a/HF0KJMuD324eS79eVzwd64+/jCpn/T2qABgHpp/Ua/z9sadz759NLbbwGwPDP+ydNXs+NPPK4UhbsiifVimBvPe+2+f3l1LL+f39+8eM1AIz//mH8em5N5Is+p0cgzU+BhjytAhpWIf3/zeywF7/uH08EqmPEbQAU//v2nuvnockNj1uMv96r1vh/r0bz/70K5f/367T/P1pVc/zr2+cmeA348+8/49KtZ8Nt/ItvGzklvzd2SX2vZ5/0Xtc24X1xWevVp48e+uI04PCZW0YeKb2HWLWT/7PopIExg2rif1WP6p/z1x/v/P7rLy9WL9x59EoivW7hXF6jzL/Mmkn/ufTT/jMBaRHz3P9VfWt2vH73WR1rIL7/+JW9a862Mhn7oo+MGolgjSDb2XVT/gflTLl3/trDALzRmN+69DKDcux/Dt3U/xx6qf9BhhgF1H9bu+tM3b9//zkJJqSEyjkfGdUT/jMBNUpYF/xvnbF57ftP3+SJTsoJFXM+MgM1x5TOunbj3nNXkjNTet2Cx/PWHCoGsllJ0QzCAAAAAP//AwC4nrtuPmwfNwAAAABJRU5ErkJggg==</mdui:Logo>
         <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAiDSURBVHic7Fh7bFPXGT9x4vgR29fva1/HsRM78StODE0CCTQoJiEPh7wgNoFAgkt4jpF2/aNTira0/2za2qGC1IcoUwlTaaF0XRJRaLRB2QCxTtAHrxUWNfQBnWAPprFNNN5377UTO7GzKop2dKQc6ed7z3dev/O73znnO0aRSATNY/bAToB0YCdAOrATIB3YCZAO7ARIB3YCpAM7AdKBnQDpwE6AdGAnQDqwEyAd2AmQDuwESAd2AqQDOwHSgZ0A6cBOgHRgJ0A6sBMgHdgJkA7sBEgHdgKkg/9hk1jlkJvKX1LmN/9B62y/oXe03YTnNWV+06CMWbQBxSWpqWKv0tZwRiBjsnlLWqwoU5pTdUJhrdmPxBRnyFYj40AbdbqvSvyDWKUMAf/sKBbuOhpSXgiXiCr4AimSWfw/zzJXvslmTSZaMDh0HF4azirtjROgbIHJdwBC/rNjtz5ndj/9dDxNeZZh4ePKvLphtXP1ZXY+eseqm1oAZVkO3E01PPX0iQbpipx0hS0wLNF5f4pSJ4HcunwPlVf7m0kBhTKruqDlnrE4/GfaFTqhdwWPAF7Xu0Lv0O6Oy0zxY+OqvLonYj1IDAvLmaLwA2Ve/YF49TjWpvLHmeJND7OYRT42v69B8coXu4x3t5aJLJO1uCbG013qu3/aYXzfbxcIefkppHevOatxrPqIE5DRCYaG30Uor31E7w6NAJ8R2rP2gql4U4T2rPuQzbNAqGnk1q0vmN27owJKNLS2oPUq44N67rW/h7kMAQ7zcwoeNRZt/BjGuYfkZiaeu1DtRFA2qjRV/HIGAdNBo2Gjp/OrCQFlzOKfMb6e/8jMj1qTNBCq7I1XjEXhy0jtEMeMKlvgFaZoYwQK3TFRokqmaR2rryBn50ethXTZ2E46sr9JsYMtEAnSkCj6wXcszuy/08tE9tYrOE8QcSMpkM4VOqspaOUEzMqSokCgkX0DcRVcO5G+uIzxdkUyjaXNvOi8vaurC5WUlHDvytyalxjf5og8p7I6Vh6fJMYSZIL5yC3+XfH2DHUBCNg9Sn0LAWlXx+0JAZW5K44bvN03EJWbtIVYW/gdjX3lC0J1wQQbgdrhhsH+qbY1Hp6omMavTQFlLUL5XQ/fWOO/fX0b+sRKIyk3chovNOSs58Pav13ZQg/bDSgjap0m4MTE4ievL65kvN0RsaFkVcwmEsbVhQ8E7c/pXMFLKSUQyhHt7RrS2JsGEsaJCvhtPBBWZpyAeXUjBu/GsXSlfVrtNEFGooHL875G5a7YB0t5XKwrijYEe1pUD0PtW4fXBR7+uBpxHpYJE4t5X79feuDuE8w3/VXSIjYvjg2RQsD4lEzAqUnnaLuoLWg5g6ZsL/FJZCqvFuuLl8TbZi0g7FsvmxZsHqdya5bM0BClTWy4UV4yo9ZQuOEvQPjZaZWz9Ez9I4+8qpfxWUFsKkrEXOrR37/YQx9L6ItNcyUgtIc98H2UVMApJsGk+3ICemEJM2VHUvXNdkC7gr9KEBA23VwgPQLqfw0F52nXml9DpZOwmb+htjfuhz2lP1NdYOKbpyf0BifuNtisx7KMJcqEcqnZ2bV00YFCOkouyvvFgOL5r3tNo99bIub6E8Z3N2ceCAI6UgmYOvECdo3CATWmcQUHNa7Q8WlwBgdBp6/AC28nhjHpEiShfWaFeVm50lpdq7LVh9S2+i2a/OaXjd4N9+D0+xgpLFmTw0W5STQIBvxA71n7KhIpJwvpunNHOxvG99ShcMzoyUaqT7cb7ox0atsS+oil/4MHCoXCafVjtpiAEOqchgijHUK1oNJWPwUN7aDHB+BkUwSMS6KpeXphH1McjsjNSxckFES9TcaUP2ny9UQU5kreSylrLcrvHn9nfe39G9vRlzoN4hbyay1U/+1dzM2e0kyOcSwenJzJHAroaP1tqnKfz4dWrgxwKC0tnbDHLeFjqdoifgkPJSzhgYFD5oFDvzAfPHgQ+f3++Lr8Q25uNng6I5S12p+0ywypSe/uGKcL178JMaUATuzryNl9fWeFfcWdXt03L9TLnlqahyy3djJ/PRZU7U5JbY4E1DraLgHOpyrv7e1FQ8PvoWFAX1/f5DRme4g8tuX7Fzdtf3Y0HN6MnI786U0UlqCxcH2EsvgfnVYW9UIIrl+EgDuidrQ+B8HouCK3toMtPbFOc+raNvqzobXKPWM7jeONbuThWEz1PjbNkYBsGAOB8rVkZTKZNPq2fC9CNSPsm1zOn3SzFhChiiOoIPxvhEosyVrIc5a9DuI8kBrLbDN0bNA5V0eyF2yJGLwbbsC1iDM2eTJ8n3/XOH7/SVPkYKtieIb2cyYgRBN72S0ly1Q+/YNDytC62b3uJNy+EpZqhmqWgTQs0WVaV/ABeM5nsHfs09oCz+hsDc9o7YGfgCin4MbxUFPQ8hoSqZKfatEAWqwv2gM3FnapRyfHeafg7ZD65NWt9D9Kc5CLs6Y6G0Uq7iqnjV7lkiWJ3ldp8m6MiI1lKQVEYo0BlvB1mM/fIcQ6pLU1/JCbj62hHw6X50G839GFnf8S633L45sJNS4Ece2oMvt/COgODRs8675MPEQk6jJ59tIBuKKdUzlWf6JyBq+oHKsuQf6EPHvJU0iskvBipSftNY0XUSGzNZ5KV/COHFumWxcLyw6FpIOcbQZm7A2B/TNBlrMsZRwmVNoWULl1Z2CytcmJREcQynQwn32qgpYLKteaPwI+VTnbr6rymz+kLFXvIsrCRQLxF4UMyiqg8uqHJFrPj2ZgKZDnVD1H5dW+N/931lz9nTWPeQHnBSQV2AmQDuwESAd2AqQDOwHSgZ0A6cBOgHRgJ0A6sBMgHdgJkA7sBEgHdgKkAzsB0oGdAOnAToB0YCdAOrATIB3YCZAO7ARIB3YCpOO/AAAA//8DAB7/hgVtBuDqAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.switch.ch/about/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.switch.ch/de/about/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.switch.ch/fr/about/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.switch.ch/it/about/</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>130.59.0.0/16</mdui:IPHint>
@@ -129,8 +143,14 @@ pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">SWITCH</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.switch.ch/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>SWITCHaai</GivenName>
diff --git a/swamid-interfederations-2.0/aai-viewer.switch.ch.xml b/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
index 3ec47dde..5fd6438f 100644
--- a/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
@@ -135,8 +135,14 @@ w0u+mWE7XbF8GQzs0WDn7Qx7T/+h+593He8Bv+YgNKO7asFXy/BpK0TJpyF4iKgJ
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">SWITCH</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.switch.ch/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>SWITCHaai</GivenName>
diff --git a/swamid-interfederations-2.0/aai.csc.fi.xml b/swamid-interfederations-2.0/aai.csc.fi.xml
deleted file mode 100644
index ddc9e0ab..00000000
--- a/swamid-interfederations-2.0/aai.csc.fi.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.csc.fi">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aai.csc.fi/Shibboleth.sso/DS" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aai.csc.fi/Shibboleth.sso/DS2" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aai.csc.fi/Shibboleth.sso/DFN" index="3"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.csc.fi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.csc.fi,O=CSC - IT Center for Science Ltd.,street=Keilaranta 14,L=Espoo,ST=Uusimaa,postalCode=02101,C=FI</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEMzCCAxugAwIBAgIQZVL9Z7sVloWk90pzKJnHQTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxNzAwMDAwMFoXDTEzMDIxNjIzNTk1OVowgZcxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMjEwMTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UE
-BxMFRXNwb28xFjAUBgNVBAkTDUtlaWxhcmFudGEgMTQxKTAnBgNVBAoTIENTQyAt
-IElUIENlbnRlciBmb3IgU2NpZW5jZSBMdGQuMRMwEQYDVQQDEwphYWkuY3NjLmZp
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgp0eKogkBh5709swM/XCZlpty
-9iANER18jL69a3/SlyyxI9ez2dOpwLu72tm0tXbiVdpj9Gjt8/dVYkN7LHDV7mOu
-bWAtN2ZMMJqdYg9X7y1Zv+Xu3Zaj9eqMKF2V8QhBnLnXMfqRJbiwoRP+l8RQEdRs
-1Ju4ZPlOBOTWNeyQQwIDAQABo4IBXTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFNPMFGfBam2umfu9+wPOi8wn+zxiMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6At
-oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-cy50ZXJlbmEub3JnMBUGA1UdEQQOMAyCCmFhaS5jc2MuZmkwDQYJKoZIhvcNAQEF
-BQADggEBACIPxYBjl20Dy7TnVbTnJ8rxiIv5Qxw12ExeNMUjNF6LvMk9TsitVNHx
-ML4AVPE15r3DxUb597vmkoFFSLzIXPlRkiFRrsx3S7S1Pbt0c3tmyN3OLc4yBrFV
-t5xlY2Mn1xlZic/d04dfDfmLg8775/aS0Cl/qpYegOEBwrHTSkCw2IbjL4xxNQgl
-dw4jSaYr/Mli/B+7LeQVMjmruKYwqV9Sb4jHtDeM/2DJK05WjjWJTCu8ogaC+l+G
-Z1Za6rMU2E/Raw3t8qatdoKDjROSD92v84fWQU8HLFDfokHksaub31is3oT0gKyK
-rIzI2ITQoInc4nkGcX0Ysk4DBLUOIUk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.csc.fi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.csc.fi,O=CSC - IT Center for Science Ltd.,street=Keilaranta 14,L=Espoo,ST=Uusimaa,postalCode=02101,C=FI</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEMzCCAxugAwIBAgIQZVL9Z7sVloWk90pzKJnHQTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxNzAwMDAwMFoXDTEzMDIxNjIzNTk1OVowgZcxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMjEwMTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UE
-BxMFRXNwb28xFjAUBgNVBAkTDUtlaWxhcmFudGEgMTQxKTAnBgNVBAoTIENTQyAt
-IElUIENlbnRlciBmb3IgU2NpZW5jZSBMdGQuMRMwEQYDVQQDEwphYWkuY3NjLmZp
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgp0eKogkBh5709swM/XCZlpty
-9iANER18jL69a3/SlyyxI9ez2dOpwLu72tm0tXbiVdpj9Gjt8/dVYkN7LHDV7mOu
-bWAtN2ZMMJqdYg9X7y1Zv+Xu3Zaj9eqMKF2V8QhBnLnXMfqRJbiwoRP+l8RQEdRs
-1Ju4ZPlOBOTWNeyQQwIDAQABo4IBXTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFNPMFGfBam2umfu9+wPOi8wn+zxiMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6At
-oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-cy50ZXJlbmEub3JnMBUGA1UdEQQOMAyCCmFhaS5jc2MuZmkwDQYJKoZIhvcNAQEF
-BQADggEBACIPxYBjl20Dy7TnVbTnJ8rxiIv5Qxw12ExeNMUjNF6LvMk9TsitVNHx
-ML4AVPE15r3DxUb597vmkoFFSLzIXPlRkiFRrsx3S7S1Pbt0c3tmyN3OLc4yBrFV
-t5xlY2Mn1xlZic/d04dfDfmLg8775/aS0Cl/qpYegOEBwrHTSkCw2IbjL4xxNQgl
-dw4jSaYr/Mli/B+7LeQVMjmruKYwqV9Sb4jHtDeM/2DJK05WjjWJTCu8ogaC+l+G
-Z1Za6rMU2E/Raw3t8qatdoKDjROSD92v84fWQU8HLFDfokHksaub31is3oT0gKyK
-rIzI2ITQoInc4nkGcX0Ysk4DBLUOIUk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.csc.fi/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.csc.fi/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.csc.fi/Shibboleth.sso/SLO/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.csc.fi/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.csc.fi/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.csc.fi/Shibboleth.sso/NIM/POST"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.csc.fi/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.csc.fi/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.csc.fi/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.csc.fi/Shibboleth.sso/SAML/POST" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">CSC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://aai.csc.fi/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Pekka</GivenName>
-    <SurName>Järveläinen</SurName>
-    <EmailAddress>pj@csc.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml b/swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml
deleted file mode 100644
index 10083fc4..00000000
--- a/swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.ruhr-uni-bochum.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ruhr-uni-bochum.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.ruhr-uni-bochum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.ruhr-uni-bochum.de,O=Ruhr-Universitaet Bochum,L=Bochum,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVjCCBD6gAwIBAgIEEiEnvjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDzANBgNVBAcTBkJvY2h1
-bTEhMB8GA1UEChMYUnVoci1Vbml2ZXJzaXRhZXQgQm9jaHVtMSQwIgYDVQQDExtS
-dWhyLVVuaXZlcnNpdGFldCBCb2NodW0gQ0ExJzAlBgkqhkiG9w0BCQEWGHJ1YmNh
-QHJ1aHItdW5pLWJvY2h1bS5kZTAeFw0xMTA2MjIwODM5MTFaFw0xMjA2MjEwODM5
-MTFaMIGAMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxl
-bjEPMA0GA1UEBxMGQm9jaHVtMSEwHwYDVQQKExhSdWhyLVVuaXZlcnNpdGFldCBC
-b2NodW0xHzAdBgNVBAMTFmFhaS5ydWhyLXVuaS1ib2NodW0uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1TXNvbWZQuhD7KNV+/c8P06qnPrfpUpOr
-9fU2J+cJ0qWK6bsG7fZ2vqH6XOmnAhoYszMW6mPSrfysoGsz4um6IpseDEMG1yil
-nG3FxZbj8s1IlY8LnIi0MyofA6lwxZknpeg1L9QF53pZOaSWCIvyXbawpk9EUA5i
-hHI+IfRV/KI0+xFFqwiy6/P9XPZy9egNSEBlF1kc06Dkb8FoFLn4rI9mtCXK9T6Y
-Bpnl/irNSc8ufSNMucdNFIuRQwdIhuR2Wqf6xEzSkN5ZBUDK5XJ8J539biCH8Emd
-UBW8yEOSCu1xiIv2WsGTsOpxUKStyTuT63x6IXcMwFV1eTQWdvJPAgMBAAGjggGm
-MIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFKQSAnlARvF9KuS1wrFrQO1HBFWRMB8GA1Ud
-IwQYMBaAFLspuDtfBCTji3B7YH82bxdhy66SMIGFBgNVHR8EfjB8MDygOqA4hjZo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib2NodW0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUH
-MAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAFhVZaHJUtJ1huuoMSkKTbVK5uvpeR2dmgsB9dE65FgEtgIzLlfq
-W/z7o4lbP8PWXURBBZSRfc/Lz6+d3CULzS2hcZdzDldGupvf753Oi+dVSn9xi+Bf
-IRDNZQXCUoXssSM3Dg9k3jWPfC6v/LK5iAE5R5rAA9F30k6wjOFxKTHAiBl9Ft2D
-/EslaYzBDMbSvIS63iCpj564wDDHhBh3gRecHA9Q4H3c+SyzuERi4J6pmSH+vkmL
-a9srY8QcPwqxi0NPaNPU8PNlt7ZT17Qlb6CWW68e795DgXo9GgNTRgmqVJbAz6es
-3N07N4JoxZQMCy3W6DW0PLaOIbCfvAP5V0o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai.ruhr-uni-bochum.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.ruhr-uni-bochum.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.ruhr-uni-bochum.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.ruhr-uni-bochum.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ruhr-uni-bochum.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.ruhr-uni-bochum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.ruhr-uni-bochum.de,O=Ruhr-Universitaet Bochum,L=Bochum,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVjCCBD6gAwIBAgIEEiEnvjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDzANBgNVBAcTBkJvY2h1
-bTEhMB8GA1UEChMYUnVoci1Vbml2ZXJzaXRhZXQgQm9jaHVtMSQwIgYDVQQDExtS
-dWhyLVVuaXZlcnNpdGFldCBCb2NodW0gQ0ExJzAlBgkqhkiG9w0BCQEWGHJ1YmNh
-QHJ1aHItdW5pLWJvY2h1bS5kZTAeFw0xMTA2MjIwODM5MTFaFw0xMjA2MjEwODM5
-MTFaMIGAMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxl
-bjEPMA0GA1UEBxMGQm9jaHVtMSEwHwYDVQQKExhSdWhyLVVuaXZlcnNpdGFldCBC
-b2NodW0xHzAdBgNVBAMTFmFhaS5ydWhyLXVuaS1ib2NodW0uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1TXNvbWZQuhD7KNV+/c8P06qnPrfpUpOr
-9fU2J+cJ0qWK6bsG7fZ2vqH6XOmnAhoYszMW6mPSrfysoGsz4um6IpseDEMG1yil
-nG3FxZbj8s1IlY8LnIi0MyofA6lwxZknpeg1L9QF53pZOaSWCIvyXbawpk9EUA5i
-hHI+IfRV/KI0+xFFqwiy6/P9XPZy9egNSEBlF1kc06Dkb8FoFLn4rI9mtCXK9T6Y
-Bpnl/irNSc8ufSNMucdNFIuRQwdIhuR2Wqf6xEzSkN5ZBUDK5XJ8J539biCH8Emd
-UBW8yEOSCu1xiIv2WsGTsOpxUKStyTuT63x6IXcMwFV1eTQWdvJPAgMBAAGjggGm
-MIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFKQSAnlARvF9KuS1wrFrQO1HBFWRMB8GA1Ud
-IwQYMBaAFLspuDtfBCTji3B7YH82bxdhy66SMIGFBgNVHR8EfjB8MDygOqA4hjZo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib2NodW0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUH
-MAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAFhVZaHJUtJ1huuoMSkKTbVK5uvpeR2dmgsB9dE65FgEtgIzLlfq
-W/z7o4lbP8PWXURBBZSRfc/Lz6+d3CULzS2hcZdzDldGupvf753Oi+dVSn9xi+Bf
-IRDNZQXCUoXssSM3Dg9k3jWPfC6v/LK5iAE5R5rAA9F30k6wjOFxKTHAiBl9Ft2D
-/EslaYzBDMbSvIS63iCpj564wDDHhBh3gRecHA9Q4H3c+SyzuERi4J6pmSH+vkmL
-a9srY8QcPwqxi0NPaNPU8PNlt7ZT17Qlb6CWW68e795DgXo9GgNTRgmqVJbAz6es
-3N07N4JoxZQMCy3W6DW0PLaOIbCfvAP5V0o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Ruhr-Universität Bochum</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Ruhr-Universität Bochum</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ruhr-uni-bochum.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Jobs</SurName>
-    <EmailAddress>Andreas.Jobs@ruhr-uni-bochum.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.sztaki.hu.xml b/swamid-interfederations-2.0/aai.sztaki.hu.xml
index ddb61403..5ba4ba68 100644
--- a/swamid-interfederations-2.0/aai.sztaki.hu.xml
+++ b/swamid-interfederations-2.0/aai.sztaki.hu.xml
@@ -5,7 +5,7 @@
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexxa</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexaa</ns9:MetadataSet>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/abstimmung.dfn.de.xml b/swamid-interfederations-2.0/abstimmung.dfn.de.xml
deleted file mode 100644
index 192805ba..00000000
--- a/swamid-interfederations-2.0/abstimmung.dfn.de.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://abstimmung.dfn.de/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-04-25T09:41:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                   https://www.aai.dfn.de/en/join/
-            </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">
-                   https://www.aai.dfn.de/teilnahme/
-            </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DFN Terminplaner (Foodle)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DFN Foodle</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Umfrage- und Abstimmungs-Tool</mdui:Description>
-        <mdui:Description xml:lang="en">Poll and survey tool</mdui:Description>
-        <mdui:Logo height="32" width="32">https://www.aai.dfn.de/fileadmin/templates/main/images/logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>abstimmung.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=abstimmung.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfjCCBGagAwIBAgIHE7Y6ez910DANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMjA0MjQx
-NDQ3MDdaFw0xNzA0MjMxNDQ3MDdaMFkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpE
-Rk4tVmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRowGAYDVQQDExFh
-YnN0aW1tdW5nLmRmbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AM6AKfTgX6byqjE3pozzRVCi9dRy0chPRdImbTCN/ecoaeYyIu2sLgW03zCx+4bm
-qZY39ZJ9vLV98dpHsJ+XzVmyJFLazyUd4AT947cOPr9IgPrWFQZYYTUCK1wD7MkZ
-BedBp0pJhWBjFEjn4eKocDj7kuGY7TUKK/AXzLDrldk2Yh5H5wUrgkTp2YrQIVek
-5roZiAs6EqsiWWagVpu6IiThCMhfKLQhGf8XpMlwzvz6rrwzpGxTdMmNupmVCYYn
-zMzbnZ9QziQALjiyh8XwK8epf30NJC9dBoq7uFxdOzSFGIf8RroR2Sarapm/QKRg
-WQjI402bZ+W/zGy6VxtGdDkCAwEAAaOCAkQwggJAMBwGA1UdIAQVMBMwEQYPKwYB
-BAGBrSGCLAEBBAICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUTUY5hcn6723usV9Ds939YVI5
-PmcwHwYDVR0jBBgwFoAUeaJiL87xBjlS53ZtYsfem2p1S0kwMwYDVR0RBCwwKoIR
-YWJzdGltbXVuZy5kZm4uZGWCFXd3dy5hYnN0aW1tdW5nLmRmbi5kZTCBkQYDVR0f
-BIGJMIGGMEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4t
-Z3MtY2EvcHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8G
-CCsGAQUFBwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu
-LmRlL09DU1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAPVzwu/cMXJ3wpXWwO/xBSlqZiXKI+QG6Yon3skeOTR0kxvd2w6G03QZ2W81pe
-G0TgD3Jv4c3fkHeDDXb0y9JqioBEQJowAjojHiHgfxrBfYv2GTIjQC4rqgyYwU5S
-xsySIMHlCz4OKddO8DhPCBr1uK4zDFlCEiSY+l/0V2hMdJ0+2e0nP1whxAAy/qVy
-pUDI1asgim0Gmk/OP5pJMZgI91wJZYCwr8x35qH+jgGk1jq7n85G6sgNNBCdWEou
-wmFP5OQlDH+W6pttzCCFkZybL+KUa57jpXRhHREcekNPpoS88fkF63L2hQj7WLBy
-c4paT29IqC4Dh1TfYHNKxtWT
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>abstimmung.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=abstimmung.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfjCCBGagAwIBAgIHE7Y6ez910DANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMjA0MjQx
-NDQ3MDdaFw0xNzA0MjMxNDQ3MDdaMFkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpE
-Rk4tVmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRowGAYDVQQDExFh
-YnN0aW1tdW5nLmRmbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AM6AKfTgX6byqjE3pozzRVCi9dRy0chPRdImbTCN/ecoaeYyIu2sLgW03zCx+4bm
-qZY39ZJ9vLV98dpHsJ+XzVmyJFLazyUd4AT947cOPr9IgPrWFQZYYTUCK1wD7MkZ
-BedBp0pJhWBjFEjn4eKocDj7kuGY7TUKK/AXzLDrldk2Yh5H5wUrgkTp2YrQIVek
-5roZiAs6EqsiWWagVpu6IiThCMhfKLQhGf8XpMlwzvz6rrwzpGxTdMmNupmVCYYn
-zMzbnZ9QziQALjiyh8XwK8epf30NJC9dBoq7uFxdOzSFGIf8RroR2Sarapm/QKRg
-WQjI402bZ+W/zGy6VxtGdDkCAwEAAaOCAkQwggJAMBwGA1UdIAQVMBMwEQYPKwYB
-BAGBrSGCLAEBBAICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUTUY5hcn6723usV9Ds939YVI5
-PmcwHwYDVR0jBBgwFoAUeaJiL87xBjlS53ZtYsfem2p1S0kwMwYDVR0RBCwwKoIR
-YWJzdGltbXVuZy5kZm4uZGWCFXd3dy5hYnN0aW1tdW5nLmRmbi5kZTCBkQYDVR0f
-BIGJMIGGMEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4t
-Z3MtY2EvcHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8G
-CCsGAQUFBwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu
-LmRlL09DU1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAPVzwu/cMXJ3wpXWwO/xBSlqZiXKI+QG6Yon3skeOTR0kxvd2w6G03QZ2W81pe
-G0TgD3Jv4c3fkHeDDXb0y9JqioBEQJowAjojHiHgfxrBfYv2GTIjQC4rqgyYwU5S
-xsySIMHlCz4OKddO8DhPCBr1uK4zDFlCEiSY+l/0V2hMdJ0+2e0nP1whxAAy/qVy
-pUDI1asgim0Gmk/OP5pJMZgI91wJZYCwr8x35qH+jgGk1jq7n85G6sgNNBCdWEou
-wmFP5OQlDH+W6pttzCCFkZybL+KUa57jpXRhHREcekNPpoS88fkF63L2hQj7WLBy
-c4paT29IqC4Dh1TfYHNKxtWT
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationName>
-    <OrganizationName xml:lang="en">German National Research and Education Network, DFN</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.dfn.de/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Torsten</GivenName>
-    <SurName>Kersting</SurName>
-    <EmailAddress>kersting@dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aleph.svkhk.cz.xml b/swamid-interfederations-2.0/aleph.svkhk.cz.xml
new file mode 100644
index 00000000..20db4fe6
--- /dev/null
+++ b/swamid-interfederations-2.0/aleph.svkhk.cz.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://aleph.svkhk.cz/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <shibmd:Scope regexp="false">svkhk.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Research Library in Hradec Králové</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Studijní a vědecká knihovna v Hradci Králové</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of the Research Library in Hradec Králové</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Studijní a vědecké knihovny v Hradci Králové</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.svkhk.cz/Uvodni-stranka.aspx?lang=en-US</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.svkhk.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://aleph.svkhk.cz/idp/images/logo_40.png</mdui:Logo>
+        <mdui:Logo height="90" width="90">https://aleph.svkhk.cz/idp/images/logo_90.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUC7dbtKAQedxgZUwv3VFnAGDTwQ4wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOYWxlcGguc3ZraGsuY3owHhcNMTQwMTA2MTcwNDQ2WhcN
+MzQwMTA2MTcwNDQ2WjAZMRcwFQYDVQQDEw5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALT0PjFlLk3sfYzuMd4pWVRAYdsx9Kax
+GkF2/0OpAKJQzUA2yhJw3/JtQNbLkGahSkotsU3sbPaV7s6WTu9rJoth153eoLx1
+nNxATvfJ24MbzcK4vCU2HOOnAxFF40a64kn6BR42FpJMDvaDNrYNGC7QXnt9c16r
+drlJKZ9YeSBZ58ziOioU5hgQb3lo9AoN4/M+KVtTsc98F0oX30LYa7JklmQNukuH
+EL2fiDgQTboT8/D0lFwRb7fUXV7aV5Ycm2M9+vPWGY9/+lHNUWDV7m1V5p9QHtuQ
+Mk+j8eP1dKA7RYmpv40A5QN22YzrzUTuRhKQGthOU+VENAx+weL6ybcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOYWxlcGguc3ZraGsuY3qGJWh0dHBzOi8vYWxlcGguc3Zr
+aGsuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB6RVoK6wbDr4JhJu4Wd4JhW
+pfTXMA0GCSqGSIb3DQEBBQUAA4IBAQBpXII7Nhv1rB40LCIMAwk5K/+J6rZn9ng4
+4pvCT6G+FSDTPA39bVUEunlChaGYHNy4sP9UOr/YvK48zAcmdu5di15q43/FbsAr
+F6jP/7uhM3z7Il0N1/NvsQ2tRdpvuVNGiWRVwQ5RHeLTJSq0Nc1UL1I/oJTOTzcd
+ypflPtnNY6u+VVjoczH+s505mASs8NIsaYPiV2PZIRnsGbzNAz2O7efJsajyCcOV
+H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
+/ygOfyI2RELa14PCEnCMPPI4NNry20Pp1kuXfT6B4DB+LvcQfREJ
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aleph.svkhk.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">svkhk.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUC7dbtKAQedxgZUwv3VFnAGDTwQ4wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOYWxlcGguc3ZraGsuY3owHhcNMTQwMTA2MTcwNDQ2WhcN
+MzQwMTA2MTcwNDQ2WjAZMRcwFQYDVQQDEw5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALT0PjFlLk3sfYzuMd4pWVRAYdsx9Kax
+GkF2/0OpAKJQzUA2yhJw3/JtQNbLkGahSkotsU3sbPaV7s6WTu9rJoth153eoLx1
+nNxATvfJ24MbzcK4vCU2HOOnAxFF40a64kn6BR42FpJMDvaDNrYNGC7QXnt9c16r
+drlJKZ9YeSBZ58ziOioU5hgQb3lo9AoN4/M+KVtTsc98F0oX30LYa7JklmQNukuH
+EL2fiDgQTboT8/D0lFwRb7fUXV7aV5Ycm2M9+vPWGY9/+lHNUWDV7m1V5p9QHtuQ
+Mk+j8eP1dKA7RYmpv40A5QN22YzrzUTuRhKQGthOU+VENAx+weL6ybcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOYWxlcGguc3ZraGsuY3qGJWh0dHBzOi8vYWxlcGguc3Zr
+aGsuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB6RVoK6wbDr4JhJu4Wd4JhW
+pfTXMA0GCSqGSIb3DQEBBQUAA4IBAQBpXII7Nhv1rB40LCIMAwk5K/+J6rZn9ng4
+4pvCT6G+FSDTPA39bVUEunlChaGYHNy4sP9UOr/YvK48zAcmdu5di15q43/FbsAr
+F6jP/7uhM3z7Il0N1/NvsQ2tRdpvuVNGiWRVwQ5RHeLTJSq0Nc1UL1I/oJTOTzcd
+ypflPtnNY6u+VVjoczH+s505mASs8NIsaYPiV2PZIRnsGbzNAz2O7efJsajyCcOV
+H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
+/ygOfyI2RELa14PCEnCMPPI4NNry20Pp1kuXfT6B4DB+LvcQfREJ
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="cs">Studijní a vědecká knihovna v Hradci Králové</OrganizationName>
+    <OrganizationName xml:lang="en">The Research Library in Hradec Králové</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">Studijní a vědecká knihovna v Hradci Králové</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The Research Library in Hradec Králové</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.svkhk.cz/Uvodni-stranka.aspx?lang=en-US</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.svkhk.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Sklenář</SurName>
+    <EmailAddress>petr.sklenar@svkhk.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml b/swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml
deleted file mode 100644
index da3044c2..00000000
--- a/swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.cs.serialssolutions.com/auth/Metadata/Shib">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.serialssolutions.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.serialssolutions.com,OU=Serials Solutions,O=Serials Solutions,L=Seattle,ST=WA,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDjDCCAnSgAwIBAgIETQA4czANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRowGAYDVQQKExFTZXJp
-YWxzIFNvbHV0aW9uczEaMBgGA1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNV
-BAMTGHd3dy5zZXJpYWxzc29sdXRpb25zLmNvbTAeFw0xMDEyMDkwMjAxMjNaFw0x
-NjAxMDcwMjAxMjNaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNV
-BAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMRowGAYDVQQL
-ExFTZXJpYWxzIFNvbHV0aW9uczEhMB8GA1UEAxMYd3d3LnNlcmlhbHNzb2x1dGlv
-bnMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2cevLb70/ZI
-7URgp+Rgz9KOHtJRg4W9ucFm91fvfoaww9tBBQ8GXEgq3wO3pmPYE4+bdA04xIW3
-sQgmB9UQe1sPVOhffUhHm/+MBzddIZ1WYg1lLOl3CQ/2J5Uak+/3hV8Z+ppbV0tx
-HBtqSrd+aaSrVftWKqoF5+gSmMi2ckuUGTrq9B8etqALhZoU4K2CFYhjrVK2vwaS
-sjT3+AXlO2m7PmE4xC+2jXjp33uxMbhwfjY7XgpK06h8tQQXCH7GPRbYLjSPWFw3
-IHQFm46bk4uyzDsJemjLcaGaazmbWwdMZhoWydGHphbO9Jw2so1Ht2ABOcfj3TpU
-GIKW9dmQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB699XlVrbgegSecfHkxdwK
-J+7N2N5vqvAcOhoBEU1UAqIuuQF3lCpDot8QNfhxRHc3sxUh4OfqUDWcdD1rxavP
-7LzrCu9hJFli2pzNWOMle/AyAfbVRT3tDSmjqOlyrJs/G50PQV9QJyJxLvXJHg0P
-RQiV5GjOtMlE9fsVY5FIpoXTOJwP2yDvE5HF2QO4gEhKrNZvmXJ6X60NryxIApD2
-nQQ5159Bha3+D9szK4wwaGQ04ry+UW0j9C7xbhDCc/Kkd5JCqzvLqFp73F6Ma6nK
-32buuHZ/UERHs77NrmCGrS7i3oJppxFoakb9bfWEFMrbD7ZUV9DtoTDZFtFkR9jb
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.serialssolutions.com/sso/auth/CS/rcv/saml1" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/CS/rcv/saml1" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Proquest Information and Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest: Serials Solutions</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.serialssolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Fujita-Yuhas</SurName>
-    <EmailAddress>Tim.Fujita-Yuhas@SerialsSolutions.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.galegroup.com.xml b/swamid-interfederations-2.0/auth.galegroup.com.xml
deleted file mode 100644
index ef555243..00000000
--- a/swamid-interfederations-2.0/auth.galegroup.com.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.galegroup.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.galegroup.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.galegroup.com,O=Cengage Learning\, Inc.,OU=Gale,L=Farmington Hills,ST=Michigan,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEcjCCA1qgAwIBAgILAQAAAAABIhnUw+swDQYJKoZIhvcNAQEFBQAwajEjMCEG
-A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-b24gQ0EwHhcNMDkwNjI1MjMwNzQ3WhcNMTIwNjI1MjMwNzQzWjCBjjELMAkGA1UE
-BhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMRkwFwYDVQQHExBGYXJtaW5ndG9uIEhp
-bGxzMQ0wCwYDVQQLEwRHYWxlMR8wHQYDVQQKExZDZW5nYWdlIExlYXJuaW5nLCBJ
-bmMuMSEwHwYDVQQDExhzaGliYm9sZXRoLmdhbGVncm91cC5jb20wgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAJurlIZ5y5TusQdA5zOkmjK9/CgQU2uAnbw74Htp
-7upEsG6QqgZZntYeXvjJtzzIYSxqTwH+U5eCKByVF9QD44V18RnUWzYM97pqtJSR
-9epFzmIud/1bUu5IXfZr6j6m6I/nZAIXNjw1Rk0nFzC5D4/Sn31Sbwf148YQY4Pg
-qSfjAgMBAAGjggF2MIIBcjAfBgNVHSMEGDAWgBR9bSrsZqunUTarAmnxcI/EWQua
-HzBJBggrBgEFBQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9zZWN1cmUuZ2xv
-YmFsc2lnbi5uZXQvY2FjZXJ0L29yZ3YxLmNydDA/BgNVHR8EODA2MDSgMqAwhi5o
-dHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09yZ2FuaXphdGlvblZhbDEuY3JsMB0G
-A1UdDgQWBBQuxxlvAJHyCXjksxkjTIluCR81HjAJBgNVHRMEAjAAMA4GA1UdDwEB
-/wQEAwIFoDApBgNVHSUEIjAgBggrBgEFBQcDAQYIKwYBBQUHAwIGCisGAQQBgjcK
-AwMwSwYDVR0gBEQwQjBABgkrBgEEAaAyARQwMzAxBggrBgEFBQcCARYlaHR0cDov
-L3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5LzARBglghkgBhvhCAQEEBAMC
-BsAwDQYJKoZIhvcNAQEFBQADggEBAJKFBkqybwXaw/R8xW2ylMVzRvst9i9PBTyr
-wUlQ3au4DDm8NzVEBump3DGJi11x+wGsBBmoMd4dYeT7Gyh+9IuNSXqn9rH9RqoN
-rB0CXHDHuroKnLBLL83v1izwFtJxXcUP6hH6O9FijasA/OG58qQqGtPx+pGTbOld
-sMf7wLcaxGHkX2ewCItl1sFC2k0P5SxhT3PFfW72U9qebLXqrqUSfpqiVfr8q8mw
-BLGO4ir7pnEil8/qGg37fTz5CJbshEKtOyY7iPEB1vdX3PwT+df6EAReyUagWbss
-s1OLZFlIbf64xtG5rGBx5ZMl4cuHcBBbahQFg+YQeERgUNL2aQg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.galegroup.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.galegroup.com,O=Cengage Learning\, Inc.,OU=Gale,L=Farmington Hills,ST=Michigan,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEcjCCA1qgAwIBAgILAQAAAAABIhnUw+swDQYJKoZIhvcNAQEFBQAwajEjMCEG
-A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-b24gQ0EwHhcNMDkwNjI1MjMwNzQ3WhcNMTIwNjI1MjMwNzQzWjCBjjELMAkGA1UE
-BhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMRkwFwYDVQQHExBGYXJtaW5ndG9uIEhp
-bGxzMQ0wCwYDVQQLEwRHYWxlMR8wHQYDVQQKExZDZW5nYWdlIExlYXJuaW5nLCBJ
-bmMuMSEwHwYDVQQDExhzaGliYm9sZXRoLmdhbGVncm91cC5jb20wgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAJurlIZ5y5TusQdA5zOkmjK9/CgQU2uAnbw74Htp
-7upEsG6QqgZZntYeXvjJtzzIYSxqTwH+U5eCKByVF9QD44V18RnUWzYM97pqtJSR
-9epFzmIud/1bUu5IXfZr6j6m6I/nZAIXNjw1Rk0nFzC5D4/Sn31Sbwf148YQY4Pg
-qSfjAgMBAAGjggF2MIIBcjAfBgNVHSMEGDAWgBR9bSrsZqunUTarAmnxcI/EWQua
-HzBJBggrBgEFBQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9zZWN1cmUuZ2xv
-YmFsc2lnbi5uZXQvY2FjZXJ0L29yZ3YxLmNydDA/BgNVHR8EODA2MDSgMqAwhi5o
-dHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09yZ2FuaXphdGlvblZhbDEuY3JsMB0G
-A1UdDgQWBBQuxxlvAJHyCXjksxkjTIluCR81HjAJBgNVHRMEAjAAMA4GA1UdDwEB
-/wQEAwIFoDApBgNVHSUEIjAgBggrBgEFBQcDAQYIKwYBBQUHAwIGCisGAQQBgjcK
-AwMwSwYDVR0gBEQwQjBABgkrBgEEAaAyARQwMzAxBggrBgEFBQcCARYlaHR0cDov
-L3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5LzARBglghkgBhvhCAQEEBAMC
-BsAwDQYJKoZIhvcNAQEFBQADggEBAJKFBkqybwXaw/R8xW2ylMVzRvst9i9PBTyr
-wUlQ3au4DDm8NzVEBump3DGJi11x+wGsBBmoMd4dYeT7Gyh+9IuNSXqn9rH9RqoN
-rB0CXHDHuroKnLBLL83v1izwFtJxXcUP6hH6O9FijasA/OG58qQqGtPx+pGTbOld
-sMf7wLcaxGHkX2ewCItl1sFC2k0P5SxhT3PFfW72U9qebLXqrqUSfpqiVfr8q8mw
-BLGO4ir7pnEil8/qGg37fTz5CJbshEKtOyY7iPEB1vdX3PwT+df6EAReyUagWbss
-s1OLZFlIbf64xtG5rGBx5ZMl4cuHcBBbahQFg+YQeERgUNL2aQg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.ggtest.com/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galedemo.com/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gada.oh.gale.com:8445/Shibboleth.sso/SAML/POST" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Cengage Learning Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gale Databases from Cengage Learning</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.cengage.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jayashree</GivenName>
-    <SurName>Ravi</SurName>
-    <EmailAddress>jayashree.ravi@cengage.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gary</GivenName>
-    <SurName>Pollack</SurName>
-    <EmailAddress>gary.pollack@cengage.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Marx</SurName>
-    <EmailAddress>john.marx@cengage.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.search.serialssolutions.com.xml b/swamid-interfederations-2.0/auth.search.serialssolutions.com.xml
deleted file mode 100644
index fa665558..00000000
--- a/swamid-interfederations-2.0/auth.search.serialssolutions.com.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.search.serialssolutions.com/auth/Metadata/Shib">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.serialssolutions.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.serialssolutions.com,OU=Serials Solutions,O=Serials Solutions,L=Seattle,ST=WA,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDjDCCAnSgAwIBAgIETQA4czANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRowGAYDVQQKExFTZXJp
-YWxzIFNvbHV0aW9uczEaMBgGA1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNV
-BAMTGHd3dy5zZXJpYWxzc29sdXRpb25zLmNvbTAeFw0xMDEyMDkwMjAxMjNaFw0x
-NjAxMDcwMjAxMjNaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNV
-BAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMRowGAYDVQQL
-ExFTZXJpYWxzIFNvbHV0aW9uczEhMB8GA1UEAxMYd3d3LnNlcmlhbHNzb2x1dGlv
-bnMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2cevLb70/ZI
-7URgp+Rgz9KOHtJRg4W9ucFm91fvfoaww9tBBQ8GXEgq3wO3pmPYE4+bdA04xIW3
-sQgmB9UQe1sPVOhffUhHm/+MBzddIZ1WYg1lLOl3CQ/2J5Uak+/3hV8Z+ppbV0tx
-HBtqSrd+aaSrVftWKqoF5+gSmMi2ckuUGTrq9B8etqALhZoU4K2CFYhjrVK2vwaS
-sjT3+AXlO2m7PmE4xC+2jXjp33uxMbhwfjY7XgpK06h8tQQXCH7GPRbYLjSPWFw3
-IHQFm46bk4uyzDsJemjLcaGaazmbWwdMZhoWydGHphbO9Jw2so1Ht2ABOcfj3TpU
-GIKW9dmQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB699XlVrbgegSecfHkxdwK
-J+7N2N5vqvAcOhoBEU1UAqIuuQF3lCpDot8QNfhxRHc3sxUh4OfqUDWcdD1rxavP
-7LzrCu9hJFli2pzNWOMle/AyAfbVRT3tDSmjqOlyrJs/G50PQV9QJyJxLvXJHg0P
-RQiV5GjOtMlE9fsVY5FIpoXTOJwP2yDvE5HF2QO4gEhKrNZvmXJ6X60NryxIApD2
-nQQ5159Bha3+D9szK4wwaGQ04ry+UW0j9C7xbhDCc/Kkd5JCqzvLqFp73F6Ma6nK
-32buuHZ/UERHs77NrmCGrS7i3oJppxFoakb9bfWEFMrbD7ZUV9DtoTDZFtFkR9jb
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Proquest Information and Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest: Serials Solutions 360 Link/Core</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.serialssolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Fujita-Yuhas</SurName>
-    <EmailAddress>Tim.Fujita-Yuhas@SerialsSolutions.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beige.admin.grnet.gr.xml b/swamid-interfederations-2.0/beige.admin.grnet.gr.xml
deleted file mode 100644
index e2bdf715..00000000
--- a/swamid-interfederations-2.0/beige.admin.grnet.gr.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beige.admin.grnet.gr/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">(grnet-hq\.)?admin\.grnet\.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Greek Research and Technology Network</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.grnet.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.grnet.gr/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>admin.grnet.gr</mdui:DomainHint>
-        <mdui:DomainHint>noc.grnet.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.28.0/23</mdui:IPHint>
-        <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
-        <mdui:IPHint>83.212.9.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2340::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIE4zCCA8ugAwIBAgIRAOgl5wnIyOOGusiqnulMXlIwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMDA4MTkwMDAwMDBaFw0xMzA4MTgyMzU5NTlaMH4xCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
-                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEdMBsGA1UE
-                            AxMUYmVpZ2UuYWRtaW4uZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-                            ggEKAoIBAQCy90ye8ReEjGgko1wquImmKkWEboYj81QjFkBqTZPop2W2sNwZrFt6
-                            N+Mx87La+CqUAkfVJvJDF6iBqW0ubR0y0zCaquMwlKEVmiKqA3ByhaIxmck0LVNi
-                            eVx07S4AancwdmAymzlNhk5z9gJIb+dbGTb8a8V5Fqa7i3p3FF1gv+6w72fuSryQ
-                            SKfgO5TgHEzfzU8OsD4yJxPnipIQKC69L2ULhFnI1zisyaMcktEqTTVrVnCHRAH4
-                            WKHgZt0pBIPu9UqLQhOaQPERfYbBJ1DFQZUrWaKV5+SSgC6GZMFAfuDf77WwZ1CL
-                            /hlnTkY0RsVLauC8m0ytCACK7mfHss7pAgMBAAGjggGiMIIBnjAfBgNVHSMEGDAW
-                            gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUp8RAOy4O9yRXq5B9T8BW
-                            wV9x8UwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
-                            KwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYD
-                            VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-                            U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-                            LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-                            cDovL29jc3AudGNzLnRlcmVuYS5vcmcwWgYDVR0RBFMwUYIUYmVpZ2UuYWRtaW4u
-                            Z3JuZXQuZ3KCEWZzLmFkbWluLmdybmV0LmdyghJpZHAuYWRtaW4uZ3JuZXQuZ3KC
-                            EnZwbi5hZG1pbi5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEApUzLJmu4URSd
-                            o6183ERid5Vv6ue9LZfGln+h4ka6j+TVCcjn/gfmptabUHdt+H//AGWIv81dyFV3
-                            kQVI5+kvJrQkRAPI2Bznkc7izTa3fFKcn4wjBknITIVFQI4ChN+0qxM+8vtzgord
-                            lNqGfF9GX+VElc0I/JCzu0cCNST6dzipYwvkYOXwn5cfMiUqqLJ9Dk5rEgEKwj3c
-                            hQI1MDgJGApdh6clFkUMxDbHnG6nlj1yehV/Sy5rbh8juKIf+fMkxEbaJJIJm+gr
-                            nCkx2IgQIaXHgnnbubScqQ5iTYvWf6hlhaFm5l9q+PuGx5A9wcQhJ1oJ+IV3DaBt
-                            o/IZYWrn/Q==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.admin.grnet.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">(grnet-hq\.)?admin\.grnet\.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Greek Research and Technology Network</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.grnet.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.grnet.gr/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>admin.grnet.gr</mdui:DomainHint>
-        <mdui:DomainHint>noc.grnet.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.28.0/23</mdui:IPHint>
-        <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
-        <mdui:IPHint>83.212.9.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2340::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIE4zCCA8ugAwIBAgIRAOgl5wnIyOOGusiqnulMXlIwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMDA4MTkwMDAwMDBaFw0xMzA4MTgyMzU5NTlaMH4xCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
-                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEdMBsGA1UE
-                            AxMUYmVpZ2UuYWRtaW4uZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-                            ggEKAoIBAQCy90ye8ReEjGgko1wquImmKkWEboYj81QjFkBqTZPop2W2sNwZrFt6
-                            N+Mx87La+CqUAkfVJvJDF6iBqW0ubR0y0zCaquMwlKEVmiKqA3ByhaIxmck0LVNi
-                            eVx07S4AancwdmAymzlNhk5z9gJIb+dbGTb8a8V5Fqa7i3p3FF1gv+6w72fuSryQ
-                            SKfgO5TgHEzfzU8OsD4yJxPnipIQKC69L2ULhFnI1zisyaMcktEqTTVrVnCHRAH4
-                            WKHgZt0pBIPu9UqLQhOaQPERfYbBJ1DFQZUrWaKV5+SSgC6GZMFAfuDf77WwZ1CL
-                            /hlnTkY0RsVLauC8m0ytCACK7mfHss7pAgMBAAGjggGiMIIBnjAfBgNVHSMEGDAW
-                            gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUp8RAOy4O9yRXq5B9T8BW
-                            wV9x8UwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
-                            KwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYD
-                            VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-                            U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-                            LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-                            cDovL29jc3AudGNzLnRlcmVuYS5vcmcwWgYDVR0RBFMwUYIUYmVpZ2UuYWRtaW4u
-                            Z3JuZXQuZ3KCEWZzLmFkbWluLmdybmV0LmdyghJpZHAuYWRtaW4uZ3JuZXQuZ3KC
-                            EnZwbi5hZG1pbi5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEApUzLJmu4URSd
-                            o6183ERid5Vv6ue9LZfGln+h4ka6j+TVCcjn/gfmptabUHdt+H//AGWIv81dyFV3
-                            kQVI5+kvJrQkRAPI2Bznkc7izTa3fFKcn4wjBknITIVFQI4ChN+0qxM+8vtzgord
-                            lNqGfF9GX+VElc0I/JCzu0cCNST6dzipYwvkYOXwn5cfMiUqqLJ9Dk5rEgEKwj3c
-                            hQI1MDgJGApdh6clFkUMxDbHnG6nlj1yehV/Sy5rbh8juKIf+fMkxEbaJJIJm+gr
-                            nCkx2IgQIaXHgnnbubScqQ5iTYvWf6hlhaFm5l9q+PuGx5A9wcQhJ1oJ+IV3DaBt
-                            o/IZYWrn/Q==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
-    <OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.grnet.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.grnet.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Greek Research and Technology Network</Company>
-    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
-    <TelephoneNumber>800-11-47638</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Greek Research and Technology Network</Company>
-    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
-    <TelephoneNumber>800-11-47638</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/belser.gbv.de.xml b/swamid-interfederations-2.0/belser.gbv.de.xml
deleted file mode 100644
index 525e26f5..00000000
--- a/swamid-interfederations-2.0/belser.gbv.de.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://belser.gbv.de/sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.gbv.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>belser.gbv.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=belser.gbv.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGgjCCBWqgAwIBAgIED4i/dTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMjAzMDkyOTEx
-WhcNMTUwMjAyMDkyOTExWjCBnzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazEWMBQGA1UEAxMNYmVsc2VyLmdidi5kZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAL9DhQnvqMbJXo8I2SmG1mDQLEzywQahD+aSNMgl
-W5LedRyJc2TZE1les6CwEC8tqljGHMJ9UwMIpvvmpqFOeg3r7REtTjvyb0G28BKv
-2z90ypWz2lHh6BZ2AcZamnF2AK8WNMa5xq6R9/b9IrDEdLenJRON267kUSb8jpEr
-6QNICloRo/avIUoqELFiHTQDROKRIViF6VdBhn0+Wfcpnnu11JSU3n0+4umoNz+C
-wHEw9smR5jn99GmPnpZO4q7FaK8rws1OQh9UgYXWLRrvwJzHv+/OhFZVfE1n+Snu
-3PFdlZowape4Lc4uHDLcQTej7ZeUbBb7oIpr6vFJ4iQg5EZb1k6WeenX9kelMcXB
-eao3buJ9ETD5cDDpELhIKxb6l0FN6UNCNQNWlLTwlCT/fCKmJ+8f1dogl3gUZLmY
-vQReuEcnmrwwG0m/pPA6wJtA4sKlXzCoPAnW3g8nMT/1rf9y0c5aBEsWUVAAfnVh
-gJvjaxh2T8HsvoJwnnfAvqiCqn4O6lw4OFYAwUepnCCVD5FBgew0mhyALGy/LAG6
-Jqa4T+xMXfm4D1eOJZzYGz+BGeW14CpLaXcb0JWW9RDkGfF4zxNxd0sFjP/IVdQj
-w3VqKCAJFzQNLhPNEBzpjMFLiDDziAusdKXqF9baAETpeJCxoIs/hrh95fI2pl3E
-EieBAgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM3hPwKxXMSUfFKhwW3h
-cm4/QDq3MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQ
-MA6BDGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
-KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQEFBQADggEBAGtMJD6q+ieWV2XzsQe2Ym4+mN9d13lYwcBc
-ukH4O5wbdJVDs4TbbNjS52owS3aRDEvk6Q9jxqncUzik7oKoZN2ffGHKHBNl8l2R
-VZu0bJXhPlniIAdi8Y6oxDotX6oS2YJ4q9z0EOhypyGQm6O0/+ZwOKFrSn0ggAlo
-YdMB+fZedi7UTRGvnVlEFELJTQuAK9epTXZrmcPGRweSxZ2JG6kSE9Mvy4nfgIhD
-yOIPgKqvUSwlSl2fgmAY6Qvxs6R1nXkdbfhdGsSAuI59RDr19PTyyd8EvlEhri2M
-DKu3zW/LjvUq5jTn3w9Q32pe1nYZAn2UcvJ+sl7invtI0oNQFjE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>belser.gbv.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=belser.gbv.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGgjCCBWqgAwIBAgIED4i/dTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMjAzMDkyOTEx
-WhcNMTUwMjAyMDkyOTExWjCBnzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazEWMBQGA1UEAxMNYmVsc2VyLmdidi5kZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAL9DhQnvqMbJXo8I2SmG1mDQLEzywQahD+aSNMgl
-W5LedRyJc2TZE1les6CwEC8tqljGHMJ9UwMIpvvmpqFOeg3r7REtTjvyb0G28BKv
-2z90ypWz2lHh6BZ2AcZamnF2AK8WNMa5xq6R9/b9IrDEdLenJRON267kUSb8jpEr
-6QNICloRo/avIUoqELFiHTQDROKRIViF6VdBhn0+Wfcpnnu11JSU3n0+4umoNz+C
-wHEw9smR5jn99GmPnpZO4q7FaK8rws1OQh9UgYXWLRrvwJzHv+/OhFZVfE1n+Snu
-3PFdlZowape4Lc4uHDLcQTej7ZeUbBb7oIpr6vFJ4iQg5EZb1k6WeenX9kelMcXB
-eao3buJ9ETD5cDDpELhIKxb6l0FN6UNCNQNWlLTwlCT/fCKmJ+8f1dogl3gUZLmY
-vQReuEcnmrwwG0m/pPA6wJtA4sKlXzCoPAnW3g8nMT/1rf9y0c5aBEsWUVAAfnVh
-gJvjaxh2T8HsvoJwnnfAvqiCqn4O6lw4OFYAwUepnCCVD5FBgew0mhyALGy/LAG6
-Jqa4T+xMXfm4D1eOJZzYGz+BGeW14CpLaXcb0JWW9RDkGfF4zxNxd0sFjP/IVdQj
-w3VqKCAJFzQNLhPNEBzpjMFLiDDziAusdKXqF9baAETpeJCxoIs/hrh95fI2pl3E
-EieBAgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM3hPwKxXMSUfFKhwW3h
-cm4/QDq3MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQ
-MA6BDGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
-KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQEFBQADggEBAGtMJD6q+ieWV2XzsQe2Ym4+mN9d13lYwcBc
-ukH4O5wbdJVDs4TbbNjS52owS3aRDEvk6Q9jxqncUzik7oKoZN2ffGHKHBNl8l2R
-VZu0bJXhPlniIAdi8Y6oxDotX6oS2YJ4q9z0EOhypyGQm6O0/+ZwOKFrSn0ggAlo
-YdMB+fZedi7UTRGvnVlEFELJTQuAK9epTXZrmcPGRweSxZ2JG6kSE9Mvy4nfgIhD
-yOIPgKqvUSwlSl2fgmAY6Qvxs6R1nXkdbfhdGsSAuI59RDr19PTyyd8EvlEhri2M
-DKu3zW/LjvUq5jTn3w9Q32pe1nYZAn2UcvJ+sl7invtI0oNQFjE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gbv.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gbv.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gbv.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gbv.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gbv.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gbv.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gbv.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gbv.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gbv.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gbv.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gbv.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gbv.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gbv.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gbv.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Belser-Produkte mit Nationallizenz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Belser-Produkte mit Nationallizenz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://belser.gbv.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>borel@gbv.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml b/swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml
deleted file mode 100644
index 9d886df0..00000000
--- a/swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blblogin.blb-karlsruhe.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">blblogin.blb-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
-EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
-hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
-MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
-ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
-ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
-dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
-d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
-jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
-IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
-Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
-1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
-Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
-BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
-VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
-LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
-MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
-dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
-4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
-kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
-firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
-Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
-OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
-Q1O4HKVwCF4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
-EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
-hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
-MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
-ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
-ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
-dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
-d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
-jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
-IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
-Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
-1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
-Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
-BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
-VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
-LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
-MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
-dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
-4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
-kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
-firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
-Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
-OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
-Q1O4HKVwCF4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://blblogin.blb-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blblogin.blb-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">blblogin.blb-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
-EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
-hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
-MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
-ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
-ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
-dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
-d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
-jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
-IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
-Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
-1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
-Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
-BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
-VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
-LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
-MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
-dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
-4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
-kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
-firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
-Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
-OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
-Q1O4HKVwCF4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
-EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
-hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
-MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
-ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
-ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
-dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
-d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
-jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
-IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
-Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
-1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
-Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
-BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
-VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
-LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
-MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
-dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
-4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
-kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
-firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
-Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
-OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
-Q1O4HKVwCF4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Badische Landesbibliothek Karlsruhe</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Badische Landesbibliothek</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.blb-karlsruhe.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Uli</GivenName>
-    <SurName>Fietz</SurName>
-    <EmailAddress>fietz@blb-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Uli</GivenName>
-    <SurName>Fietz</SurName>
-    <EmailAddress>fietz@blb-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bridge.uninett.no.xml b/swamid-interfederations-2.0/bridge.uninett.no.xml
deleted file mode 100644
index bb6ff7af..00000000
--- a/swamid-interfederations-2.0/bridge.uninett.no.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://bridge.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEjDCCA3SgAwIBAgIJAOOq/5xhGwUvMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMB4XDTExMDkyMjExNDYyMloXDTIxMDkyMTExNDYyMlowgYoxCzAJBgNVBAYTAk5PMRAwDgYDVQQIEwdBbmRyZWFzMRAwDgYDVQQHEwdBbmRyZWFzMRAwDgYDVQQKEwdBbmRyZWFzMRAwDgYDVQQLEwdBbmRyZWFzMRAwDgYDVQQDEwdBbmRyZWFzMSEwHwYJKoZIhvcNAQkBFhJhbmRyZWFzQHVuaW5ldHQubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8/MduXpE0ZBIUqG0SMu/4ZXalD04cj4eeaecldelkXwWj3GXid2h7DjcElrsj+76K7XJa72r/o6FNqj7qUEWYE93DL3uWQ3jXh72bWPeo/Jju88Ea2xn43yWa2i82CshCzIJzjCSKN7L3aejpowgyQuwFOhlBbGBaHF0ihFVe6wEVSPvPL6OvX4/kZZqcMe4HveIpw4w2hWuX297juSZEN3XlwXpKf2zvhGaqTUinF1mgzcpUocfeYsRSIjEjJwwDsk6/WDAAumTfqLN0XDYFU2VfucZ08ovrAsh+8R7JVGuKKyz7Qn2ali84XQQHXA/Jf8ZqDW7A6rlSsjm2y9ZhAgMBAAGjgfIwge8wHQYDVR0OBBYEFH7mar1GlsEE4CQOpnty4XbiFVqxMIG/BgNVHSMEgbcwgbSAFH7mar1GlsEE4CQOpnty4XbiFVqxoYGQpIGNMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vggkA46r/nGEbBS8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAEaiUcmuUiq0bhaMD8njpqJP0b6JcpjRoS0+a8Ynr9hjyOXNLEDgHZAJEjqTsGr8a++mwdk2cQwMDR2AsLpHqFHUTtd+QDPLTkR10JzGOIsSCNBpm73kO6S1oneKXDMELsZg3J0ZXIB79iWYQWpITvjdCxaToL9dw1BR86fLle9YJVdyuhhAqCtFtJ35OM3S0Gw7JEKld+LHZaLDvyJSEFSfOQBTVkb0NBKFu2TSsOqOzOIRyxH0c8Bs/IyOenB8eCgg7KYvjkPETAPig4JvazM9LilKdxLhvRcaVofQkIaw7K+Y4EdIVRTIGLOmj4Lm07pQyClYSDDtQPQiktkpZUA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEjDCCA3SgAwIBAgIJAOOq/5xhGwUvMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMB4XDTExMDkyMjExNDYyMloXDTIxMDkyMTExNDYyMlowgYoxCzAJBgNVBAYTAk5PMRAwDgYDVQQIEwdBbmRyZWFzMRAwDgYDVQQHEwdBbmRyZWFzMRAwDgYDVQQKEwdBbmRyZWFzMRAwDgYDVQQLEwdBbmRyZWFzMRAwDgYDVQQDEwdBbmRyZWFzMSEwHwYJKoZIhvcNAQkBFhJhbmRyZWFzQHVuaW5ldHQubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8/MduXpE0ZBIUqG0SMu/4ZXalD04cj4eeaecldelkXwWj3GXid2h7DjcElrsj+76K7XJa72r/o6FNqj7qUEWYE93DL3uWQ3jXh72bWPeo/Jju88Ea2xn43yWa2i82CshCzIJzjCSKN7L3aejpowgyQuwFOhlBbGBaHF0ihFVe6wEVSPvPL6OvX4/kZZqcMe4HveIpw4w2hWuX297juSZEN3XlwXpKf2zvhGaqTUinF1mgzcpUocfeYsRSIjEjJwwDsk6/WDAAumTfqLN0XDYFU2VfucZ08ovrAsh+8R7JVGuKKyz7Qn2ali84XQQHXA/Jf8ZqDW7A6rlSsjm2y9ZhAgMBAAGjgfIwge8wHQYDVR0OBBYEFH7mar1GlsEE4CQOpnty4XbiFVqxMIG/BgNVHSMEgbcwgbSAFH7mar1GlsEE4CQOpnty4XbiFVqxoYGQpIGNMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vggkA46r/nGEbBS8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAEaiUcmuUiq0bhaMD8njpqJP0b6JcpjRoS0+a8Ynr9hjyOXNLEDgHZAJEjqTsGr8a++mwdk2cQwMDR2AsLpHqFHUTtd+QDPLTkR10JzGOIsSCNBpm73kO6S1oneKXDMELsZg3J0ZXIB79iWYQWpITvjdCxaToL9dw1BR86fLle9YJVdyuhhAqCtFtJ35OM3S0Gw7JEKld+LHZaLDvyJSEFSfOQBTVkb0NBKFu2TSsOqOzOIRyxH0c8Bs/IyOenB8eCgg7KYvjkPETAPig4JvazM9LilKdxLhvRcaVofQkIaw7K+Y4EdIVRTIGLOmj4Lm07pQyClYSDDtQPQiktkpZUA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://bridge.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://bridge.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Feide DiscoJuice Kalmar Showcase Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">A service that allows users to verify that Kalmar login works to norwegian services connected to Feide. This service also showcases the DiscoJuice IdP Discovery Service.</md:ServiceDescription>
-      <md:RequestedAttribute 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:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bscw.uamr.de.xml b/swamid-interfederations-2.0/bscw.uamr.de.xml
deleted file mode 100644
index 0d2d1b73..00000000
--- a/swamid-interfederations-2.0/bscw.uamr.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bscw.uamr.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bscw.uamr.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>bscw.uamr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bscw.uamr.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIED8LaTTANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0x
-MDAzMTkxMTE1MTBaFw0xNTAzMTgxMTE1MTBaMHgxCzAJBgNVBAYTAkRFMRwwGgYD
-VQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ4wDAYDVQQHEwVFc3NlbjEkMCIGA1UE
-ChMbVW5pdmVyc2l0YWV0IER1aXNidXJnLUVzc2VuMRUwEwYDVQQDEwxic2N3LnVh
-bXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc7hrbPLlsk8xF
-A1fLbM7YpO0yLR6KGyO7tNdSEu3KoKsV2f8xCKlRYPycyx7QEB15q4kCAxxogacx
-ZFWXV/6ulO+eFVAhG4PkJykEv48mzo92WSKPsG9XkuLbWTxMtTuUvJ04/yzi+9dt
-tljHAHgDDMkwh7RGCVv9r/AQDKiBKnMeDdqJPPkp29UnOLTNHNu959qUiExKtcpc
-UXueClrC3id35VLcATDQt1gfGxqS+FIlZdssPadtQWwM6bOXL0eNcxbb02N+2HaQ
-HJ0Tm4u9qGSFgwY/pIQG86CbZaacKsgm6qsH1F0RWAzxF7fILxnMvpBtw8Pnu10s
-t+2GR96/AgMBAAGjggHtMIIB6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCijkeXAsScFRx0+
-L3gahU7zuEERMB8GA1UdIwQYMBaAFGZmvJabSE3o3bwip6Zb1ahBn5XuMCMGA1Ud
-EQQcMBqBGGJ1cmtoYXJkLndhbGRAdW5pLWR1ZS5kZTCBlwYDVR0fBIGPMIGMMESg
-QqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgbAGCCsG
-AQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTgYI
-KwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVz
-c2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-mlY8KKbsR6qQDtHfogHplnXDv733tuxUWW3ynyXyxxsDfA3smTwQZ//k/2IEPCws
-5hDche5CEVw5zfLoSm9PqlHsJe49dNyZka29U5KR2Gk2+etsYvXQN6ymK/TXgpMH
-yN/IxkCw/U33C3NQ4/iGOXuzdRia+0bY9WSulznMkWnaltgMZFdrh7odTwS1oSvL
-Cwc8qmKh6zem/Gbj9b56j6XaglrIfQ2fb3YppDCDOQsqlc+zzBmHRM1iIDxXUeow
-MohRxJR1XxYWIX8KSO8oRc434PDw5xi8S0xf49Cok3YTfKtlWdcJ20jktwlPzRPR
-fiJZCVlIJyI/zGzKQRTD9w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>bscw.uamr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bscw.uamr.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIED8LaTTANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0x
-MDAzMTkxMTE1MTBaFw0xNTAzMTgxMTE1MTBaMHgxCzAJBgNVBAYTAkRFMRwwGgYD
-VQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ4wDAYDVQQHEwVFc3NlbjEkMCIGA1UE
-ChMbVW5pdmVyc2l0YWV0IER1aXNidXJnLUVzc2VuMRUwEwYDVQQDEwxic2N3LnVh
-bXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc7hrbPLlsk8xF
-A1fLbM7YpO0yLR6KGyO7tNdSEu3KoKsV2f8xCKlRYPycyx7QEB15q4kCAxxogacx
-ZFWXV/6ulO+eFVAhG4PkJykEv48mzo92WSKPsG9XkuLbWTxMtTuUvJ04/yzi+9dt
-tljHAHgDDMkwh7RGCVv9r/AQDKiBKnMeDdqJPPkp29UnOLTNHNu959qUiExKtcpc
-UXueClrC3id35VLcATDQt1gfGxqS+FIlZdssPadtQWwM6bOXL0eNcxbb02N+2HaQ
-HJ0Tm4u9qGSFgwY/pIQG86CbZaacKsgm6qsH1F0RWAzxF7fILxnMvpBtw8Pnu10s
-t+2GR96/AgMBAAGjggHtMIIB6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCijkeXAsScFRx0+
-L3gahU7zuEERMB8GA1UdIwQYMBaAFGZmvJabSE3o3bwip6Zb1ahBn5XuMCMGA1Ud
-EQQcMBqBGGJ1cmtoYXJkLndhbGRAdW5pLWR1ZS5kZTCBlwYDVR0fBIGPMIGMMESg
-QqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgbAGCCsG
-AQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTgYI
-KwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVz
-c2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-mlY8KKbsR6qQDtHfogHplnXDv733tuxUWW3ynyXyxxsDfA3smTwQZ//k/2IEPCws
-5hDche5CEVw5zfLoSm9PqlHsJe49dNyZka29U5KR2Gk2+etsYvXQN6ymK/TXgpMH
-yN/IxkCw/U33C3NQ4/iGOXuzdRia+0bY9WSulznMkWnaltgMZFdrh7odTwS1oSvL
-Cwc8qmKh6zem/Gbj9b56j6XaglrIfQ2fb3YppDCDOQsqlc+zzBmHRM1iIDxXUeow
-MohRxJR1XxYWIX8KSO8oRc434PDw5xi8S0xf49Cok3YTfKtlWdcJ20jktwlPzRPR
-fiJZCVlIJyI/zGzKQRTD9w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bscw.uamr.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bscw.uamr.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Uni Duisburg Essen (UAMR)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Uni Duisburg Essen (UAMR)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Malte</GivenName>
-    <SurName>Küppers</SurName>
-    <EmailAddress>malte.kueppers@stud.uni-due.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Malte</GivenName>
-    <SurName>Küppers</SurName>
-    <EmailAddress>malte.kueppers@stud.uni-due.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml b/swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml
deleted file mode 100644
index 13f811a3..00000000
--- a/swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bwescitts.uni-tuebingen.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bwescitts.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>bwescitts.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=hpcmaster@uni-tuebingen.de,CN=bwescitts.uni-tuebingen.de,OU=SSL,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlDCCBHygAwIBAgIED8FjUzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMTAwMzE4MDgzNTE1WhcNMTUwMzE3MDgzNTE1WjCBtTEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEMMAoGA1UECxMD
-U1NMMSMwIQYDVQQDExpid2VzY2l0dHMudW5pLXR1ZWJpbmdlbi5kZTEpMCcGCSqG
-SIb3DQEJARYaaHBjbWFzdGVyQHVuaS10dWViaW5nZW4uZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCtkZGQr4zWn6yZLwXADXQuhXOIFiKdIBMaIZS8
-jhWYfQ5YJ4u3TrSIVCqgtSI+Se8O5Vcktm7tzKvUVuxtsU90IikFJjGAbOstwhgq
-5LUBsP32zX6oTOV1+5g+ir1goNpMyLfZlp5i96kDhbDG/fTXsi9UG5r4doShbC7w
-ggj/3vwpp6agYo2GDf4txnYX/Ay9cW/QYRTvrIkYkUnGRKMxuGdBnPa41aKslKcl
-lg6DJda12VEb19hTsYMR3+o44SubP+ZFS6lBXLkCM2BqN2eWnk6cMvkDYoLjmR4a
-1z182QFwj2kaSMakIawP95CsZP1y4Ea2e9UGNXIbH5fBSRYTAgMBAAGjggHnMIIB
-4zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFMkk0UyyjuC6UU74BRcHFCDD3iCaMB8GA1UdIwQY
-MBaAFLDBu2g1f+LWQZwaca/g/EE0zcOoMCUGA1UdEQQeMByBGmhwY21hc3RlckB1
-bmktdHVlYmluZ2VuLmRlMIGTBgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDBCoECgPoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEF
-BQcwAoZAaHR0cDovL2NkcDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9w
-dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAppJJUoG17Dm4H1F5Z0f7Y28aE+NB/HRH
-TI4qAcHVZMOFTCSYLqUeYnvVEp/MtYv72XQzN2mx1kDOWweK+zbg5VkxXKXosQAQ
-X91FYgKI4oRWkbxY3YuGFszK0lHgW37Tjoe+PurI1pw/bwkDqeEqn7+23v+etGkw
-3kUxI6tP/tWI3M4bsqHNrwFbHX7R6vuiSPNbCx5rpV55hYTccifqhQsAZ30cQHJ6
-sXXqEoBe3Rpbg6xe7UbfV6dl64Hj84Fey6JuRBNFjNHukBcgXEpPAOz1ecGc52uf
-VZf15xEXQ/2afQt1WBD7zKs7Lj0+QD+M4zxIWRXLUoaqnvmiDtYsNg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>bwescitts.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=hpcmaster@uni-tuebingen.de,CN=bwescitts.uni-tuebingen.de,OU=SSL,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlDCCBHygAwIBAgIED8FjUzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMTAwMzE4MDgzNTE1WhcNMTUwMzE3MDgzNTE1WjCBtTEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEMMAoGA1UECxMD
-U1NMMSMwIQYDVQQDExpid2VzY2l0dHMudW5pLXR1ZWJpbmdlbi5kZTEpMCcGCSqG
-SIb3DQEJARYaaHBjbWFzdGVyQHVuaS10dWViaW5nZW4uZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCtkZGQr4zWn6yZLwXADXQuhXOIFiKdIBMaIZS8
-jhWYfQ5YJ4u3TrSIVCqgtSI+Se8O5Vcktm7tzKvUVuxtsU90IikFJjGAbOstwhgq
-5LUBsP32zX6oTOV1+5g+ir1goNpMyLfZlp5i96kDhbDG/fTXsi9UG5r4doShbC7w
-ggj/3vwpp6agYo2GDf4txnYX/Ay9cW/QYRTvrIkYkUnGRKMxuGdBnPa41aKslKcl
-lg6DJda12VEb19hTsYMR3+o44SubP+ZFS6lBXLkCM2BqN2eWnk6cMvkDYoLjmR4a
-1z182QFwj2kaSMakIawP95CsZP1y4Ea2e9UGNXIbH5fBSRYTAgMBAAGjggHnMIIB
-4zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFMkk0UyyjuC6UU74BRcHFCDD3iCaMB8GA1UdIwQY
-MBaAFLDBu2g1f+LWQZwaca/g/EE0zcOoMCUGA1UdEQQeMByBGmhwY21hc3RlckB1
-bmktdHVlYmluZ2VuLmRlMIGTBgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDBCoECgPoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEF
-BQcwAoZAaHR0cDovL2NkcDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9w
-dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAppJJUoG17Dm4H1F5Z0f7Y28aE+NB/HRH
-TI4qAcHVZMOFTCSYLqUeYnvVEp/MtYv72XQzN2mx1kDOWweK+zbg5VkxXKXosQAQ
-X91FYgKI4oRWkbxY3YuGFszK0lHgW37Tjoe+PurI1pw/bwkDqeEqn7+23v+etGkw
-3kUxI6tP/tWI3M4bsqHNrwFbHX7R6vuiSPNbCx5rpV55hYTccifqhQsAZ30cQHJ6
-sXXqEoBe3Rpbg6xe7UbfV6dl64Hj84Fey6JuRBNFjNHukBcgXEpPAOz1ecGc52uf
-VZf15xEXQ/2afQt1WBD7zKs7Lj0+QD+M4zxIWRXLUoaqnvmiDtYsNg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bwescitts.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bwescitts.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">bwescitts</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">BW-eSci(T)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.bwescit.uni-tuebingen.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Hahn</SurName>
-    <EmailAddress>ulrich.hahn@uni-tuebingen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifpi.edu.br.xml b/swamid-interfederations-2.0/cafe.ifpi.edu.br.xml
deleted file mode 100644
index dbf4a1a5..00000000
--- a/swamid-interfederations-2.0/cafe.ifpi.edu.br.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ifpi.edu.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ifpi.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFPI - Instituto Federal do Piaui</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFPI - Instituto Federal do Piaui</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFPI - Instituto Federal do Piaui</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifpi.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifpi.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKjAoBgNVBAoTIUlGUEkgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQaWF1aTE1MDMGA1UECxMsRFRJIC0gRGlyZXRv
-cmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYXRpY2ExETAPBgNVBAcTCFRlcmVz
-aW5hMQ4wDAYDVQQIEwVQaWF1aTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZwaS5lZHUuYnIwHhcNMTIwMzA4MTYyNTQyWhcNMTUwMzA4MTYyNTQyWjCBrjEq
-MCgGA1UEChMhSUZQSSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBpYXVpMTUwMwYD
-VQQLEyxEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hdGlj
-YTERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBpYXVpMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZnBpLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMQd7Bb3N4li2CCgKYw+KTPSXGW+YPzKJCu3hPc6ObQzb0CN
-tqnNEX3vA/tBZt7hS7XfCdOuwPvHA8ZdVFTlDx2mQu26KHXN20O2WittOtMiD7pe
-lPsa72/HVPLKUVxhkafhVL5MpJhv4oZf5uLPYVRhx4ZpoAjkXvIVu6eKXunJZ/hL
-qUymk3/Srt6kFLnX2UAEQQcxoLlXNKlUVwNPVjZf5UBRKMckpWCdvW3chSnSmUHg
-MI/ASJzp1Ob2Ef+xsAU5bzIFgaVnGUkaOrPzz3INjerXrtee/g0XZ1qSPEpX+31J
-to0UWMBUjTpF5L519WTOrPZB9NgFFrrE5epG/70CAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAHCfbOer/V7b9fUJ61tNCSRb/868nudvWDxy66/iBCUwvhXw9bDWszY0K
-OSP/8qI03Lvyt7/JqR2jqV15VBNrSCv5avGNE/sd/4cv3LGeqyoFTNudQPcrHVf+
-xuv71hJ0LHNzh1PDiklIYzcOzi/bJm3dd4DwxRA7uAqVLZzhi3XywQswgvDFZ1G1
-VnM8IFE6OfIb5b5EkQWQKMJ2i75/YL0Qqi7XUlLb8OYfoxi003HyM5QuJqynea8L
-DOPsk2WAnhI0wZtPxcZv6JKawH3m7/41wUm6EdGO0BPjAamRYFOmNyJthdlJxEDm
-2dFaz6UnNXlYSIMJ6HtpNFz/DQw1zA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifpi.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.ifpi.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifpi.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifpi.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifpi.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKjAoBgNVBAoTIUlGUEkgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQaWF1aTE1MDMGA1UECxMsRFRJIC0gRGlyZXRv
-cmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYXRpY2ExETAPBgNVBAcTCFRlcmVz
-aW5hMQ4wDAYDVQQIEwVQaWF1aTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZwaS5lZHUuYnIwHhcNMTIwMzA4MTYyNTQyWhcNMTUwMzA4MTYyNTQyWjCBrjEq
-MCgGA1UEChMhSUZQSSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBpYXVpMTUwMwYD
-VQQLEyxEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hdGlj
-YTERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBpYXVpMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZnBpLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMQd7Bb3N4li2CCgKYw+KTPSXGW+YPzKJCu3hPc6ObQzb0CN
-tqnNEX3vA/tBZt7hS7XfCdOuwPvHA8ZdVFTlDx2mQu26KHXN20O2WittOtMiD7pe
-lPsa72/HVPLKUVxhkafhVL5MpJhv4oZf5uLPYVRhx4ZpoAjkXvIVu6eKXunJZ/hL
-qUymk3/Srt6kFLnX2UAEQQcxoLlXNKlUVwNPVjZf5UBRKMckpWCdvW3chSnSmUHg
-MI/ASJzp1Ob2Ef+xsAU5bzIFgaVnGUkaOrPzz3INjerXrtee/g0XZ1qSPEpX+31J
-to0UWMBUjTpF5L519WTOrPZB9NgFFrrE5epG/70CAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAHCfbOer/V7b9fUJ61tNCSRb/868nudvWDxy66/iBCUwvhXw9bDWszY0K
-OSP/8qI03Lvyt7/JqR2jqV15VBNrSCv5avGNE/sd/4cv3LGeqyoFTNudQPcrHVf+
-xuv71hJ0LHNzh1PDiklIYzcOzi/bJm3dd4DwxRA7uAqVLZzhi3XywQswgvDFZ1G1
-VnM8IFE6OfIb5b5EkQWQKMJ2i75/YL0Qqi7XUlLb8OYfoxi003HyM5QuJqynea8L
-DOPsk2WAnhI0wZtPxcZv6JKawH3m7/41wUm6EdGO0BPjAamRYFOmNyJthdlJxEDm
-2dFaz6UnNXlYSIMJ6HtpNFz/DQw1zA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifpi.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IFPI - Instituto Federal do Piaui</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFPI - Instituto Federal do Piaui</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifpi.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifpi.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Manuel Goncalves da Silva Neto</SurName>
-    <EmailAddress>manuel@ifpi.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufpa.br.xml b/swamid-interfederations-2.0/cafe.ufpa.br.xml
deleted file mode 100644
index fe131fa5..00000000
--- a/swamid-interfederations-2.0/cafe.ufpa.br.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ufpa.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufpa.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFPA - Universidade Federal do Para</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFPA - Universidade Federal do Para</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFPA - Universidade Federal do Para</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFPA - Universidade Federal do Para</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufpa.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufpa.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDuzCCAqOgAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJCUjEN
-MAsGA1UECBMEUGFyYTEOMAwGA1UEBxMFQmVsZW0xDTALBgNVBAoTBFVGUEExDTAL
-BgNVBAsTBENUSUMxGjAYBgkqhkiG9w0BCQEWC2NzaUB1ZnBhLmJyMRUwEwYDVQQD
-EwxjYWZlLnVmcGEuYnIwHhcNMTAwNTI1MjAwOTA4WhcNMTMwNTI0MjAwOTA4WjB9
-MQswCQYDVQQGEwJCUjENMAsGA1UECBMEUGFyYTEOMAwGA1UEBxMFQmVsZW0xDTAL
-BgNVBAoTBFVGUEExDTALBgNVBAsTBENUSUMxGjAYBgkqhkiG9w0BCQEWC2NzaUB1
-ZnBhLmJyMRUwEwYDVQQDEwxjYWZlLnVmcGEuYnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC9YBhCGCvghJfWlbqNqPAes/VvzKs2G7FQMPeeI0rvzgn6
-Dzydwsexq07Cj1adg4lR80t/0lcQl2gfahCJMOlTcYMNvmeNhsxsq2VwsOI73mRm
-edlkjIPHPu8fpE69FV4nldafKWRSLfcVkWzMSB48BeM7NQQjC0MYwbaAfRSi49fq
-/cPo25kOXGI8a78fpTkCINthiC6fbicq9ztjNq8ni6WnNvde+zM+VKxgefk3OD+i
-8du9dAR2GzwPz7Qy547kUjen/6TrN1dYJt/sQ6+3MnEabD9YsMrlrg5zUoGuhYza
-ZRp9Ptjmo3OSUGCd6EIIAL89MJV9N2y1EFls2it5AgMBAAGjRjBEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsGAQUFBwMBBglghkgBhvhCBAEG
-CisGAQQBgjcKAwMwDQYJKoZIhvcNAQEFBQADggEBAKJiAYvrJHcBn0l4em/prU+H
-74Cq3j2bFUbDYzlDSFIJitxuysLDW2IMDkQm4lzv6XXM+wXfQ7BEgxRHJM4MrsKd
-BUPwRd6zlyOIrmBp3/zQZagepSdGijmypRksrlrzki0YaYOsFNPNmX4KLgpoLcoC
-h9qZiPsf7/HuY0rfH4qhQmX8p9hkG6Xfy5peHHH1isqW9sBRrnESYbOTnV0qqelc
-6Xt/cYiGF/IqlCoDef8Ckk4osN05i1GWtZBE7J5tzo/zlnmzoZw12AZeYT9fiX8M
-pvK4HkMxNpibdkH17SkgfEtHwfbcefaj3KDJHD+ZDP7tsupVBpfYQ4U5L5dzinI=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpa.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.ufpa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufpa.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufpa.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufpa.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufpa.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDuzCCAqOgAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJCUjEN
-MAsGA1UECBMEUGFyYTEOMAwGA1UEBxMFQmVsZW0xDTALBgNVBAoTBFVGUEExDTAL
-BgNVBAsTBENUSUMxGjAYBgkqhkiG9w0BCQEWC2NzaUB1ZnBhLmJyMRUwEwYDVQQD
-EwxjYWZlLnVmcGEuYnIwHhcNMTAwNTI1MjAwOTA4WhcNMTMwNTI0MjAwOTA4WjB9
-MQswCQYDVQQGEwJCUjENMAsGA1UECBMEUGFyYTEOMAwGA1UEBxMFQmVsZW0xDTAL
-BgNVBAoTBFVGUEExDTALBgNVBAsTBENUSUMxGjAYBgkqhkiG9w0BCQEWC2NzaUB1
-ZnBhLmJyMRUwEwYDVQQDEwxjYWZlLnVmcGEuYnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC9YBhCGCvghJfWlbqNqPAes/VvzKs2G7FQMPeeI0rvzgn6
-Dzydwsexq07Cj1adg4lR80t/0lcQl2gfahCJMOlTcYMNvmeNhsxsq2VwsOI73mRm
-edlkjIPHPu8fpE69FV4nldafKWRSLfcVkWzMSB48BeM7NQQjC0MYwbaAfRSi49fq
-/cPo25kOXGI8a78fpTkCINthiC6fbicq9ztjNq8ni6WnNvde+zM+VKxgefk3OD+i
-8du9dAR2GzwPz7Qy547kUjen/6TrN1dYJt/sQ6+3MnEabD9YsMrlrg5zUoGuhYza
-ZRp9Ptjmo3OSUGCd6EIIAL89MJV9N2y1EFls2it5AgMBAAGjRjBEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsGAQUFBwMBBglghkgBhvhCBAEG
-CisGAQQBgjcKAwMwDQYJKoZIhvcNAQEFBQADggEBAKJiAYvrJHcBn0l4em/prU+H
-74Cq3j2bFUbDYzlDSFIJitxuysLDW2IMDkQm4lzv6XXM+wXfQ7BEgxRHJM4MrsKd
-BUPwRd6zlyOIrmBp3/zQZagepSdGijmypRksrlrzki0YaYOsFNPNmX4KLgpoLcoC
-h9qZiPsf7/HuY0rfH4qhQmX8p9hkG6Xfy5peHHH1isqW9sBRrnESYbOTnV0qqelc
-6Xt/cYiGF/IqlCoDef8Ckk4osN05i1GWtZBE7J5tzo/zlnmzoZw12AZeYT9fiX8M
-pvK4HkMxNpibdkH17SkgfEtHwfbcefaj3KDJHD+ZDP7tsupVBpfYQ4U5L5dzinI=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpa.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UFPA - Universidade Federal do Para</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFPA - Universidade Federal do Para</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFPA - Universidade Federal do Para</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFPA - Universidade Federal do Para</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufpa.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufpa.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Hugo Pereira Kuribayashi</SurName>
-    <EmailAddress>hugok@ufpa.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/calipso.cpd.ufv.br.xml b/swamid-interfederations-2.0/calipso.cpd.ufv.br.xml
deleted file mode 100644
index ef456a01..00000000
--- a/swamid-interfederations-2.0/calipso.cpd.ufv.br.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://calipso.cpd.ufv.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufv.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFV - Universidade Federal de Vicosa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFV - Universidade Federal de Vicosa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFV - Universidade Federal de Vicosa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufv.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufv.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEfTCCA2WgAwIBAgIBADANBgkqhkiG9w0BAQUFADCB3TELMAkGA1UEBhMCQlIx
-FTATBgNVBAgTDE1pbmFzIEdlcmFpczEPMA0GA1UEBxMGVmljb3NhMS0wKwYDVQQK
-EyRVRlYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBWaWNvc2ExNDAyBgNVBAsT
-K0RUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xJDAi
-BgkqhkiG9w0BCQEWFXBvbGx5YW5uYS5tb3RhQHVmdi5icjEbMBkGA1UEAxMSY2Fs
-aXBzby5jcGQudWZ2LmJyMB4XDTEwMDQwODEyMjk0MFoXDTEzMDQwNzEyMjk0MFow
-gd0xCzAJBgNVBAYTAkJSMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxDzANBgNVBAcT
-BlZpY29zYTEtMCsGA1UEChMkVUZWIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUg
-Vmljb3NhMTQwMgYDVQQLEytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hY2FvMSQwIgYJKoZIhvcNAQkBFhVwb2xseWFubmEubW90YUB1ZnYu
-YnIxGzAZBgNVBAMTEmNhbGlwc28uY3BkLnVmdi5icjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMozVW2X3OMKcEQcp4RnGTFR2s6iSFoHvkVPjYkpWszZ
-+QfEV3GroXsLWv/RjJ+QtXhXfttFB0fNdiCWhxh2wbkeF2t1v21B+sCirnf+1qm6
-e0oetbRxK6k5O39pioOdEdUrMoN5s2WLoqMmK8ryqgb25GwLVolne9S4Wwyaocgp
-bDYjG11lZia7bEO03TsKPv7i5s4d2htD/wU+qkDT52H6aGI09L25bpwT+/aeUeIH
-Fvy750y5voXDaXx6MH9DrGslG7Dr9S/207uq0AxIrHaIgUbl6307tZhFbN32kBLT
-d/413Qb6H4RKsxwv+DLmy3UEa/c4UGeN7Vn7RDm5+/0CAwEAAaNGMEQwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBaAwKgYDVR0lBCMwIQYIKwYBBQUHAwEGCWCGSAGG+EIE
-AQYKKwYBBAGCNwoDAzANBgkqhkiG9w0BAQUFAAOCAQEAAzFQSYz2mWPl2z0fhnc8
-KfVtknNUnZFOzozeTD4UrmtTjRZo2O2BY6+9imoLcPtW3GH1fV7maZBk2QdHm1NN
-63yt1rqfMVplsCBbRpgSEBdIEHwUDmT3xGrFphhW84QGIh7dJuhdvaQ522C/YVyK
-zqppjlaUSZgqp4/jL8okZfDRgP+Sw3dBt0zJ+YpR60EQ7niv9mUKsJH4JXGcVtV+
-eTUY0S2J5SynJg4s5y9P2tMykzU/tA1pa+B1joFMAe37uKlKTiTWPJgSz/Q0/1bY
-ZEvbFOP1xLmtYXK8ipoyp3dauE5ls2QwIhanMz5A6SpPJYWO+9nLq7MQiSwfuvvJ
-1Q==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://calipso.cpd.ufv.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://calipso.cpd.ufv.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://calipso.cpd.ufv.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://calipso.cpd.ufv.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://calipso.cpd.ufv.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://calipso.cpd.ufv.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufv.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEfTCCA2WgAwIBAgIBADANBgkqhkiG9w0BAQUFADCB3TELMAkGA1UEBhMCQlIx
-FTATBgNVBAgTDE1pbmFzIEdlcmFpczEPMA0GA1UEBxMGVmljb3NhMS0wKwYDVQQK
-EyRVRlYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBWaWNvc2ExNDAyBgNVBAsT
-K0RUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xJDAi
-BgkqhkiG9w0BCQEWFXBvbGx5YW5uYS5tb3RhQHVmdi5icjEbMBkGA1UEAxMSY2Fs
-aXBzby5jcGQudWZ2LmJyMB4XDTEwMDQwODEyMjk0MFoXDTEzMDQwNzEyMjk0MFow
-gd0xCzAJBgNVBAYTAkJSMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxDzANBgNVBAcT
-BlZpY29zYTEtMCsGA1UEChMkVUZWIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUg
-Vmljb3NhMTQwMgYDVQQLEytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hY2FvMSQwIgYJKoZIhvcNAQkBFhVwb2xseWFubmEubW90YUB1ZnYu
-YnIxGzAZBgNVBAMTEmNhbGlwc28uY3BkLnVmdi5icjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMozVW2X3OMKcEQcp4RnGTFR2s6iSFoHvkVPjYkpWszZ
-+QfEV3GroXsLWv/RjJ+QtXhXfttFB0fNdiCWhxh2wbkeF2t1v21B+sCirnf+1qm6
-e0oetbRxK6k5O39pioOdEdUrMoN5s2WLoqMmK8ryqgb25GwLVolne9S4Wwyaocgp
-bDYjG11lZia7bEO03TsKPv7i5s4d2htD/wU+qkDT52H6aGI09L25bpwT+/aeUeIH
-Fvy750y5voXDaXx6MH9DrGslG7Dr9S/207uq0AxIrHaIgUbl6307tZhFbN32kBLT
-d/413Qb6H4RKsxwv+DLmy3UEa/c4UGeN7Vn7RDm5+/0CAwEAAaNGMEQwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBaAwKgYDVR0lBCMwIQYIKwYBBQUHAwEGCWCGSAGG+EIE
-AQYKKwYBBAGCNwoDAzANBgkqhkiG9w0BAQUFAAOCAQEAAzFQSYz2mWPl2z0fhnc8
-KfVtknNUnZFOzozeTD4UrmtTjRZo2O2BY6+9imoLcPtW3GH1fV7maZBk2QdHm1NN
-63yt1rqfMVplsCBbRpgSEBdIEHwUDmT3xGrFphhW84QGIh7dJuhdvaQ522C/YVyK
-zqppjlaUSZgqp4/jL8okZfDRgP+Sw3dBt0zJ+YpR60EQ7niv9mUKsJH4JXGcVtV+
-eTUY0S2J5SynJg4s5y9P2tMykzU/tA1pa+B1joFMAe37uKlKTiTWPJgSz/Q0/1bY
-ZEvbFOP1xLmtYXK8ipoyp3dauE5ls2QwIhanMz5A6SpPJYWO+9nLq7MQiSwfuvvJ
-1Q==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://calipso.cpd.ufv.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://calipso.cpd.ufv.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UFV - Universidade Federal de Vicosa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFV - Universidade Federal de Vicosa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufv.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufv.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Pollyanna Lopes Mota</SurName>
-    <EmailAddress>pollyanna.mota@ufv.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/caroa.univasf.edu.br.xml b/swamid-interfederations-2.0/caroa.univasf.edu.br.xml
deleted file mode 100644
index c3155e57..00000000
--- a/swamid-interfederations-2.0/caroa.univasf.edu.br.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://caroa.univasf.edu.br/shib-idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">univasf.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIVASF - Universidade Federal do Vale do Sao Francisco</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIVASF - Universidade Federal do Vale do Sao Francisco</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIVASF - Universidade Federal do Vale do Sao Francisco</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIVASF - Universidade Federal do Vale do Sao Francisco</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.univasf.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.univasf.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID+zCCAuOgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMCQlIx
-EzARBgNVBAgTClBlcm5hbWJ1Y28xEjAQBgNVBAcTCVBldHJvbGluYTEQMA4GA1UE
-ChMHVU5JVkFTRjEMMAoGA1UECxMDU1RJMSUwIwYJKoZIhvcNAQkBFhZzdXBvcnRl
-QHVuaXZhc2YuZWR1LmJyMR0wGwYDVQQDExRjYXJvYS51bml2YXNmLmVkdS5icjAe
-Fw0wOTEyMDcxOTE3NTdaFw0xMjEyMDYxOTE3NTdaMIGcMQswCQYDVQQGEwJCUjET
-MBEGA1UECBMKUGVybmFtYnVjbzESMBAGA1UEBxMJUGV0cm9saW5hMRAwDgYDVQQK
-EwdVTklWQVNGMQwwCgYDVQQLEwNTVEkxJTAjBgkqhkiG9w0BCQEWFnN1cG9ydGVA
-dW5pdmFzZi5lZHUuYnIxHTAbBgNVBAMTFGNhcm9hLnVuaXZhc2YuZWR1LmJyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyy0H78oLVsBhxHlOjMaTmhQJ
-J20jz1NVJVHNkNJtshASqIHf7nrC7iFIOQOCZgedMjKbiHWyQhkgmR2AuAnuq94g
-FHJoDqdliVFegU+OZotWHYjYVLW2Dx3TF71cvqhy5PtdmOLWi2LcK08eD719fNUr
-tAFbNaCqPrfApR3IriWZ9f7U23I1WQ6wqEFimGgHKUOzZX1DbDyfF0NFhoE8ZT3E
-LWxS8OQfLOahad/I4Ji+an1g8CzKoHoGp8urWAH1VO9nGFjXMbY3GDEg6LANHhqm
-2/B8ynWkDnr2YkSGsxI7OYBZbJzHxNUSPIvKmeDvn2lTGsd0EpoSSFgQ1QlqkwID
-AQABo0YwRDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEF
-BQcDAQYJYIZIAYb4QgQBBgorBgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUAA4IBAQAp
-PbOkc0TkHCPHyeBj0r9GqOM8P2jphq42z2OL3cAvJ5ra5rvm2zDuvcfDz8BU44q6
-fHM6xzLawmj7PraoROgfSuYB9ominhB9uCC9ivyoDWzJA48zXRzwJSs6m1hxHYu/
-hI6jqYydmbfjl9nGa0SzRu807eCObVnhaTT39oLOBTn5e2j2cLzO65Rm3L5P+X7B
-1ZHQFg7EdDGYdpL73EmXCln354Qn/KYExoxpBJ7jSx+zSUD82MJGN4pC6/W0pqsd
-sJ50WLdnA+GPrvR2ExHYz/AG7jEyiyp3xRYm6yYQ/zXXKykKJOMnoPEwDOLEfgJ5
-C4ItBKZG311DVPXkz7r2
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://caroa.univasf.edu.br:8443/shibboleth-idp/AA" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://caroa.univasf.edu.br/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">univasf.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID+zCCAuOgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMCQlIx
-EzARBgNVBAgTClBlcm5hbWJ1Y28xEjAQBgNVBAcTCVBldHJvbGluYTEQMA4GA1UE
-ChMHVU5JVkFTRjEMMAoGA1UECxMDU1RJMSUwIwYJKoZIhvcNAQkBFhZzdXBvcnRl
-QHVuaXZhc2YuZWR1LmJyMR0wGwYDVQQDExRjYXJvYS51bml2YXNmLmVkdS5icjAe
-Fw0wOTEyMDcxOTE3NTdaFw0xMjEyMDYxOTE3NTdaMIGcMQswCQYDVQQGEwJCUjET
-MBEGA1UECBMKUGVybmFtYnVjbzESMBAGA1UEBxMJUGV0cm9saW5hMRAwDgYDVQQK
-EwdVTklWQVNGMQwwCgYDVQQLEwNTVEkxJTAjBgkqhkiG9w0BCQEWFnN1cG9ydGVA
-dW5pdmFzZi5lZHUuYnIxHTAbBgNVBAMTFGNhcm9hLnVuaXZhc2YuZWR1LmJyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyy0H78oLVsBhxHlOjMaTmhQJ
-J20jz1NVJVHNkNJtshASqIHf7nrC7iFIOQOCZgedMjKbiHWyQhkgmR2AuAnuq94g
-FHJoDqdliVFegU+OZotWHYjYVLW2Dx3TF71cvqhy5PtdmOLWi2LcK08eD719fNUr
-tAFbNaCqPrfApR3IriWZ9f7U23I1WQ6wqEFimGgHKUOzZX1DbDyfF0NFhoE8ZT3E
-LWxS8OQfLOahad/I4Ji+an1g8CzKoHoGp8urWAH1VO9nGFjXMbY3GDEg6LANHhqm
-2/B8ynWkDnr2YkSGsxI7OYBZbJzHxNUSPIvKmeDvn2lTGsd0EpoSSFgQ1QlqkwID
-AQABo0YwRDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEF
-BQcDAQYJYIZIAYb4QgQBBgorBgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUAA4IBAQAp
-PbOkc0TkHCPHyeBj0r9GqOM8P2jphq42z2OL3cAvJ5ra5rvm2zDuvcfDz8BU44q6
-fHM6xzLawmj7PraoROgfSuYB9ominhB9uCC9ivyoDWzJA48zXRzwJSs6m1hxHYu/
-hI6jqYydmbfjl9nGa0SzRu807eCObVnhaTT39oLOBTn5e2j2cLzO65Rm3L5P+X7B
-1ZHQFg7EdDGYdpL73EmXCln354Qn/KYExoxpBJ7jSx+zSUD82MJGN4pC6/W0pqsd
-sJ50WLdnA+GPrvR2ExHYz/AG7jEyiyp3xRYm6yYQ/zXXKykKJOMnoPEwDOLEfgJ5
-C4ItBKZG311DVPXkz7r2
-      
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://caroa.univasf.edu.br:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UFVASF - Universidade Federal do Vale do Sao Francisco</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFVASF - Universidade Federal do Vale do Sao Francisco</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIVASF - Universidade Federal do Vale do Sao Francisco</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIVASF - Universidade Federal do Vale do Sao Francisco</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.univasf.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.univasf.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Augusto Silva</SurName>
-    <EmailAddress>augusto.silva@univasf.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml b/swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml
deleted file mode 100644
index fb604cd5..00000000
--- a/swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cast.itunes.uni-muenchen.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>cast.itunes.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cast.itunes.uni-muenchen.de,OU=Referat VIII.3,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFhDCCBGygAwIBAgIHEm356fe7iTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNV
-BAoTKEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzAN
-BgNVBAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMTA4
-MTkxNTA4MTBaFw0xMzA4MTkwMDAwMDBaMIGjMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1h
-eGltaWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEXMBUGA1UECxMOUmVmZXJh
-dCBWSUlJLjMxJDAiBgNVBAMTG2Nhc3QuaXR1bmVzLnVuaS1tdWVuY2hlbi5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANkKKI+QjsVnkBkAC+Khql9V
-Xdf5iLhYVCTLT8ICuRLrWOg9eUkXKbp/7SIzkzNEfxB5dkjq8wtXNPKBfqfc7eWP
-5utGfvAbdvJlw8Hru9DV5nyDxSmCeq1yksie3tkDNgAdvgs/YftQT0i4cySpzahF
-8yO5tgdC6qVYhtzfIMD7w4Z6SQH8QxOZuVyeM2eohN7+6rOOhViMOgPWqnQ81Wuc
-OsJcoSyDxBYMZQG7ixglZ2kc//D/X8gtXQv7AlviSeCA4B4gBlVO6/Ta+XB97JVw
-8iYykLnrUWEdHXkGk15hU9v7BmFdtTzFVZ9m4IcL3Y/y0kc7t7ex1LowfTYF9/8C
-AwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUaolcaSN6Mu5zvVM+zofMH3fi
-f9YwHwYDVR0jBBgwFoAUeYd4ai/6m7wjT5Smo3cdHg6UgA8wGgYDVR0RBBMwEYEP
-YS5ydWJuZXJAbG11LmRlMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD6g
-PKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYBBQUHMAKGPGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB19U7nhkGWOsZ4wiw21O9zVyuSaF9BUqynXtshhiXlGju8qx4EESSJ
-ayMWVLd/+T4+vUe8VbZ50y1rQ/zttR9FDFsXVgCuvgpx2CS2XCVvkOmvGl1M/PJ3
-vbMO/rdncLMBLpDANofUBPq9TpSC72xHKyuB1ii+dkjExIC/mzlclVLf2LggbHYj
-qgGaXbtqtNrtxwlqzdeYDeyTJawayF+1Bjvx1tnYjG92Tq7E25v84v49XE4vmHsn
-DUbb5s+ffOJfHDzKm875lEOVubzCW4Pi0dOstdK8EL//RGPjEJOzaJMZJ3JQEMQU
-Pvw71CodYST2ZIkQ7RBGrfzLIg1m3C1h
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>cast.itunes.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cast.itunes.uni-muenchen.de,OU=Referat VIII.3,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFhDCCBGygAwIBAgIHEm356fe7iTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNV
-BAoTKEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzAN
-BgNVBAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMTA4
-MTkxNTA4MTBaFw0xMzA4MTkwMDAwMDBaMIGjMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1h
-eGltaWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEXMBUGA1UECxMOUmVmZXJh
-dCBWSUlJLjMxJDAiBgNVBAMTG2Nhc3QuaXR1bmVzLnVuaS1tdWVuY2hlbi5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANkKKI+QjsVnkBkAC+Khql9V
-Xdf5iLhYVCTLT8ICuRLrWOg9eUkXKbp/7SIzkzNEfxB5dkjq8wtXNPKBfqfc7eWP
-5utGfvAbdvJlw8Hru9DV5nyDxSmCeq1yksie3tkDNgAdvgs/YftQT0i4cySpzahF
-8yO5tgdC6qVYhtzfIMD7w4Z6SQH8QxOZuVyeM2eohN7+6rOOhViMOgPWqnQ81Wuc
-OsJcoSyDxBYMZQG7ixglZ2kc//D/X8gtXQv7AlviSeCA4B4gBlVO6/Ta+XB97JVw
-8iYykLnrUWEdHXkGk15hU9v7BmFdtTzFVZ9m4IcL3Y/y0kc7t7ex1LowfTYF9/8C
-AwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUaolcaSN6Mu5zvVM+zofMH3fi
-f9YwHwYDVR0jBBgwFoAUeYd4ai/6m7wjT5Smo3cdHg6UgA8wGgYDVR0RBBMwEYEP
-YS5ydWJuZXJAbG11LmRlMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD6g
-PKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYBBQUHMAKGPGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB19U7nhkGWOsZ4wiw21O9zVyuSaF9BUqynXtshhiXlGju8qx4EESSJ
-ayMWVLd/+T4+vUe8VbZ50y1rQ/zttR9FDFsXVgCuvgpx2CS2XCVvkOmvGl1M/PJ3
-vbMO/rdncLMBLpDANofUBPq9TpSC72xHKyuB1ii+dkjExIC/mzlclVLf2LggbHYj
-qgGaXbtqtNrtxwlqzdeYDeyTJawayF+1Bjvx1tnYjG92Tq7E25v84v49XE4vmHsn
-DUbb5s+ffOJfHDzKm875lEOVubzCW4Pi0dOstdK8EL//RGPjEJOzaJMZJ3JQEMQU
-Pvw71CodYST2ZIkQ7RBGrfzLIg1m3C1h
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cast.itunes.lmu.de/Shibboleth.sso/SAML2/POST" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">LMUcast für iTunesU</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">LMUcast für iTunesU</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://cast.itunes.uni-muenchen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Armin</GivenName>
-    <SurName>Rubner</SurName>
-    <EmailAddress>a.rubner@lmu.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Fabio</GivenName>
-    <SurName>Vena</SurName>
-    <EmailAddress>fabio.vena@vilea.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cnb.rediris.es.xml b/swamid-interfederations-2.0/cnb.rediris.es.xml
deleted file mode 100644
index bd0f805f..00000000
--- a/swamid-interfederations-2.0/cnb.rediris.es.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://cnb.rediris.es/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNB RedIRIS Test IDP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">CNB RedIRIS Test IDP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Another test IdP run by RedIRIS</mdui:Description>
-        <mdui:Description xml:lang="es">Otro IdP de pruebas operado por RedIRIS</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEpzCCA4+gAwIBAgIJAKu9NNxZYzTvMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1p
-ZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzMB4XDTExMDYwODA5MTAwMVoXDTIxMDYwNzA5MTAwMVowgZMxCzAJBgNVBAYTAkVTMQ8wDQYDVQQIEwZNYWRyaWQxDzANBgNVBA
-cTBk1hZHJpZDEQMA4GA1UEChMHUmVkSVJJUzETMBEGA1UECxMKTWlkZGxld2FyZTEbMBkGA1UEAxMSZWR1Z2Fpbi5yZWRpcmlzLmVzMR4wHAYJKoZIhvcNAQkBFg9zaXJpQHJlZGlyaXMuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI
-aZm1UV2iTIb326tmnsaekltjP+5M9MoIUiLxIWOfLk6xK5+UeGnRlpSbVyIUS1afgRWprqAJ33iDimXBYnzWYKeM+DHktiAvTl9l6kh987g/rUCo6rZ0MrCdOu8GKqGmZNGo4/SNjRAFiMHj8CdM4N/e/5GCHDvS6YdsptoSHoanL5oYYx6nJUKXph8HLO
-3Sr/i/K9qIXek81X/zIsDNAkLj5wZeDt+TosoIOHzwUIpRrHVnvO/7Piu30ozu3fGOqRfHJIHDzJaNZCDBkzkkYCWD+39oVsbIwH4xSGhSsm5JuzCCL5QTzwbaJiUA/EfgV1Zzvv4bQjJmbBooHh8JAgMBAAGjgfswgfgwHQYDVR0OBBYEFKcD1MJGTvTW
-HgotuF7InFEAxve4MIHIBgNVHSMEgcAwgb2AFKcD1MJGTvTWHgotuF7InFEAxve4oYGZpIGWMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcm
-UxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzggkAq7003FljNO8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYBRPKs5uhS4H6U8CHfYnZvz30s/64YoJlx688mZEfDKiYD2f
-cIeMaQ3b5ps9DAJlvc4Wx+2xrTrNfGqW7FVVJrL9ezRLUJox98fBlxB06de1K3J6fgqLKjKbcR5i1NjkFZYTBSs8Vn32SQoW36r9Yus5bO1XORUeEJAK3E4CWiEvqjE745PERA79V84JSWMqojqY5d66hJoGz0PvgP0TD7J+f+AH+Ot/vrJ21w8od/wob+
-MUM7mQMtsSb2Dbo1+XGLEIixU5ypiSl3vw/HNvUrIWzVD/eKvQyNbzWJu5/BIlwpqHoQXPkZFzap6KZFnYz747AG0EmZYL9xQR59Mk0w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEpzCCA4+gAwIBAgIJAKu9NNxZYzTvMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1p
-ZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzMB4XDTExMDYwODA5MTAwMVoXDTIxMDYwNzA5MTAwMVowgZMxCzAJBgNVBAYTAkVTMQ8wDQYDVQQIEwZNYWRyaWQxDzANBgNVBA
-cTBk1hZHJpZDEQMA4GA1UEChMHUmVkSVJJUzETMBEGA1UECxMKTWlkZGxld2FyZTEbMBkGA1UEAxMSZWR1Z2Fpbi5yZWRpcmlzLmVzMR4wHAYJKoZIhvcNAQkBFg9zaXJpQHJlZGlyaXMuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI
-aZm1UV2iTIb326tmnsaekltjP+5M9MoIUiLxIWOfLk6xK5+UeGnRlpSbVyIUS1afgRWprqAJ33iDimXBYnzWYKeM+DHktiAvTl9l6kh987g/rUCo6rZ0MrCdOu8GKqGmZNGo4/SNjRAFiMHj8CdM4N/e/5GCHDvS6YdsptoSHoanL5oYYx6nJUKXph8HLO
-3Sr/i/K9qIXek81X/zIsDNAkLj5wZeDt+TosoIOHzwUIpRrHVnvO/7Piu30ozu3fGOqRfHJIHDzJaNZCDBkzkkYCWD+39oVsbIwH4xSGhSsm5JuzCCL5QTzwbaJiUA/EfgV1Zzvv4bQjJmbBooHh8JAgMBAAGjgfswgfgwHQYDVR0OBBYEFKcD1MJGTvTW
-HgotuF7InFEAxve4MIHIBgNVHSMEgcAwgb2AFKcD1MJGTvTWHgotuF7InFEAxve4oYGZpIGWMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcm
-UxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzggkAq7003FljNO8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYBRPKs5uhS4H6U8CHfYnZvz30s/64YoJlx688mZEfDKiYD2f
-cIeMaQ3b5ps9DAJlvc4Wx+2xrTrNfGqW7FVVJrL9ezRLUJox98fBlxB06de1K3J6fgqLKjKbcR5i1NjkFZYTBSs8Vn32SQoW36r9Yus5bO1XORUeEJAK3E4CWiEvqjE745PERA79V84JSWMqojqY5d66hJoGz0PvgP0TD7J+f+AH+Ot/vrJ21w8od/wob+
-MUM7mQMtsSb2Dbo1+XGLEIixU5ypiSl3vw/HNvUrIWzVD/eKvQyNbzWJu5/BIlwpqHoQXPkZFzap6KZFnYz747AG0EmZYL9xQR59Mk0w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cnb.rediris.es/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cnb.rediris.es/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RedIRIS</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">RedIRIS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SIR helpdesk</md:GivenName>
-    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connect-beta.sunet.se.xml b/swamid-interfederations-2.0/connect-beta.sunet.se.xml
new file mode 100644
index 00000000..871b5ee3
--- /dev/null
+++ b/swamid-interfederations-2.0/connect-beta.sunet.se.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-beta.sunet.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/kalmar2" index="3"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/nordu.net" index="4"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect8.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect8.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJALtpdDetd0+aMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWNvbm5lY3Q4LnN1bmV0LnNlMB4XDTExMDMxODA5MTkxNFoXDTIxMDMxNTA5
+MTkxNFowHDEaMBgGA1UEAxMRY29ubmVjdDguc3VuZXQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQD1d3qbbBDMHcxOLMlEzLthit/PclHFQUivQjdl
+i/iWPBDdTXODRZfYzTcq+B+venAaDJBt99/UF0l+Zept5F/0U8dPmlKXNOHkQtCM
+fP56ssnuMNt56rgUMC7Bkvi0JBsschjzqXzELSn9zw5DO0gj7YU1GGJaYp4abBYg
+LHs403i9Dga6qZvma1nfuBfoSBNcfNPKDfL+LN1KhSyZDrwfupiVXzt4WCm4/B+7
+ypEZw66WK5VCXMJJ8nrzbcP0SV+W36qfkz1Vu1799c0msygmb5bfvlZbVvaH5bXR
+P67w5IWiOZNiJ4KP9SsNKT2u2SSJgFwBhs2m+AghWHW6+rcRAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEWNvbm5lY3Q4LnN1bmV0LnNlMB0GA1UdDgQWBBQnXN19r3XLQq+Z
+DWdMGahYti/oYzANBgkqhkiG9w0BAQUFAAOCAQEAMSB60ydAbZlRUOtKEvqoXu9q
+LQ6RD2PbX8BcB494lEANUftFBUPlH6Bssn+uuu+/OTDe0H4rrehGCzoLjziftfQh
+0/a5kfOp8Ws4CY0xEZdm+q0iIl+JTQQbR4AKsVK+2mGquHakkUnCg6fuS1XTsmex
+jDjaYIEYYx7XISnQY/01ZH0oOGCvJAVpW0cEtQzpXmi6a8UOm7xhg0FB0lk4z9v1
+8Yv3mZx1PhYzmXDUVEIfQta/+0SctZ978aj4Y7emDgL1QMdETPyN9OlC3XGNtSYI
+FV4q3nujmHDfDpzbO4vsmaumdoScXaR4CoL/mO9XM7dxx/0k8kMkde1eA1mZWQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect8.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect8.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJALtpdDetd0+aMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWNvbm5lY3Q4LnN1bmV0LnNlMB4XDTExMDMxODA5MTkxNFoXDTIxMDMxNTA5
+MTkxNFowHDEaMBgGA1UEAxMRY29ubmVjdDguc3VuZXQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQD1d3qbbBDMHcxOLMlEzLthit/PclHFQUivQjdl
+i/iWPBDdTXODRZfYzTcq+B+venAaDJBt99/UF0l+Zept5F/0U8dPmlKXNOHkQtCM
+fP56ssnuMNt56rgUMC7Bkvi0JBsschjzqXzELSn9zw5DO0gj7YU1GGJaYp4abBYg
+LHs403i9Dga6qZvma1nfuBfoSBNcfNPKDfL+LN1KhSyZDrwfupiVXzt4WCm4/B+7
+ypEZw66WK5VCXMJJ8nrzbcP0SV+W36qfkz1Vu1799c0msygmb5bfvlZbVvaH5bXR
+P67w5IWiOZNiJ4KP9SsNKT2u2SSJgFwBhs2m+AghWHW6+rcRAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEWNvbm5lY3Q4LnN1bmV0LnNlMB0GA1UdDgQWBBQnXN19r3XLQq+Z
+DWdMGahYti/oYzANBgkqhkiG9w0BAQUFAAOCAQEAMSB60ydAbZlRUOtKEvqoXu9q
+LQ6RD2PbX8BcB494lEANUftFBUPlH6Bssn+uuu+/OTDe0H4rrehGCzoLjziftfQh
+0/a5kfOp8Ws4CY0xEZdm+q0iIl+JTQQbR4AKsVK+2mGquHakkUnCg6fuS1XTsmex
+jDjaYIEYYx7XISnQY/01ZH0oOGCvJAVpW0cEtQzpXmi6a8UOm7xhg0FB0lk4z9v1
+8Yv3mZx1PhYzmXDUVEIfQta/+0SctZ978aj4Y7emDgL1QMdETPyN9OlC3XGNtSYI
+FV4q3nujmHDfDpzbO4vsmaumdoScXaR4CoL/mO9XM7dxx/0k8kMkde1eA1mZWQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-beta.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" 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"/>
+      <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"/>
+      <md:RequestedAttribute 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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connect.tut.fi.xml b/swamid-interfederations-2.0/connect.tut.fi.xml
deleted file mode 100644
index e3db269a..00000000
--- a/swamid-interfederations-2.0/connect.tut.fi.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:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://connect.tut.fi/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 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://ao4.ee.tut.fi/Shibboleth.sso/DS" index="1"/>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE5zCCA8+gAwIBAgIQTC0sMFTDx+8bItkWKEE8EjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDYwODAwMDAwMFoXDTEzMDYwNzIzNTk1OVowgcQxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUzMzcyMDESMBAGA1UECBMJUGlya2FubWFhMRAwDgYD
-VQQHEwdUYW1wZXJlMRwwGgYDVQQJExNLb3JrZWFrb3VsdW5rYXR1IDEwMSkwJwYD
-VQQKEyBUYW1wZXJlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neTEeMBwGA1UECxMV
-SHlwZXJtZWRpYSBMYWJvcmF0b3J5MRYwFAYDVQQDEw1hbzQuZWUudHV0LmZpMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+q6HSeOwJOL+dhw2C6rmt+X
-XOC17rS4cqw/GK/MdcEB6OUGGnP7CVnMTt5i7kYRTE2xZZ4puXgunZc4djROOl5U
-9GpKJr1+PrBJ4bhZvJuuP+NGmk36dhPDelgGrl2g2t5Fdqm5gxLU7JBhDQcttbiQ
-Im4KCUD4RaYkVnt5LRb2XZ5rrfyNjphSr06HopVy77k3H0sd7uPlPg3fj1u6h3GB
-Uwd+/Gdle78H5VF75+uhPZvmI9IjRT8i0I0hIDTXrnKKM+hmYg/OZteb/eSxTdfD
-cAsm0hfk4C4+i7FeR2ODlY0kegMZEfFLFAxRH950TP2IfRhl7aFHbggQ9zB6XwID
-AQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
-VR0OBBYEFD7dPRIPwNod9MvHsOo3Ryx8sENGMA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
-ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
-BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgG
-A1UdEQQRMA+CDWFvNC5lZS50dXQuZmkwDQYJKoZIhvcNAQEFBQADggEBAC58dIBC
-vOyd04SLE1l+7yZ3ARTE+enLAEDGJzvvjlKG8MdsC/TfDimtTMOXQnNXbnfEzKwj
-Zagmu/FRdhkVTQP48354C/hnAl1/Wyfjab8O9LeC6+pfAyY2mWzrb4kfRBm1KE26
-B2nURaYtDmZ+MJmjCyLQGaNMZz1q+eSyluTMMUven1FPVVPGlOGqUnPwOQUOvuVS
-vUyXrqyYfbSpfBsog9tVyW2KwzKvVCFeQ9pbUaxfsWD8qIeeKI17FzHVJEBtg23r
-z+mEW/8SvYpmYBk5YhfB1rTXQahEGyw8XP+kmmsb5h5d5yHgUXtEpEsBI4ORxMu1
-YUyAsGo8rZZF7VE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Acrobat Connect Pro -verkkokokouspalvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">TUT Acrobat Connect Pro</md:ServiceName>
-      <md:ServiceName xml:lang="sv">TUT Acrobat Connect Pro</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">TTY:n verkkokokouspalvelu.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">TUT web conference service.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">TUT-tjansten for e-moten.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <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"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Pasi</md:GivenName>
-    <md:SurName>Hakkinen</md:SurName>
-    <md:EmailAddress>pasi.hakkinen@tut.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/content.karger.com.xml b/swamid-interfederations-2.0/content.karger.com.xml
deleted file mode 100644
index 2e9f9e0b..00000000
--- a/swamid-interfederations-2.0/content.karger.com.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://content.karger.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://content.karger.com/Shibboleth.sso/dfn-aai" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>content.karger.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=content.karger.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJqIrhKoAuA2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmNvbnRlbnQua2FyZ2VyLmNvbTAeFw0xMTEyMTMxNTIzMjhaFw0xNDEyMTIx
-NTIzMjhaMB0xGzAZBgNVBAMTEmNvbnRlbnQua2FyZ2VyLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMWoqbxw2EVKI6zdsWvRrt6lFc4H6Xn7qPVl
-PTJBHRFsewTcMDocAMr78ljeLveG5QgWV3lF2i+sLU7bL7XySIrsdrOKzIxTj9Cx
-9pMJKr1xW4ejaPSEWk7wR3FERed12gud5LZRkfbGhvzuwWVUbei6kcU0f4oridKn
-12eoOs5BEP2ykLHlHaAw16px435bPIbn79lYbpihoQZ8CRB8i8DEJC1ujJPV7szG
-yyPW6JfrT/jfKDoIfCAnfJt+THnqOejeoDVn9GOdUIJ3x2VCvq1isGoMVaawZMPd
-xuIIjGygV4aY/RRUZ/DOcTznqxnsJGObeJzFQ0PWN3enG8PXNa0CAwEAAaNnMGUw
-RAYDVR0RBD0wO4ISY29udGVudC5rYXJnZXIuY29thiVodHRwczovL2NvbnRlbnQu
-a2FyZ2VyLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBQRmb2gz9MBXN6Fo1btt08+
-BLsTVzANBgkqhkiG9w0BAQUFAAOCAQEAvY725FGb+4wXvpaiY3w9SKAXH3dJ3fZX
-IsONdJIDT4siX5lnSUOOnYPF9dvCNsL60lNThYSsX3lXHjCa37vejRj2Na5mLhak
-oaIHKbtb95uebjarm8A6YL532uxa8leGgn1fb7NlNdgKvxRliZ5nXcsElJNLKtuA
-NGIJXAAIodGbw3gN+le+8SW5UGBtretdER/JptLWGHqdtIJWeWPr0GcF+nV5Nh4p
-CRiJhhqRHdZdveYuALat3eUxEc8y9vryKwTOB6E330mkgWTowuBk8nc2P1tDqIM5
-3YRlMh3fvJvSVLyg8vpd0Ma5RKdOoJt9poNAsOYMl7OpwyI3yOWdYg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>content.karger.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=content.karger.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJqIrhKoAuA2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmNvbnRlbnQua2FyZ2VyLmNvbTAeFw0xMTEyMTMxNTIzMjhaFw0xNDEyMTIx
-NTIzMjhaMB0xGzAZBgNVBAMTEmNvbnRlbnQua2FyZ2VyLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMWoqbxw2EVKI6zdsWvRrt6lFc4H6Xn7qPVl
-PTJBHRFsewTcMDocAMr78ljeLveG5QgWV3lF2i+sLU7bL7XySIrsdrOKzIxTj9Cx
-9pMJKr1xW4ejaPSEWk7wR3FERed12gud5LZRkfbGhvzuwWVUbei6kcU0f4oridKn
-12eoOs5BEP2ykLHlHaAw16px435bPIbn79lYbpihoQZ8CRB8i8DEJC1ujJPV7szG
-yyPW6JfrT/jfKDoIfCAnfJt+THnqOejeoDVn9GOdUIJ3x2VCvq1isGoMVaawZMPd
-xuIIjGygV4aY/RRUZ/DOcTznqxnsJGObeJzFQ0PWN3enG8PXNa0CAwEAAaNnMGUw
-RAYDVR0RBD0wO4ISY29udGVudC5rYXJnZXIuY29thiVodHRwczovL2NvbnRlbnQu
-a2FyZ2VyLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBQRmb2gz9MBXN6Fo1btt08+
-BLsTVzANBgkqhkiG9w0BAQUFAAOCAQEAvY725FGb+4wXvpaiY3w9SKAXH3dJ3fZX
-IsONdJIDT4siX5lnSUOOnYPF9dvCNsL60lNThYSsX3lXHjCa37vejRj2Na5mLhak
-oaIHKbtb95uebjarm8A6YL532uxa8leGgn1fb7NlNdgKvxRliZ5nXcsElJNLKtuA
-NGIJXAAIodGbw3gN+le+8SW5UGBtretdER/JptLWGHqdtIJWeWPr0GcF+nV5Nh4p
-CRiJhhqRHdZdveYuALat3eUxEc8y9vryKwTOB6E330mkgWTowuBk8nc2P1tDqIM5
-3YRlMh3fvJvSVLyg8vpd0Ma5RKdOoJt9poNAsOYMl7OpwyI3yOWdYg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.karger.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.karger.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.karger.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.karger.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.karger.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.karger.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.karger.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.karger.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.karger.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://content.karger.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.karger.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://content.karger.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://content.karger.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://content.karger.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">S.Karger</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Karger Publishers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://content.karger.com/PrudukteDB</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Mike</GivenName>
-    <SurName>Dürst</SurName>
-    <EmailAddress>m.duerst@karger.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Dürst</SurName>
-    <EmailAddress>m.duerst@karger.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml b/swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml
deleted file mode 100644
index be6882ac..00000000
--- a/swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crux.hrz.tu-freiberg.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-freiberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
-ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
-LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
-MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
-MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
-ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
-MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
-Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
-N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
-XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
-1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
-q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
-FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
-ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
-zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
-LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
-HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
-7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
-2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
-ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
-LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
-MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
-MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
-ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
-MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
-Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
-N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
-XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
-1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
-q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
-FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
-ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
-zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
-LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
-HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
-7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
-2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://crux.hrz.tu-freiberg.de:8443/shibboleth-idp/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://crux.hrz.tu-freiberg.de/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-freiberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
-ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
-LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
-MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
-MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
-ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
-MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
-Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
-N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
-XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
-1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
-q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
-FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
-ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
-zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
-LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
-HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
-7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
-2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
-ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
-LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
-MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
-MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
-ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
-MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
-Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
-N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
-XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
-1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
-q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
-FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
-ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
-zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
-LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
-HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
-7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
-2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://crux.hrz.tu-freiberg.de:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiberg (Technische Universität Bergakademie)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">TU Bergakademie Freiberg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-freiberg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Martin</GivenName>
-    <SurName>Morgenstern</SurName>
-    <EmailAddress>martin.morgenstern@hrz.tu-freiberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Morgenstern</SurName>
-    <EmailAddress>martin.morgenstern@hrz.tu-freiberg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/db.saur.de.xml b/swamid-interfederations-2.0/db.saur.de.xml
deleted file mode 100644
index 66ca6257..00000000
--- a/swamid-interfederations-2.0/db.saur.de.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://db.saur.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>db.saur.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=db.saur.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEDQl1fDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wODEwMDYxMTM1MDlaFw0xMzEw
-MDUxMTM1MDlaMEkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRMwEQYDVQQDEwpkYi5zYXVyLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/zjBXS8HerZKLm9TLGucOB5e3nBWmKtWvDX
-06WkrE7xvj+iDV/VcrK1vpP1wabRVy5e2rGAr66CyPhaOc7sFiZmlNGaS01f8j/9
-O50FM1DJVZqPCMzuMfjK+m22oZMegAoIiMFKPaCwXcRr8NJDnuHaK4WbAYkoQtDh
-jZmhZcSZT0W6k5NimszZg4azEOENiqlIGJ1LwQtGt0BMNUNT+p+PJkHRVuIftWLX
-bciCl7tavmpuOq0BVFz/uUD8yS+dAsqrvBmmcGaAHkvNpTqy0v1o56uk9o2i5zUb
-o+l4XGSulrwqsF0ytQWEDWZFYDtrkD8WDhhOn5ojTMbxTYb3VwIDAQABo4IB6TCC
-AeUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBRj3P6kfMQ1adyDpCzs3AP+TCfHADAfBgNVHSME
-GDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zArBgNVHREEJDAigSBiZW5lZGljdC5y
-aXBwZXJnZXJAZGVncnV5dGVyLmNvbTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vy
-dmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsG
-CCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNl
-cy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN+q0DlBL1Z9sKD3QHlik5C3/fSRe
-/xi/aaFWmLy20IL/jMEoCB6+Zvg42kkVIDfP5MgWbkFjMVKhz8AHrE4Cvnm2uwHS
-QiM2ZeOXcIYEM6HrX2NsE0e2ihpKy5KUYzsJGJPM+PVYB5hyTYzgvRHyKmlqI/Qm
-Lxl8jh0G7W6FFHF5obqvZTosXz5rZnZUN6XJ3pYYoXXiWxbuZ8VR3O1NsZhh/h2F
-x/ub9npoaBEsvMcrOhH6AJRCS2pib3QN/bmTcwGMOD16v065+DAGQHFkJtzLw7oY
-yE+NdWi71a8lLxP5IkGUZgE7PuPCbPZQoP3BDXch+x3V6V74J8fpJ0VgiA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>db.saur.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=db.saur.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEDQl1fDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wODEwMDYxMTM1MDlaFw0xMzEw
-MDUxMTM1MDlaMEkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRMwEQYDVQQDEwpkYi5zYXVyLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/zjBXS8HerZKLm9TLGucOB5e3nBWmKtWvDX
-06WkrE7xvj+iDV/VcrK1vpP1wabRVy5e2rGAr66CyPhaOc7sFiZmlNGaS01f8j/9
-O50FM1DJVZqPCMzuMfjK+m22oZMegAoIiMFKPaCwXcRr8NJDnuHaK4WbAYkoQtDh
-jZmhZcSZT0W6k5NimszZg4azEOENiqlIGJ1LwQtGt0BMNUNT+p+PJkHRVuIftWLX
-bciCl7tavmpuOq0BVFz/uUD8yS+dAsqrvBmmcGaAHkvNpTqy0v1o56uk9o2i5zUb
-o+l4XGSulrwqsF0ytQWEDWZFYDtrkD8WDhhOn5ojTMbxTYb3VwIDAQABo4IB6TCC
-AeUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBRj3P6kfMQ1adyDpCzs3AP+TCfHADAfBgNVHSME
-GDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zArBgNVHREEJDAigSBiZW5lZGljdC5y
-aXBwZXJnZXJAZGVncnV5dGVyLmNvbTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vy
-dmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsG
-CCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNl
-cy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN+q0DlBL1Z9sKD3QHlik5C3/fSRe
-/xi/aaFWmLy20IL/jMEoCB6+Zvg42kkVIDfP5MgWbkFjMVKhz8AHrE4Cvnm2uwHS
-QiM2ZeOXcIYEM6HrX2NsE0e2ihpKy5KUYzsJGJPM+PVYB5hyTYzgvRHyKmlqI/Qm
-Lxl8jh0G7W6FFHF5obqvZTosXz5rZnZUN6XJ3pYYoXXiWxbuZ8VR3O1NsZhh/h2F
-x/ub9npoaBEsvMcrOhH6AJRCS2pib3QN/bmTcwGMOD16v065+DAGQHFkJtzLw7oY
-yE+NdWi71a8lLxP5IkGUZgE7PuPCbPZQoP3BDXch+x3V6V74J8fpJ0VgiA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://db.saur.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://db.saur.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://db.saur.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://db.saur.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://db.saur.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://db.saur.de/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">K. G. Saur Verlag</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">K. G. Saur Verlag, ein Imprint der Walter de Gruyter GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.saur.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrike</GivenName>
-    <SurName>Engel</SurName>
-    <EmailAddress>ulrike.engel@degruyter.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Cristian</GivenName>
-    <SurName>Vat</SurName>
-    <EmailAddress>cristian.vat@level7.ro</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml b/swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml
deleted file mode 100644
index 30c9183b..00000000
--- a/swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://db.ub.uni-stuttgart.de">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>db.ub.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=db.ub.uni-stuttgart.de,OU=Universitaetsbibliothek,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFbDCCBFSgAwIBAgIEDB2VKDANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDgw
-NDEwMTMzNTIxWhcNMTMwNDA5MTMzNTIxWjCBojELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MSAwHgYDVQQLExdVbml2ZXJzaXRh
-ZXRzYmlibGlvdGhlazEfMB0GA1UEAxMWZGIudWIudW5pLXN0dXR0Z2FydC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwE50dOQQkZznyAAfZEINPH
-haepUOZgEqAAHDjKEbxVg3WLZKg9CPQ8k1+nWxV8ZomJzXbw+kx1v7NPKdNPXBNw
-qmt6aQAiJHcUtzMGlfGI1YDrC/p0zFmjtno+a++sRSVgfBrSQME7JQ8CPVreSa20
-0MDsWR/OOdzVZo47PhzDYyOiABa/CEiU1k51zciw3XpbEnMqKwZ2tNxX++zgvhyg
-n5MhITT88Lukmz92XF0JyEeNJWE0Q0AKcS6V6A+jKQznEXpQ88c2Zit44z3bJM/9
-a9RBlMQ+CuPSuf7aznUY3AOysD5jWlvpJfDC2mMg3KTC1RNTuaoYmtBjJW0Nnj0C
-AwEAAaOCAbQwggGwMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUtB7lnAegYLLmVzFpTp8/Lymc
-R0UwHwYDVR0jBBgwFoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCB
-gjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1zdHV0dGdhcnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEB
-BIGZMIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1z
-dHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1o
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCjpYUB2mqfLUpU7uke8uvu
-3b6W/lDX8N54gmmdPfvjYF5ASmXdIdH64P6bspBPfqBajj0RfWflgGO85givR98w
-eVT2uqYrXKDIVknHs6/2SqolgcEkSSIUZwiGn4aNuV7BVcTB0bon6O+QJNUz/Ju8
-KG81dktd/OYbDq/yABvrWa2yvbroHwJZj9fydBBFvaT2l1KHv6NVauLXAqYyhDF8
-TkkerRdtxkOOv2vskPFo2HwZ0MZ/S9c5BJwKs0hGklHvT8/cnzAm1tO9TD8jG+9+
-c1GXBwlpyqeX1oyjmAwFsCP0IXVzw11n7BtSjylDJKYARAlw+qtCibuS9S+6oYQ2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>db.ub.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=db.ub.uni-stuttgart.de,OU=Universitaetsbibliothek,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFbDCCBFSgAwIBAgIEDB2VKDANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDgw
-NDEwMTMzNTIxWhcNMTMwNDA5MTMzNTIxWjCBojELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MSAwHgYDVQQLExdVbml2ZXJzaXRh
-ZXRzYmlibGlvdGhlazEfMB0GA1UEAxMWZGIudWIudW5pLXN0dXR0Z2FydC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwE50dOQQkZznyAAfZEINPH
-haepUOZgEqAAHDjKEbxVg3WLZKg9CPQ8k1+nWxV8ZomJzXbw+kx1v7NPKdNPXBNw
-qmt6aQAiJHcUtzMGlfGI1YDrC/p0zFmjtno+a++sRSVgfBrSQME7JQ8CPVreSa20
-0MDsWR/OOdzVZo47PhzDYyOiABa/CEiU1k51zciw3XpbEnMqKwZ2tNxX++zgvhyg
-n5MhITT88Lukmz92XF0JyEeNJWE0Q0AKcS6V6A+jKQznEXpQ88c2Zit44z3bJM/9
-a9RBlMQ+CuPSuf7aznUY3AOysD5jWlvpJfDC2mMg3KTC1RNTuaoYmtBjJW0Nnj0C
-AwEAAaOCAbQwggGwMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUtB7lnAegYLLmVzFpTp8/Lymc
-R0UwHwYDVR0jBBgwFoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCB
-gjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1zdHV0dGdhcnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEB
-BIGZMIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1z
-dHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1o
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCjpYUB2mqfLUpU7uke8uvu
-3b6W/lDX8N54gmmdPfvjYF5ASmXdIdH64P6bspBPfqBajj0RfWflgGO85givR98w
-eVT2uqYrXKDIVknHs6/2SqolgcEkSSIUZwiGn4aNuV7BVcTB0bon6O+QJNUz/Ju8
-KG81dktd/OYbDq/yABvrWa2yvbroHwJZj9fydBBFvaT2l1KHv6NVauLXAqYyhDF8
-TkkerRdtxkOOv2vskPFo2HwZ0MZ/S9c5BJwKs0hGklHvT8/cnzAm1tO9TD8jG+9+
-c1GXBwlpyqeX1oyjmAwFsCP0IXVzw11n7BtSjylDJKYARAlw+qtCibuS9S+6oYQ2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://db.ub.uni-stuttgart.de/Shibboleth.shire" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://db.ub.uni-stuttgart.de/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://db.ub.uni-stuttgart.de/Shibboleth.sso/SAML2/POST" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universitätsbibliothek Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-stuttgart.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Engelmann</SurName>
-    <EmailAddress>ralf.engelmann@ub.uni-stuttgart.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Engelmann</SurName>
-    <EmailAddress>ralf.engelmann@ub.uni-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev1.redclara.net.xml b/swamid-interfederations-2.0/dev1.redclara.net.xml
new file mode 100644
index 00000000..7f922f13
--- /dev/null
+++ b/swamid-interfederations-2.0/dev1.redclara.net.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev1.redclara.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Communities - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Comunidades - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's Communities Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio de Comunidades de RedCLARA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev1.redclara.net/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev1.redclara.net/Shibboleth.sso/DS" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>200.0.206.45</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=200.0.206.45,C=UY,ST=Montevideo,O=Red Clara</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFjCCAf4CCQCfJK8DwZ2R6DANBgkqhkiG9w0BAQUFADBNMRIwEAYDVQQKEwlS
+ZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJBgNVBAYTAlVZMRUwEwYD
+VQQDEwwyMDAuMC4yMDYuNDUwHhcNMTIwNjIxMTkwODI3WhcNMTQwNjIxMTkwODI3
+WjBNMRIwEAYDVQQKEwlSZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJ
+BgNVBAYTAlVZMRUwEwYDVQQDEwwyMDAuMC4yMDYuNDUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDKdBxbh2K3ngU3foWWHsVqrJ/cKjw4L5jLwmk6qdj9
+XB/otv821IkaDZvByWuyXNKnAzsPhQf3zFxrxEUuMaIkicocBqgccuSjo6PMP16F
+iXgre8mClioOSk9yJ8g0yc7g8bAU1fK3adPu0lJ7cPzgVSnfrKj/9XKGIm7osRgU
+mbjq3Dbu5b3kBAAnmIxiFIAQgPI54G56/0HRuj4WK6xRmS/XDMsYK5rGpvRDsXyn
+8RXst/NYLbUWidloCnqbZQuONcD01jYdz5Jg2ewm4M7fatvUGjIsubUD+M5wiqIz
+3qoHv51AKxfVkGfhcJ7h9Qk4nrdwFPOHAURpDikQhDz/AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAIVCSoO1PhqT5uuVZ5aSjv2lbsVLe5vKofdMGGt6733+P/uAd/M7
+sC2o/1A1G/B8nBAcmf6ixxXhC80xP1/X6mOZMndlodR7EQ3kiaK4PK8axyj8YybG
+BIc0FWfyTey5CbreQ4+Ki7VtWRyreGO0dr3vuw4EiSWElRLhI1B3Lo0Bk2JJ67QK
+IgrPMUrUh5jJAlp3jX/RvuvxEc1ARN4pLRAKzBkDhVrgCTULlWJEWaDG6b9wMRqT
+kkpXOppmeF9MhHCi7jx9rpC9rStCqtrx9OR8nV47HJuXbPG/IXZsJtjMtFC494yN
+ZbqhKmJYNXHT9wwPSukVuZtX44gDv8HIuws=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>200.0.206.45</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=200.0.206.45,C=UY,ST=Montevideo,O=Red Clara</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFjCCAf4CCQCfJK8DwZ2R6DANBgkqhkiG9w0BAQUFADBNMRIwEAYDVQQKEwlS
+ZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJBgNVBAYTAlVZMRUwEwYD
+VQQDEwwyMDAuMC4yMDYuNDUwHhcNMTIwNjIxMTkwODI3WhcNMTQwNjIxMTkwODI3
+WjBNMRIwEAYDVQQKEwlSZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJ
+BgNVBAYTAlVZMRUwEwYDVQQDEwwyMDAuMC4yMDYuNDUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDKdBxbh2K3ngU3foWWHsVqrJ/cKjw4L5jLwmk6qdj9
+XB/otv821IkaDZvByWuyXNKnAzsPhQf3zFxrxEUuMaIkicocBqgccuSjo6PMP16F
+iXgre8mClioOSk9yJ8g0yc7g8bAU1fK3adPu0lJ7cPzgVSnfrKj/9XKGIm7osRgU
+mbjq3Dbu5b3kBAAnmIxiFIAQgPI54G56/0HRuj4WK6xRmS/XDMsYK5rGpvRDsXyn
+8RXst/NYLbUWidloCnqbZQuONcD01jYdz5Jg2ewm4M7fatvUGjIsubUD+M5wiqIz
+3qoHv51AKxfVkGfhcJ7h9Qk4nrdwFPOHAURpDikQhDz/AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAIVCSoO1PhqT5uuVZ5aSjv2lbsVLe5vKofdMGGt6733+P/uAd/M7
+sC2o/1A1G/B8nBAcmf6ixxXhC80xP1/X6mOZMndlodR7EQ3kiaK4PK8axyj8YybG
+BIc0FWfyTey5CbreQ4+Ki7VtWRyreGO0dr3vuw4EiSWElRLhI1B3Lo0Bk2JJ67QK
+IgrPMUrUh5jJAlp3jX/RvuvxEc1ARN4pLRAKzBkDhVrgCTULlWJEWaDG6b9wMRqT
+kkpXOppmeF9MhHCi7jx9rpC9rStCqtrx9OR8nV47HJuXbPG/IXZsJtjMtFC494yN
+ZbqhKmJYNXHT9wwPSukVuZtX44gDv8HIuws=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev1.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev1.redclara.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev1.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Urban</md:SurName>
+    <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/downloads.channel8.msdn.com.xml b/swamid-interfederations-2.0/downloads.channel8.msdn.com.xml
deleted file mode 100644
index 3ef8b274..00000000
--- a/swamid-interfederations-2.0/downloads.channel8.msdn.com.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.dreamspark.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dreamspark.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dreamspark.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIJAOAnCSnCRCHEMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnd3dy5kcmVhbXNwYXJrLmNvbTAeFw0xMDEwMDQxMDAyMTBaFw0xMzEwMDMx
-MDAyMTBaMB0xGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJrLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKSB9dRKIpfDAdGbla2Z4lNxRHURAsUb8LvT
-ALm0+v9RP/Hq7dAHSGHmQgv15s/0fi6i8p3EEtiBcnPVKJxvff82kLvV9AjrLp2l
-Szq+nz1oD1zElm44Caw9NMHc4n0NfvRSlAH1VKZUEXo5gm+jMHcpx/wDoMqNGEOq
-XXglXNoeftFWmlhU/loHuLIfREtadWB4mzOzqCCW5Ak7ESF6hVW5mD73QgJPgLVt
-Y4K1HouT4hC9oDhG4RHx1C/pex3JqTVirhTiWCKZCuVk7u8lVTOojr9mKczhO2HX
-85x4i8o+NzeBNchzs/WUXtdvqPzw8/Y7kSGhcG0FE2Db7uAPmXkCAwEAAaN+MHww
-HQYDVR0OBBYEFFml+PG8Rd7m471DG1DTwNsiM8njME0GA1UdIwRGMESAFFml+PG8
-Rd7m471DG1DTwNsiM8njoSGkHzAdMRswGQYDVQQDExJ3d3cuZHJlYW1zcGFyay5j
-b22CCQDgJwkpwkQhxDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB4
-mZ5q44Xzp0ffUgr+XBC1iD+GhXQbC+fiMR4Cd1RFu9+p2p2iKwrZVQ0m+6fegO3F
-Cd2S+14+jgg7O4EfQcf+A4IcfVIs/g3EhqRleXoZqYusZJOwAUOhIm+vSjDxv11D
-gBvhFnVqgL04VKmGopK35kSspkhXm3BJgd/dqvXTYiNeKw6yk77sdSDiZxk6nRlD
-HS/mVvdjQUf0yyJNHZp6eEBgWgxmIGBRoKhb6hi5scIylBTUewqBqUnaW+t0kF8f
-qhw5X47o07/+9CJh8DsO1KpfM2CNZbIMUEY2q1wBfhE5HlI4wVXJYQqeUsqHXr1G
-ssIJnnOiYS0/QF/t7Wkd
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://downloads.channel8.msdn.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://downloads.channel8.msdn.com/Shibboleth.sso/SAML/Artifact" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Microsoft Deutschland GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Microsoft DreamSpark</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.dreamspark.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Scott</GivenName>
-    <SurName>Blackwell</SurName>
-    <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DS Team</GivenName>
-    <SurName>Microsoft</SurName>
-    <EmailAddress>ds-team@microsoft.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml b/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml
deleted file mode 100644
index a4f7657e..00000000
--- a/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/metadata.php/virtual_sp_for_swamid_uu">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/discoresp.php"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEsDCCBBmgAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8DELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxSDBGBgNVBAsUP1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVV9TdmVJRDElMCMGA1UEAxMcU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTAgFw0xMjEyMTEyMjE4MjhaGA8yMDU1MDEwNTIyMTgyOFowgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJgNj1MBi3HtyKLiiZQq4Ks0yMhk+XX5D1lXcL7r7G94s3w6cPteJZFR2/1DsARbR19SLtoG+zn7iLu5bagpIr906023MVKOc9l6zPuoMtQ71VUVsXmWdgFXTR2qln9eqE4cayuYkv2OxwrRLVa2fe3dyVksCb59Mpw3hiTpP8Q5AgMBAAGjggFUMIIBUDAdBgNVHQ4EFgQUkZFvxByU7cCnZCBjw1B6VypLOn0wggEfBgNVHSMEggEWMIIBEoAUkZFvxByU7cCnZCBjw1B6VypLOn2hgfakgfMwgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQA+7VYhtODAKIhU4s8kZh1aZuS8oLjYcUksLEFBXyTICHW7Z9UEpiWiMyIOvjS5CVpNoJxglmoNOia+Aq8b9Rrp3PBx8AZ7FNfOeBiznbMi76m2rF2GVFO2WqWORA2N/Ip+YChecbMEB31KoG1HTatvpjI8T+c147pH8FmBRA0PBA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEsDCCBBmgAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8DELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxSDBGBgNVBAsUP1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVV9TdmVJRDElMCMGA1UEAxMcU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTAgFw0xMjEyMTEyMjE4MjhaGA8yMDU1MDEwNTIyMTgyOFowgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJgNj1MBi3HtyKLiiZQq4Ks0yMhk+XX5D1lXcL7r7G94s3w6cPteJZFR2/1DsARbR19SLtoG+zn7iLu5bagpIr906023MVKOc9l6zPuoMtQ71VUVsXmWdgFXTR2qln9eqE4cayuYkv2OxwrRLVa2fe3dyVksCb59Mpw3hiTpP8Q5AgMBAAGjggFUMIIBUDAdBgNVHQ4EFgQUkZFvxByU7cCnZCBjw1B6VypLOn0wggEfBgNVHSMEggEWMIIBEoAUkZFvxByU7cCnZCBjw1B6VypLOn2hgfakgfMwgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQA+7VYhtODAKIhU4s8kZh1aZuS8oLjYcUksLEFBXyTICHW7Z9UEpiWiMyIOvjS5CVpNoJxglmoNOia+Aq8b9Rrp3PBx8AZ7FNfOeBiznbMi76m2rF2GVFO2WqWORA2N/Ip+YChecbMEB31KoG1HTatvpjI8T+c147pH8FmBRA0PBA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-logout.php/virtual_sp_for_swamid_uu"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/virtual_sp_for_swamid_uu" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/virtual_sp_for_swamid_uu" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/virtual_sp_for_swamid_uu" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/virtual_sp_for_swamid_uu/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Svensk e-identitet AB via UU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Svensk e-identitet AB via UU</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mikael</md:GivenName>
-    <md:SurName>Westoo</md:SurName>
-    <md:EmailAddress>mikael.westoo@e-identitet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml b/swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml
deleted file mode 100644
index ce16a7fe..00000000
--- a/swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elektra.bsb-muenchen.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>elektra.bsb-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=elektra.bsb-muenchen.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzzCCBLegAwIBAgIEDqN6FjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNVBAoT
-G0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJpc2No
-ZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG9w0B
-CQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMDkwODEzMTE0NDA2WhcNMTQwODEy
-MTE0NDA2WjCBnzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UE
-BxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhl
-azEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMSAwHgYDVQQD
-ExdlbGVrdHJhLmJzYi1tdWVuY2hlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAN7Ez06ZGFW2qRt6TT1XX2pDeQ77ZID+punNbvRhg6JSvSOrQqmf
-9BVvWSh6OgWU1qUdC3M8VQ0S/15RcdgJI6G5NFQZO9RGyi+XW2z8DAgZ5mENbacG
-xfponlazmx8s4Z4H0ql4+24bei0hgAd0XReaMsMKOPDL3giaKXCtPQOCKri033V8
-magAFFnjQ62MRNI3Ani1WZ8gzfQrbdmEwt5xaYGe+cIveUmEEHhLNpE3WgpWPHZm
-40WST0FZBeW7XFKrCWqI2CBJvHbkLE6tCJweoCS6XTLhjvD0CPvBdKSfTW2T2GG0
-7puLVNAPyve/k5aNldQMWsMQm/qAAVi4Q/UCAwEAAaOCAfwwggH4MAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQU1VAUVL1KQEJcllaGZ3cK7zmTQ3UwHwYDVR0jBBgwFoAUemeMWxoT
-RIKzIVobKorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Jh
-eWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5j
-cmwwgcoGCCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAp1+BjRR9kfoUqN2Sw
-cSFdlI/x9YYNRL+/Felm1TF+KtBMdPtx/oWVnNhvxGXxwwlWJ/1RpHA4Prd01+IR
-W/6qISA19D58AJaim/bRe6gtfWM65XtOAzgvoLBRDj1zO0FS3yj7mdcvodhmtP2q
-55k6F4c/lC1y/bbytpSurlUsIF5QU6HeKSWwpbKCg/JK6at+75E4Uk/DFagfqDg4
-J0TTCKM98DtgZ7+9K5wYyx20HhlDKGm4V/pj5hDeiirCsp8UXO5fcQmvvwvAe4uw
-iI4aaIJAqMcdKoi0xt6antv5F/bxsqzJskIbJiyIT2qeCoT+rVZ9SmIZh3u/Zwqj
-56P0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/SOAP"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://elektra.bsb-muenchen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Wunderle</GivenName>
-    <SurName>Heinrich</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml b/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
index 4fffd0f5..f6942f97 100644
--- a/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
+++ b/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
@@ -11,10 +11,10 @@
     <Extensions>
       <shibmd:Scope regexp="false">gov.br</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</mdui:Description>
-        <mdui:Description xml:lang="pt-br">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</mdui:Description>
+        <mdui:DisplayName xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.ence.ibge.gov.br/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="pt-br">http://www.ence.ibge.gov.br/</mdui:InformationURL>
       </mdui:UIInfo>
@@ -102,10 +102,10 @@ YBk=
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</OrganizationName>
-    <OrganizationName xml:lang="pt-br">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas)</OrganizationName>
+    <OrganizationName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas)</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ence.ibge.gov.br/</OrganizationURL>
     <OrganizationURL xml:lang="pt-br">http://www.ence.ibge.gov.br/</OrganizationURL>
   </Organization>
diff --git a/swamid-interfederations-2.0/ephraim.tu-berlin.de.xml b/swamid-interfederations-2.0/ephraim.tu-berlin.de.xml
deleted file mode 100644
index 290ed16f..00000000
--- a/swamid-interfederations-2.0/ephraim.tu-berlin.de.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ephraim.tu-berlin.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
-VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
-OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
-A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
-aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
-HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
-fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
-ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
-QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
-pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
-VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
-F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
-A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
-gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
-cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
-yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
-3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
-tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
-sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
-VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
-OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
-A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
-aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
-HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
-fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
-ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
-QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
-pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
-VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
-F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
-A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
-gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
-cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
-yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
-3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
-tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
-sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
-VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
-OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
-A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
-aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
-HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
-fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
-ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
-QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
-pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
-VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
-F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
-A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
-gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
-cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
-yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
-3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
-tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
-sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
-VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
-OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
-A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
-aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
-HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
-fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
-ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
-QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
-pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
-VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
-F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
-A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
-gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
-cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
-yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
-3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
-tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
-sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Berlin (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Technische Universität Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-berlin.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerd</GivenName>
-    <SurName>Schering</SurName>
-    <EmailAddress>schering@tubit.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gerd</GivenName>
-    <SurName>Schering</SurName>
-    <EmailAddress>schering@tubit.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Thomas</GivenName>
-    <SurName>Gebhardt</SurName>
-    <EmailAddress>gepard@tubit.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Gebhardt</SurName>
-    <EmailAddress>gepard@tubit.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>tubit-</GivenName>
-    <SurName>shibbolethsupport</SurName>
-    <EmailAddress>tubit-shibbolethsupport@lists.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>tubit-</GivenName>
-    <SurName>shibbolethsupport</SurName>
-    <EmailAddress>tubit-shibbolethsupport@lists.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml b/swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml
deleted file mode 100644
index b2756e1c..00000000
--- a/swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://erf.sbb.spk-berlin.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>erf.sbb.spk-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=erf.sbb.spk-berlin.de,OU=Staatsbibliothek zu Berlin PK,O=STIFTUNG PREUSSISCHER KULTURBESITZ,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGCDCCBPCgAwIBAgIEDQQY/DANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSswKQYDVQQKEyJT
-VElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaMTAwLgYDVQQDEydTVElG
-VFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaIC0gQ0ExIjAgBgkqhkiG9w0B
-CQEWE2NhQGh2LnNway1iZXJsaW4uZGUwHhcNMDgxMDAyMDk1OTA5WhcNMTMxMDAx
-MDk1OTA5WjCBpDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UE
-BxMGQmVybGluMSswKQYDVQQKEyJTVElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVS
-QkVTSVRaMSYwJAYDVQQLEx1TdGFhdHNiaWJsaW90aGVrIHp1IEJlcmxpbiBQSzEe
-MBwGA1UEAxMVZXJmLnNiYi5zcGstYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAsIo/QRLwUvAHXZ9FkD80W+O3HY9peAQExGGc2Ojzq7h8
-6Clq0sKVAFkXV4jJArtC8O4V+LVfL+/EHGLawi9Nps7UflkSjSNlK3Bu33I8ZZVJ
-wBxZG4/YrtuzZpz5KZ0sY3x4/HQCYxehVPdsdlgDx82O4yy3A2NSEryLZk0syX3m
-ORB9V3soO/4QVs/avsc/N+pvcbmXCf8MT/XG5j0qdMYYqYenT8aG3YCmGF7d0e04
-ME1kQ4QN+2tprrJuDslnIV6X/tMJGvRmayKyDCe+ORdWqFnZE9MxPhDj2gkR+Uf8
-RO5Ip552z/ZqbrAFHBwqokOLolu5MZ0fGbu/KeE1QwIDAQABo4ICMDCCAiwwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBT3xLOhGMK2vHK2JywZAkPJ2nJruTAfBgNVHSMEGDAWgBTn
-p8hlJwW/CmNIRBlH2cq44OVQKTAmBgNVHREEHzAdgRtlcmYtYWRtaW5Ac2JiLnNw
-ay1iZXJsaW4uZGUwgbcGA1UdHwSBrzCBrDBUoFKgUIZOaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9zdGlmdHVuZy1wcmV1c3Npc2NoZXIta3VsdHVyYmVzaXR6LWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMFSgUqBQhk5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3N0
-aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHotY2EvcHViL2NybC9jYWNy
-bC5jcmwwgdAGCCsGAQUFBwEBBIHDMIHAMF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDr6KA
-0mxhN6uvQwoQPTJxvSCzibyOIj2LpChEtewwWZxmrG6jmddag1iUPG8VsdB+Ocrn
-AuKmrZJhAJtmkH5YcdTA9l4kbNNgBBx4fkOsxsXgo5yMeX2V8OCCjdL+ZvMiv1ih
-f+PsEmREhK3MhoLa0R2jK69AYOM80uhc4Tw+T4tICXNLojudpnK4fiRnnaJ0JV2W
-vAuQQAnkXf7C5K9cPxzPE8zfL4OGMk1HkFRdZ6Cdw/NT2nquE9uoe6IiJbyHqVye
-7TQp8bbt4gXHGiMg4iKniIYBGa1hpT36g6UudpvjoKEmDWiy59bIYHSuH6E0O24L
-i+qpO2NCiiTGlah8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>erf.sbb.spk-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=erf.sbb.spk-berlin.de,OU=Staatsbibliothek zu Berlin PK,O=STIFTUNG PREUSSISCHER KULTURBESITZ,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGCDCCBPCgAwIBAgIEDQQY/DANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSswKQYDVQQKEyJT
-VElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaMTAwLgYDVQQDEydTVElG
-VFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaIC0gQ0ExIjAgBgkqhkiG9w0B
-CQEWE2NhQGh2LnNway1iZXJsaW4uZGUwHhcNMDgxMDAyMDk1OTA5WhcNMTMxMDAx
-MDk1OTA5WjCBpDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UE
-BxMGQmVybGluMSswKQYDVQQKEyJTVElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVS
-QkVTSVRaMSYwJAYDVQQLEx1TdGFhdHNiaWJsaW90aGVrIHp1IEJlcmxpbiBQSzEe
-MBwGA1UEAxMVZXJmLnNiYi5zcGstYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAsIo/QRLwUvAHXZ9FkD80W+O3HY9peAQExGGc2Ojzq7h8
-6Clq0sKVAFkXV4jJArtC8O4V+LVfL+/EHGLawi9Nps7UflkSjSNlK3Bu33I8ZZVJ
-wBxZG4/YrtuzZpz5KZ0sY3x4/HQCYxehVPdsdlgDx82O4yy3A2NSEryLZk0syX3m
-ORB9V3soO/4QVs/avsc/N+pvcbmXCf8MT/XG5j0qdMYYqYenT8aG3YCmGF7d0e04
-ME1kQ4QN+2tprrJuDslnIV6X/tMJGvRmayKyDCe+ORdWqFnZE9MxPhDj2gkR+Uf8
-RO5Ip552z/ZqbrAFHBwqokOLolu5MZ0fGbu/KeE1QwIDAQABo4ICMDCCAiwwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBT3xLOhGMK2vHK2JywZAkPJ2nJruTAfBgNVHSMEGDAWgBTn
-p8hlJwW/CmNIRBlH2cq44OVQKTAmBgNVHREEHzAdgRtlcmYtYWRtaW5Ac2JiLnNw
-ay1iZXJsaW4uZGUwgbcGA1UdHwSBrzCBrDBUoFKgUIZOaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9zdGlmdHVuZy1wcmV1c3Npc2NoZXIta3VsdHVyYmVzaXR6LWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMFSgUqBQhk5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3N0
-aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHotY2EvcHViL2NybC9jYWNy
-bC5jcmwwgdAGCCsGAQUFBwEBBIHDMIHAMF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDr6KA
-0mxhN6uvQwoQPTJxvSCzibyOIj2LpChEtewwWZxmrG6jmddag1iUPG8VsdB+Ocrn
-AuKmrZJhAJtmkH5YcdTA9l4kbNNgBBx4fkOsxsXgo5yMeX2V8OCCjdL+ZvMiv1ih
-f+PsEmREhK3MhoLa0R2jK69AYOM80uhc4Tw+T4tICXNLojudpnK4fiRnnaJ0JV2W
-vAuQQAnkXf7C5K9cPxzPE8zfL4OGMk1HkFRdZ6Cdw/NT2nquE9uoe6IiJbyHqVye
-7TQp8bbt4gXHGiMg4iKniIYBGa1hpT36g6UudpvjoKEmDWiy59bIYHSuH6E0O24L
-i+qpO2NCiiTGlah8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://erf.sbb.spk-berlin.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://erf.sbb.spk-berlin.de/Shibboleth.sso/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Staatsbibliothek zu Berlin</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Staatsbibliothek zu Berlin Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://staatsbibliothek-berlin.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Jann-Gerd</GivenName>
-    <SurName>Hans</SurName>
-    <EmailAddress>jgh@sbb.spk-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gerrit</GivenName>
-    <SurName>Gragert</SurName>
-    <EmailAddress>gerrit.gragert@sbb.spk-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed-lab.org.xml b/swamid-interfederations-2.0/fed-lab.org.xml
deleted file mode 100644
index ab44769a..00000000
--- a/swamid-interfederations-2.0/fed-lab.org.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fed-lab.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-03-08T11:10:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                   https://www.aai.dfn.de/en/join/
-               </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">
-                   https://www.aai.dfn.de/teilnahme/
-               </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">ID Federation Lab</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ID Federation Lab</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Federation Lab</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Federation Lab</mdui:Description>
-        <mdui:Logo height="32" width="32">https://fed-lab.org/wp-content/themes/carrington-blog/img/lab.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>fed-lab.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=fed-lab.org,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIHE3f/Vc7d6jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMjAzMDgw
-OTU0MTNaFw0xNzAzMDcwOTU0MTNaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpE
-Rk4tVmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRQwEgYDVQQDEwtm
-ZWQtbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKM5G9l7
-Q3NMbPZlwx+xqH1ELTyhC9yYTP2LDaDGyS1XDQ29QMAvLB0SzmG+aBNSiO7aFVXO
-nKUDBSlOUCUA7S88hMDNquVSqbujAZ5/CuguW5rjoJN1IS3i7ZaD7/Q1mRBhIV9i
-qmv2w24oKhhqw/ijLkK4XFnSCyom33MBPlFz/TkH1W7AaTAoMZTNQEFP4Ms9IUf6
-ePU14Mw7C2RBjC+eUyM2/xU0EZt9RppXDpQ1PK172HoEaWYHhyAD0SLyamJBtqVn
-W7uhgFuh7jHgDaN4xi+zow91wNIHJFYp4k26sSWARb9zxnnXmsPdOZcL//vBis1U
-Sf3YWsWy3IsosckCAwEAAaOCAhowggIWMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUhL6wfirs
-VHh3Ridf8Ct0ZpdXLfEwHwYDVR0jBBgwFoAUeaJiL87xBjlS53ZtYsfem2p1S0kw
-JwYDVR0RBCAwHoILZmVkLWxhYi5vcmeCD3d3dy5mZWQtbGFiLm9yZzCBkQYDVR0f
-BIGJMIGGMEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4t
-Z3MtY2EvcHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8G
-CCsGAQUFBwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu
-LmRlL09DU1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQCAKgHUcNID3v4Q2tqoQ4rX0eExJWPAJpDiixNi72GMoBeVWEXXeTK0i6pXNiAi
-Zk/GeeRPpOFdWEv7fxUv3igtzUdsWcxdID0+d4Jr2r4qThzlr0qroAKW/k5EA5Xr
-XHzLAh7lzGbipKbPLFFhMOgo8qbaPCjIKSKZGJzbXKPfxy5Efrbjpp3RJvvcCtS8
-AjsYaiukBZxdxU13wW4jLz20DJYECREQg14xJ7yYfHkY089k5LyCHEdLfSIQGG25
-zCWG/MOfIF4ytgyS74d3xzMRlVZ9Xa55k/MngKBWbBFvaTUiQppSC+xKNFm+bFAX
-rQ9xVr27yKkLqzzoz8LiTMmk
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">ID Federation Lab</OrganizationName>
-    <OrganizationName xml:lang="en">ID Federation Lab</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ID Federation Lab</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">ID Federation Lab</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://fed-lab.org/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://fed-lab.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Åkre Solberg</SurName>
-    <EmailAddress>andreas.solberg@uninett.no</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Torsten</GivenName>
-    <SurName>Kersting</SurName>
-    <EmailAddress>kersting@dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.redclara.net.xml b/swamid-interfederations-2.0/filesender.redclara.net.xml
new file mode 100644
index 00000000..4373f63c
--- /dev/null
+++ b/swamid-interfederations-2.0/filesender.redclara.net.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.redclara.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Filesender - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Filesender - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's Filesender Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio Filesender de RedCLARA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGaDCCBVCgAwIBAgIDCodyMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTI4MDY1NjQ5WhcNMTQwNTI5MDg1MzAyWjByMRkwFwYDVQQNExBRWDFLYTh3UDc5bFJ6QkNEMQswCQYDVQQGEwJDTDEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBHl9Ppk+y5kNDUSDxAyULKM+CS14u+ctyPD2+AZ15GhorCL73HNspAd+tOMMVnhBhGX7vY4TQkfIXEBb/vstWGxXS9rj2jb7E4X2GSJkSOAumwb80GP8GzqQUe/y4zs9Eb0hh43aRaeQpIGJCzUaZcXJeUyUBu+KZx4DzpLbWDI+5Jb/xJoAeYqsImYzUPSUAF1e4FUStOVI+JvyquwGiS8/LCF2wazeXm9Q49eCAAEnAgcSL5m2o7Qf88KRsYBfd4rbCL6cU8+i0Z04fM5AJ+d7dpO3ZNfMcp79J6xvUzWCxpeI7+vJgo4+cT1VUKRlg2pvK/Zh7YfjCJTja60+wIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFBR/zQl4gwQI406e6SlxLpGMIAiDMB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAB5T2hptu3z02m6ni90BZ8vj6jtPlw7x+f71/jL5f7HKqNQTQXWzqTtHXEruQs213J8YnVtBkrlRqotHmHRE2IbhKVbhNr+ZK10gkaHHyZTerQGTMFFHGVm8PpQNG6PQXDESV+PTuPI0vLzgvrtyJXVvQSyxxN2XO4L5q0ER9g+u5YDY6Ms51inH/qLhS3VIpMYpDo8e8eJpytqg5VCaR9FkVbEue37P2VYyR93q2G+4YifovZ313IUAJWt7eL4mQFVcHt09p83DdE7p/ixNuGi9Y0LGa+a3YSR0sOxUuTR12R97gVFuSUzUMlicmdxb6qKuN67K84gLic0tZqo8yd
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGaDCCBVCgAwIBAgIDCodyMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTI4MDY1NjQ5WhcNMTQwNTI5MDg1MzAyWjByMRkwFwYDVQQNExBRWDFLYTh3UDc5bFJ6QkNEMQswCQYDVQQGEwJDTDEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBHl9Ppk+y5kNDUSDxAyULKM+CS14u+ctyPD2+AZ15GhorCL73HNspAd+tOMMVnhBhGX7vY4TQkfIXEBb/vstWGxXS9rj2jb7E4X2GSJkSOAumwb80GP8GzqQUe/y4zs9Eb0hh43aRaeQpIGJCzUaZcXJeUyUBu+KZx4DzpLbWDI+5Jb/xJoAeYqsImYzUPSUAF1e4FUStOVI+JvyquwGiS8/LCF2wazeXm9Q49eCAAEnAgcSL5m2o7Qf88KRsYBfd4rbCL6cU8+i0Z04fM5AJ+d7dpO3ZNfMcp79J6xvUzWCxpeI7+vJgo4+cT1VUKRlg2pvK/Zh7YfjCJTja60+wIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFBR/zQl4gwQI406e6SlxLpGMIAiDMB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAB5T2hptu3z02m6ni90BZ8vj6jtPlw7x+f71/jL5f7HKqNQTQXWzqTtHXEruQs213J8YnVtBkrlRqotHmHRE2IbhKVbhNr+ZK10gkaHHyZTerQGTMFFHGVm8PpQNG6PQXDESV+PTuPI0vLzgvrtyJXVvQSyxxN2XO4L5q0ER9g+u5YDY6Ms51inH/qLhS3VIpMYpDo8e8eJpytqg5VCaR9FkVbEue37P2VYyR93q2G+4YifovZ313IUAJWt7eL4mQFVcHt09p83DdE7p/ixNuGi9Y0LGa+a3YSR0sOxUuTR12R97gVFuSUzUMlicmdxb6qKuN67K84gLic0tZqo8yd
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.redclara.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://filesender.redclara.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://filesender.redclara.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://filesender.redclara.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://filesender.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SEG</md:GivenName>
+    <md:SurName>RedCLARA</md:SurName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/finden.nationallizenzen.de.xml b/swamid-interfederations-2.0/finden.nationallizenzen.de.xml
deleted file mode 100644
index 937083df..00000000
--- a/swamid-interfederations-2.0/finden.nationallizenzen.de.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://finden.nationallizenzen.de/sp/suchkiste">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://finden.nationallizenzen.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>finden.nationallizenzen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=finden.nationallizenzen.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkjCCBHqgAwIBAgIED35qxjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMTI2MTMyNTEx
-WhcNMTUwMTI1MTMyNTExWjCBrDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazEjMCEGA1UEAxMaZmluZGVuLm5hdGlvbmFsbGl6ZW56ZW4uZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOBLJTZ7ieik04SmpupAIf
-++pZCiBpMcgBIJO8VXq449T9/zFA8qYG9H6Y65QJOobBIha049uvNT+QnHO7I9fc
-WfVhI61hhF3pMlhO64Gj5LwjYp7PUSTM8OIbZcKsuq8t3Zfr7T0v6Es3diCxWMDn
-SHCJ+EiSmp65ZB0Cy0f7bSFJYtUgqruVutBDW1yVvEfGxnaDQqr0+X8R3sifMCh7
-3kTTO9qJ2iMlo5yUsMsswa9PKRJGPouflkjmgOia6YfAGscUe5PX94uGTWpKEsRd
-QHC2JENB/cNVeevN8s7psMi8d9I+55J1uszEx2w7g+5objFnHOuyLSkV+9EDUeiz
-AgMBAAGjggGpMIIBpTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFE4Qs3QA7KlY99nd061NOOod
-qdUVMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBoGA1UdEQQTMBGB
-D2tpbnN0bGVyQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
-KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQEFBQADggEBACitzuQ265c448yHkBx/QR7rF8NgzABht68b
-E52cg+YTHy0qYxKO+vnwRM3/qck9BY6PcVdUn+muHDZD6WGrmPC0RDwtbxVDdUjG
-iLtXCtK3mXU2nnbexqSihT3Qf4X9l8P5d6kzaonjReRoDPsnhs0/HWo/eiLFmbU3
-9ie2238HqHJHWS3m/cbNUwsY70U/UFjo+9Uh2SIESJkkS0WOJAtZsIgi9jNCyBGH
-oDbPnIHiEe7icPfgaEirwMA0e/yqQsVLpvb4ONfOJSYjfqWhwFZY8q2AbqEJn2tl
-A3Q0ZVArSnUxthanQHzzhjuc64pQuFHcijaeqQYJUPYiRqYVEuY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>finden.nationallizenzen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=finden.nationallizenzen.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkjCCBHqgAwIBAgIED35qxjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMTI2MTMyNTEx
-WhcNMTUwMTI1MTMyNTExWjCBrDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazEjMCEGA1UEAxMaZmluZGVuLm5hdGlvbmFsbGl6ZW56ZW4uZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOBLJTZ7ieik04SmpupAIf
-++pZCiBpMcgBIJO8VXq449T9/zFA8qYG9H6Y65QJOobBIha049uvNT+QnHO7I9fc
-WfVhI61hhF3pMlhO64Gj5LwjYp7PUSTM8OIbZcKsuq8t3Zfr7T0v6Es3diCxWMDn
-SHCJ+EiSmp65ZB0Cy0f7bSFJYtUgqruVutBDW1yVvEfGxnaDQqr0+X8R3sifMCh7
-3kTTO9qJ2iMlo5yUsMsswa9PKRJGPouflkjmgOia6YfAGscUe5PX94uGTWpKEsRd
-QHC2JENB/cNVeevN8s7psMi8d9I+55J1uszEx2w7g+5objFnHOuyLSkV+9EDUeiz
-AgMBAAGjggGpMIIBpTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFE4Qs3QA7KlY99nd061NOOod
-qdUVMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBoGA1UdEQQTMBGB
-D2tpbnN0bGVyQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
-KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQEFBQADggEBACitzuQ265c448yHkBx/QR7rF8NgzABht68b
-E52cg+YTHy0qYxKO+vnwRM3/qck9BY6PcVdUn+muHDZD6WGrmPC0RDwtbxVDdUjG
-iLtXCtK3mXU2nnbexqSihT3Qf4X9l8P5d6kzaonjReRoDPsnhs0/HWo/eiLFmbU3
-9ie2238HqHJHWS3m/cbNUwsY70U/UFjo+9Uh2SIESJkkS0WOJAtZsIgi9jNCyBGH
-oDbPnIHiEe7icPfgaEirwMA0e/yqQsVLpvb4ONfOJSYjfqWhwFZY8q2AbqEJn2tl
-A3Q0ZVArSnUxthanQHzzhjuc64pQuFHcijaeqQYJUPYiRqYVEuY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Suchkiste</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Suchkiste der Nationallizenzen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://finden.nationallizenzen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>borel@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Till</GivenName>
-    <SurName>Kinstler</SurName>
-    <EmailAddress>kinstler@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerald</GivenName>
-    <SurName>Steilen</SurName>
-    <EmailAddress>steilen@gbv.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
index a7010fe3..63d6ae17 100644
--- a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
+++ b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fire.rettorato.unito.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-01-27T18:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
+  </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>
@@ -20,38 +19,43 @@
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>serviziweb.unito.it</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=serviziweb.unito.it,O=Universit\C3\A0 degli Studi di Torino,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEgDCCA2igAwIBAgIRAI23y9ITrv6V83fVgnk6IS0wDQYJKoZIhvcNAQEFBQAw
+          <ds:X509Certificate>MIIEmTCCA4GgAwIBAgIRAJ1SDn1K6/XkRV070chIBJswDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMDA5MjAwMDAwMDBaFw0xMzA5MTkyMzU5NTlaMFcxCzAJBgNV
+                            IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMFcxCzAJBgNV
                             BAYTAklUMSowKAYDVQQKDCFVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBUb3Jp
                             bm8xHDAaBgNVBAMTE3NlcnZpeml3ZWIudW5pdG8uaXQwggEiMA0GCSqGSIb3DQEB
-                            AQUAA4IBDwAwggEKAoIBAQDYkhN1NRqrtcwJFbOnfXDkQ2jt2W6RKLlu92y32YOa
-                            6tpdTt/79tKgwu/LBKsxfkDqpgSUCvDF6nMZtRXT+slDvLSTDNDlmR5qZNfvX2NJ
-                            EKyoUmkx/dwUiBdQStRI6xyRqFYOYUBMzazcNwmDBsHP95ehvPNm7Elizy+1q+NB
-                            c81vhwn0d3pDjTss3XwTKupzMvIvFD+IumMPLNXwGM6xoIpQDcs5xgZixepu5c0w
-                            CxcDraqezCn8Wf+ZcIGnEPAW95lRvZzRmEAKzvbay/5kLdq0ZhCqFMNaKtU0nNjF
-                            2RnoYeRA2Xpl4hj8vKzfN8cCjZP7ZA8so0y0nzZjtL8hAgMBAAGjggFmMIIBYjAf
-                            BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8PHbME7x
-                            lHVkY1LYPThdV2ejntAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+                            AQUAA4IBDwAwggEKAoIBAQCkR8/1ia78SrXo2BUwW/x7MFZoWhndhTrxa9RN6LLr
+                            RpLYZOZcH6nByQphxTfVOSkDLs3WJeFc2K7gCRqkpqlPTAm9OeE6Wcno6hhNjxY5
+                            NxWHm53FqUT4WF0Gq9XchBduW1xYJqJMHJW9seehiwaBgdhIewpHKyABf02yE3El
+                            nUmcVVJ7lujPxhn+iqts36Zv4cPQlhu1aMsFfep1DPqY3xo/bn4wM6ikKZpyVBZL
+                            4BVQn6WxHdflUXS7jjvkRXccz5Fb002jZP2ciyNDqZrLvc+ykRTaGbfv2+CD+1ik
+                            pCl5eVA8sM9j7OoD2qo0Hwqg72xdcZsXixxR9kItAKhlAgMBAAGjggF/MIIBezAf
+                            BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU/kRemvBq
+                            DKxXn7Lf1JA5x4cQGEswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
                             VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
                             MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
                             Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
                             dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-                            BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITc2Vy
-                            dml6aXdlYi51bml0by5pdDANBgkqhkiG9w0BAQUFAAOCAQEAhWmFJToQzrYj/Uwl
-                            qs/clWgOURj7pNLtlJiL21XLjwBSAoO6Ox4V5T6xwTpOnueYctmNFdK7I8j1u/1y
-                            DQwWk81sztxj9F8NKpY1OdVq8hRQ0H4LFfJ7hhc4xVkWobFZfIfyyJtfrk9DTaV4
-                            Xq/lyNvgH9Ged1GPDmLaqzvEZW30ZPqL9mULnEDDIoLmnD5WfsumO2UlN6Q+lMWC
-                            lHN+wFATPaPZvPYt12ps5OumiSpZ42FgdQMPEOeFkYNt0/87ez/c9wyI+pD1NFQw
-                            +cdP6e+25hKx4NUoRUr+Q8SaOLJ2xYDrs4nWjZFn5TLknCwU8ljoVGjzbyg+KaLh
-                            HU+UDg==
+                            BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwNwYDVR0RBDAwLoITc2Vy
+                            dml6aXdlYi51bml0by5pdIIXd3d3LnNlcnZpeml3ZWIudW5pdG8uaXQwDQYJKoZI
+                            hvcNAQEFBQADggEBADuNAc7xfGwb6H7Z5InKCocT/KqAD0as8oc7vjzLTIWKbrt/
+                            RZQ7QuFHuE6obQ7AhVUYaqWNqCTzErUvabGAYl8oe0tAPNiKSZ+GxLt4OkNacdE+
+                            FoYBP+DAB8H/BaZhUicXRJDxhxjxrGvqpvUl6BzK5aZEsK+un1ID4lBfb3CFHpQW
+                            4fX5uvhpk6cgXniW7oK6iUypnQisJQZsCXbCnoxVSGt1dvz3HeN1+54uYUyKcmp6
+                            wDTCNv5dHkAAUyiItyHFctIOgWocjGH+LYNfnSZChgF49Tjj0o+j/av6yu26pQvj
+                            BUULpqM3xZG1Zi261ZLtbXQz0AKsk7OnPBSDDI0=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgDCCA2igAwIBAgIRAI23y9ITrv6V83fVgnk6IS0wDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDA5MjAwMDAwMDBaFw0xMzA5MTkyMzU5NTlaMFcxCzAJBgNVBAYTAklUMSowKAYDVQQKDCFVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBUb3Jpbm8xHDAaBgNVBAMTE3NlcnZpeml3ZWIudW5pdG8uaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYkhN1NRqrtcwJFbOnfXDkQ2jt2W6RKLlu92y32YOa6tpdTt/79tKgwu/LBKsxfkDqpgSUCvDF6nMZtRXT+slDvLSTDNDlmR5qZNfvX2NJEKyoUmkx/dwUiBdQStRI6xyRqFYOYUBMzazcNwmDBsHP95ehvPNm7Elizy+1q+NBc81vhwn0d3pDjTss3XwTKupzMvIvFD+IumMPLNXwGM6xoIpQDcs5xgZixepu5c0wCxcDraqezCn8Wf+ZcIGnEPAW95lRvZzRmEAKzvbay/5kLdq0ZhCqFMNaKtU0nNjF2RnoYeRA2Xpl4hj8vKzfN8cCjZP7ZA8so0y0nzZjtL8hAgMBAAGjggFmMIIBYjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8PHbME7xlHVkY1LYPThdV2ejntAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITc2Vydml6aXdlYi51bml0by5pdDANBgkqhkiG9w0BAQUFAAOCAQEAhWmFJToQzrYj/Uwlqs/clWgOURj7pNLtlJiL21XLjwBSAoO6Ox4V5T6xwTpOnueYctmNFdK7I8j1u/1yDQwWk81sztxj9F8NKpY1OdVq8hRQ0H4LFfJ7hhc4xVkWobFZfIfyyJtfrk9DTaV4Xq/lyNvgH9Ged1GPDmLaqzvEZW30ZPqL9mULnEDDIoLmnD5WfsumO2UlN6Q+lMWClHN+wFATPaPZvPYt12ps5OumiSpZ42FgdQMPEOeFkYNt0/87ez/c9wyI+pD1NFQw+cdP6e+25hKx4NUoRUr+Q8SaOLJ2xYDrs4nWjZFn5TLknCwU8ljoVGjzbyg+KaLhHU+UDg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
diff --git a/swamid-interfederations-2.0/forge.switch.ch.xml b/swamid-interfederations-2.0/forge.switch.ch.xml
index e0635ba7..bbf5b688 100644
--- a/swamid-interfederations-2.0/forge.switch.ch.xml
+++ b/swamid-interfederations-2.0/forge.switch.ch.xml
@@ -69,8 +69,14 @@ D5s3OfoyrsZf5VHSjcxoteZ+NQBmcCgYkgjzXQ==
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">SWITCH</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.switch.ch/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>SWITCHaai</GivenName>
diff --git a/swamid-interfederations-2.0/gigamove.rz.rwth-aachen.de.xml b/swamid-interfederations-2.0/gigamove.rz.rwth-aachen.de.xml
deleted file mode 100644
index ea9e9234..00000000
--- a/swamid-interfederations-2.0/gigamove.rz.rwth-aachen.de.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gigamove.rz.rwth-aachen.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>gigamove.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gigamove.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentrum\, Rechen- und Datendienste,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEEGUc0TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0xMDA3MjAxMzA2
-MTBaFw0xNTA3MTkxMzA2MTBaMIG9MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjFEMEIGA1UECxM7UmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-cnVtLCBSZWNoZW4tIHVuZCBEYXRlbmRpZW5zdGUxIzAhBgNVBAMTGmdpZ2Ftb3Zl
-LnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAw5oSNnj5OnksH17vLiIW4eVaISVecF9k7N933dASblf0sIPlim/xt7+l1+GA
-wlXL76sphwDlyStV0ksEDqVgmiAmxyWVdU2qqz/c/wzEfXbz4g5b3nOLliNhLIZH
-JlQ6eej/bdnFFNWdYmV6N1i5qSRQ6lM68gLb0MxYXQtby49pG49+XbwLhYk1tadr
-pfOee5JcKo90fD+TE7aisYbu+DWqFP3YuH3ozn5+XLc2blE1f31McZ7x4cxF/T2D
-VMQwgP9zJ7lWftC7+yNFlbxf9L1Ll/U872KEr8M3zr0VQ4MMYaLuF5xTT6uJQtBr
-K2+Sy28eorNi25OdbkFjdoNd8wIDAQABo4IBtzCCAbMwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBQBcFna0WNtKjKrTFh/vGa85+ZrVzAfBgNVHSMEGDAWgBRu1T7AHC9xyTy/SU7v
-alVI7NHyODAoBgNVHREEITAfgR1zZXJ2aWNlZGVza0Byei5yd3RoLWFhY2hlbi5k
-ZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAKtXbuQ2IhWlCUGkC5UgBxG70j0msyu+Pe+cFTtmRoEw8Cxh2lmFAIhv
-vlsxRaRCkAAxmL+pUAHXr8t8OSUloGQMmr4DcSQaObT7hiVnWXrdEq1QDFjKYRTw
-YVa32GVMFN4GnzsBlsRnCnJF0fMmXUn/b3vTgWOads4WXDdycbKwMpuEN6QEMxBF
-bFmgAMCYkqD4/r4LeQPNv3AnyAQhCsjNqdjiThfbrSQra5h3PCPh1FfRdZl1r64i
-60zjipJhnGIWeUyKy6GF4xi5+SggN4h2piODLAAkpXslD0wR1v5Jms33iOZ1Q4No
-z1aY/8rMNVvOdeJ6ZFHEsAEMV6ZruCY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>gigamove.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gigamove.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentrum\, Rechen- und Datendienste,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEEGUc0TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0xMDA3MjAxMzA2
-MTBaFw0xNTA3MTkxMzA2MTBaMIG9MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjFEMEIGA1UECxM7UmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-cnVtLCBSZWNoZW4tIHVuZCBEYXRlbmRpZW5zdGUxIzAhBgNVBAMTGmdpZ2Ftb3Zl
-LnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAw5oSNnj5OnksH17vLiIW4eVaISVecF9k7N933dASblf0sIPlim/xt7+l1+GA
-wlXL76sphwDlyStV0ksEDqVgmiAmxyWVdU2qqz/c/wzEfXbz4g5b3nOLliNhLIZH
-JlQ6eej/bdnFFNWdYmV6N1i5qSRQ6lM68gLb0MxYXQtby49pG49+XbwLhYk1tadr
-pfOee5JcKo90fD+TE7aisYbu+DWqFP3YuH3ozn5+XLc2blE1f31McZ7x4cxF/T2D
-VMQwgP9zJ7lWftC7+yNFlbxf9L1Ll/U872KEr8M3zr0VQ4MMYaLuF5xTT6uJQtBr
-K2+Sy28eorNi25OdbkFjdoNd8wIDAQABo4IBtzCCAbMwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBQBcFna0WNtKjKrTFh/vGa85+ZrVzAfBgNVHSMEGDAWgBRu1T7AHC9xyTy/SU7v
-alVI7NHyODAoBgNVHREEITAfgR1zZXJ2aWNlZGVza0Byei5yd3RoLWFhY2hlbi5k
-ZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAKtXbuQ2IhWlCUGkC5UgBxG70j0msyu+Pe+cFTtmRoEw8Cxh2lmFAIhv
-vlsxRaRCkAAxmL+pUAHXr8t8OSUloGQMmr4DcSQaObT7hiVnWXrdEq1QDFjKYRTw
-YVa32GVMFN4GnzsBlsRnCnJF0fMmXUn/b3vTgWOads4WXDdycbKwMpuEN6QEMxBF
-bFmgAMCYkqD4/r4LeQPNv3AnyAQhCsjNqdjiThfbrSQra5h3PCPh1FfRdZl1r64i
-60zjipJhnGIWeUyKy6GF4xi5+SggN4h2piODLAAkpXslD0wR1v5Jms33iOZ1Q4No
-z1aY/8rMNVvOdeJ6ZFHEsAEMV6ZruCY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">RWTH Aachen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gigamove - RWTH Aachen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://gigamove.rz.rwth-aachen.de/help</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Guido</GivenName>
-    <SurName>Bunsen</SurName>
-    <EmailAddress>servicedesk@rz.rwth-aachen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gn-vho.grnet.gr.xml b/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
new file mode 100644
index 00000000..d2e39a60
--- /dev/null
+++ b/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://gn-vho.grnet.gr/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">
+                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">
+                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">gn-vho.grnet.gr</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">GN Virtual Home Organization (GN-VHO)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GN Virtual Home Organization (GN-VHO)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.noc.grnet.gr/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDHDCCAgSgAwIBAgIJAJMOS4lZGZTGMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+                            BAMTD2duLXZoby5ncm5ldC5ncjAeFw0xNDAzMDcxODI1MzNaFw0xOTAzMDYxODI1
+                            MzNaMBoxGDAWBgNVBAMTD2duLXZoby5ncm5ldC5ncjCCASIwDQYJKoZIhvcNAQEB
+                            BQADggEPADCCAQoCggEBAOh9S7NB2MuQqUBKOiEe05XHFCBBc9e6icfod97VFeug
+                            hdLsAZK/hpPAADzXQsKz2eHG3abRgxWUneQ7e8hSPCckGRG06FtbSI4zOitlx9id
+                            QHk1ah1vaVFLKiFdFhpqsE8Gjbb7FfA4cwXjMO4l8D4m3kFkKQk5x0Ok5EIumDlx
+                            RHPSRxIS6RsGE9y/xvCu+NNvc8zG6eSXrNLPgLHau3aNPY/NeYaV9UZg6pV8PlS4
+                            DbNLIg6U+rbYMBztRzfkHL5UTuykGwmECgKP7E/cajAS3siR6c7avkeMaqmdyCSt
+                            GB0JofKDSWEC+rIIMUafxM2JMpcmqDSe1a7gRij/Gk0CAwEAAaNlMGMwQgYDVR0R
+                            BDswOYIPZ24tdmhvLmdybmV0LmdyhiZodHRwczovL2duLXZoby5ncm5ldC5nci9p
+                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbS3VHThd6Vyhy9/Pki68p/j4ZRYwDQYJ
+                            KoZIhvcNAQEFBQADggEBAOMWzzekuxdAwdr8DY8tM6tCKjq/YRP70b9eKH3zwXWc
+                            XZZwcv57B7z1wwt/4eCLQai4bPIIAGnFJIr+LRV2hhy3HJZ/CtFs5LqYFP/OCaLa
+                            VbwyzBQMRwAy5Jbt7ikfc7P7BOPjQ1zQzTxkNUmWGXoTIkPJ4naSmNUV26WWSvA9
+                            15ZjygTLXMVwuOAFXhuBBU5AWfzfQa6nxlFUQ4NYw7ow4h73KWrVRRpXTV7U4g3s
+                            ytc1mR50M3dyL1uT7lpfSyTJ8fdzjSuw0xknlCY2rmOGq9RVPZwoz8ZP2xrVdcNW
+                            8Y/HvCvcXUMu/2w1Xei++WItO1eyS80x8+/VjQ7h+50=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gn-vho.grnet.gr/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">gn-vho.grnet.gr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDHDCCAgSgAwIBAgIJAJMOS4lZGZTGMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+                            BAMTD2duLXZoby5ncm5ldC5ncjAeFw0xNDAzMDcxODI1MzNaFw0xOTAzMDYxODI1
+                            MzNaMBoxGDAWBgNVBAMTD2duLXZoby5ncm5ldC5ncjCCASIwDQYJKoZIhvcNAQEB
+                            BQADggEPADCCAQoCggEBAOh9S7NB2MuQqUBKOiEe05XHFCBBc9e6icfod97VFeug
+                            hdLsAZK/hpPAADzXQsKz2eHG3abRgxWUneQ7e8hSPCckGRG06FtbSI4zOitlx9id
+                            QHk1ah1vaVFLKiFdFhpqsE8Gjbb7FfA4cwXjMO4l8D4m3kFkKQk5x0Ok5EIumDlx
+                            RHPSRxIS6RsGE9y/xvCu+NNvc8zG6eSXrNLPgLHau3aNPY/NeYaV9UZg6pV8PlS4
+                            DbNLIg6U+rbYMBztRzfkHL5UTuykGwmECgKP7E/cajAS3siR6c7avkeMaqmdyCSt
+                            GB0JofKDSWEC+rIIMUafxM2JMpcmqDSe1a7gRij/Gk0CAwEAAaNlMGMwQgYDVR0R
+                            BDswOYIPZ24tdmhvLmdybmV0LmdyhiZodHRwczovL2duLXZoby5ncm5ldC5nci9p
+                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbS3VHThd6Vyhy9/Pki68p/j4ZRYwDQYJ
+                            KoZIhvcNAQEFBQADggEBAOMWzzekuxdAwdr8DY8tM6tCKjq/YRP70b9eKH3zwXWc
+                            XZZwcv57B7z1wwt/4eCLQai4bPIIAGnFJIr+LRV2hhy3HJZ/CtFs5LqYFP/OCaLa
+                            VbwyzBQMRwAy5Jbt7ikfc7P7BOPjQ1zQzTxkNUmWGXoTIkPJ4naSmNUV26WWSvA9
+                            15ZjygTLXMVwuOAFXhuBBU5AWfzfQa6nxlFUQ4NYw7ow4h73KWrVRRpXTV7U4g3s
+                            ytc1mR50M3dyL1uT7lpfSyTJ8fdzjSuw0xknlCY2rmOGq9RVPZwoz8ZP2xrVdcNW
+                            8Y/HvCvcXUMu/2w1Xei++WItO1eyS80x8+/VjQ7h+50=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.noc.grnet.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">http://www.noc.grnet.gr/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Greek Research and Technology Network</Company>
+    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
+    <TelephoneNumber>800-11-47638</TelephoneNumber>
+    <TelephoneNumber>+30-2109569181</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Greek Research and Technology Network</Company>
+    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
+    <TelephoneNumber>800-11-47638</TelephoneNumber>
+    <TelephoneNumber>+30-2109569181</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.vse.cz.xml b/swamid-interfederations-2.0/id.vse.cz.xml
new file mode 100644
index 00000000..7bccf700
--- /dev/null
+++ b/swamid-interfederations-2.0/id.vse.cz.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://id.vse.cz/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">vse.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The University of Economics, Prague </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Vysoká škola ekonomická v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students of the University of Economics in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysoké školy ekonomické v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vse.cz/english/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vse.cz/</mdui:InformationURL>
+        <mdui:Logo height="132" width="132">https://www2.eduid.cz/idp-loga/vse.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFeTCCBGGgAwIBAgIRAKpU35QOH88wl+SzyHySIsswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMDkwMDAwMDBaFw0xMjEyMDgyMzU5NTlaME4xCzAJBgNV
+BAYTAkNaMSswKQYDVQQKDCJWeXNva8OhIMWha29sYSBla29ub21pY2vDoSB2IFBy
+YXplMRIwEAYDVQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQC6kapfLd+7SkIRHfvQT4q2vlP6pF9FOQY9ugoj2GRLRZUnnS7u7iwj
+07Y7ou/iORv38KEAAnDVmV706NtqD3nV8Ylx+ZueLrHQzMursJi244CzwpjBrdQV
+tB4R+2FRg40u1dE53JwSwt0U8/m9ldK9Jl5X7BmD99zD+2Yze7L/n/MD6ePi/kFj
+oA4boG+CR3icNoP94bfrCJfDAMS7cFSjahhGRwMpllrzRFksZeIh9WfFbXADCmfI
+hK2a27B7W2L+Zy01PrXrp25VmHr1fRY4oyF7P3RfV8hMQYzFOvjm3p071KP5R1Ty
+Xzg6BUsOKz72UqaQFdFugREdLzKD8neU8klSbfwsDP/juBXP//sX5Tmy9uqGvuu4
+whqG46A3PGZM5OSIHQIomegUnEOZxzC/7R+vOUXBqQlmpb5PHktcsP5li42YrTNI
+n4TJKWAJ0LTEbzp7jpGB0wKWhRQG5+8Rl7Jy150U70Mp7Mt2xQJ0eb1fBjdJ+RaS
+f5FoGD9qYc2wNFAgbmn7KXtauk20+7mglpY8iHSQU3g7s5c0Mfp+bdF+g2hFxgV4
+ktBPk77QLaIAzp/LUT7YRd2fYfkPtU+FbhEiUhr6ShnfcTc7vqSldStmxyMnSmLc
+nAAlptf4LUEeTZMp5G8PVaIRKzgR75ra2JV5p/7Ly2pcDNtPLfAcNwIDAQABo4IB
+aDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+FBDc10Bz+5lbkZAuFLO42eYQ7NDHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZ
+MBeCCWlkLnZzZS5jeoIKaWRwLnZzZS5jejANBgkqhkiG9w0BAQUFAAOCAQEAac/1
+SJIV2T4xTn9i6mmTl687tc53epK0ueOcQYIPOLPMgxH8vpJdwVoUIV79Wt7WM+n3
+3VSmxcEOciDXfZ4qU3XkihVENBReoIAmTxfFpovxjn8lXgxFFQRKfhzVmrJ+zopa
+NGHExZKSwYhwag0/eqkGWRKE66gm2+55jNi+f6XBHLv8MnqMJHmiagSOSTJddaoJ
+xb58EZkiWAqEod2pkfMFZllxRxQc9NT0AorjYyGB/X2bOCnMJpU0E/5mtliTFsT/
+lvoGQh2aycaAH5w55+lSscTvI7xdZpCa85p/av3xhv7XJmWhoGsRPPipYaGgWS7f
+iiF7bmvAPKF6y23wHA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.vse.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.vse.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.vse.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id.vse.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.vse.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">vse.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFeTCCBGGgAwIBAgIRAKpU35QOH88wl+SzyHySIsswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMDkwMDAwMDBaFw0xMjEyMDgyMzU5NTlaME4xCzAJBgNV
+BAYTAkNaMSswKQYDVQQKDCJWeXNva8OhIMWha29sYSBla29ub21pY2vDoSB2IFBy
+YXplMRIwEAYDVQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQC6kapfLd+7SkIRHfvQT4q2vlP6pF9FOQY9ugoj2GRLRZUnnS7u7iwj
+07Y7ou/iORv38KEAAnDVmV706NtqD3nV8Ylx+ZueLrHQzMursJi244CzwpjBrdQV
+tB4R+2FRg40u1dE53JwSwt0U8/m9ldK9Jl5X7BmD99zD+2Yze7L/n/MD6ePi/kFj
+oA4boG+CR3icNoP94bfrCJfDAMS7cFSjahhGRwMpllrzRFksZeIh9WfFbXADCmfI
+hK2a27B7W2L+Zy01PrXrp25VmHr1fRY4oyF7P3RfV8hMQYzFOvjm3p071KP5R1Ty
+Xzg6BUsOKz72UqaQFdFugREdLzKD8neU8klSbfwsDP/juBXP//sX5Tmy9uqGvuu4
+whqG46A3PGZM5OSIHQIomegUnEOZxzC/7R+vOUXBqQlmpb5PHktcsP5li42YrTNI
+n4TJKWAJ0LTEbzp7jpGB0wKWhRQG5+8Rl7Jy150U70Mp7Mt2xQJ0eb1fBjdJ+RaS
+f5FoGD9qYc2wNFAgbmn7KXtauk20+7mglpY8iHSQU3g7s5c0Mfp+bdF+g2hFxgV4
+ktBPk77QLaIAzp/LUT7YRd2fYfkPtU+FbhEiUhr6ShnfcTc7vqSldStmxyMnSmLc
+nAAlptf4LUEeTZMp5G8PVaIRKzgR75ra2JV5p/7Ly2pcDNtPLfAcNwIDAQABo4IB
+aDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+FBDc10Bz+5lbkZAuFLO42eYQ7NDHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZ
+MBeCCWlkLnZzZS5jeoIKaWRwLnZzZS5jejANBgkqhkiG9w0BAQUFAAOCAQEAac/1
+SJIV2T4xTn9i6mmTl687tc53epK0ueOcQYIPOLPMgxH8vpJdwVoUIV79Wt7WM+n3
+3VSmxcEOciDXfZ4qU3XkihVENBReoIAmTxfFpovxjn8lXgxFFQRKfhzVmrJ+zopa
+NGHExZKSwYhwag0/eqkGWRKE66gm2+55jNi+f6XBHLv8MnqMJHmiagSOSTJddaoJ
+xb58EZkiWAqEod2pkfMFZllxRxQc9NT0AorjYyGB/X2bOCnMJpU0E/5mtliTFsT/
+lvoGQh2aycaAH5w55+lSscTvI7xdZpCa85p/av3xhv7XJmWhoGsRPPipYaGgWS7f
+iiF7bmvAPKF6y23wHA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.vse.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="cs">Vysoká škola ekonomická v Praze</OrganizationName>
+    <OrganizationName xml:lang="en">University of Economics, Prague</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">Vysoká škola ekonomická v Praze</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Economics, Prague</OrganizationDisplayName>
+    <OrganizationURL xml:lang="cs">http://www.vse.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.vse.cz/english/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>František</GivenName>
+    <SurName>Kučera</SurName>
+    <EmailAddress>frantisek.kucera@vse.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.fu-berlin.de.xml b/swamid-interfederations-2.0/identity.fu-berlin.de.xml
deleted file mode 100644
index 849d596f..00000000
--- a/swamid-interfederations-2.0/identity.fu-berlin.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.fu-berlin.de/idp-fub">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
-cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
-AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
-KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
-MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
-A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
-MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
-mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
-VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
-nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
-g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
-Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
-pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
-FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
-MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
-RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
-rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
-PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
-57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
-LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
-5Av8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
-cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
-AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
-KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
-MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
-A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
-MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
-mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
-VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
-nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
-g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
-Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
-pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
-FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
-MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
-RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
-rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
-PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
-57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
-LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
-5Av8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.fu-berlin.de/idp-fub/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.fu-berlin.de/idp-fub/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.fu-berlin.de/idp-fub/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.fu-berlin.de/idp-fub/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
-cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
-AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
-KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
-MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
-A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
-MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
-mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
-VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
-nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
-g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
-Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
-pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
-FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
-MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
-RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
-rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
-PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
-57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
-LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
-5Av8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
-cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
-AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
-KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
-MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
-A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
-MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
-mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
-VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
-nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
-g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
-Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
-pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
-FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
-MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
-RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
-rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
-PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
-57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
-LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
-5Av8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Freie Universität Berlin</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Steffen</GivenName>
-    <SurName>Hofmann</SurName>
-    <EmailAddress>fudis@zedat.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hans</GivenName>
-    <SurName>Benedict</SurName>
-    <EmailAddress>fudis@zedat.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml b/swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml
deleted file mode 100644
index e6938423..00000000
--- a/swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idm.hrz.uni-kassel.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idm.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idm.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGcYVzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDc1MDMyWhcNMTMwNjA0MDc1
-MDMyWjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRt
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA3BD0wA5kA3SikAQ6YcM3F6neb0XSF5pjO3RHIXzzFIb8srPOsZdJKlZfM6CN
-dVbR7e19j4BkoKBvkjAvKqAcC3bw1vCZVh0m25Xm8XwrUGgefS+bkcVCN30ExAP7
-Xf1melL3UwFNUafkD6gAbtSnuHwpbn1xK0h3tT1BO0CzUPGUNw0Dpm5gEZ1GB65a
-mM4ZftaRo9KG52OPSIzXh5ENS6L/kI0S7Po7kSrQjNnt2OWZe6gdxNgZowxsNpnk
-JAsJYv1mIvLpQ3cmZGwKp7CQzAAqeYAbvUkxa/B+0Xpu4tkt67qhBI+Ci3poX5JR
-vc7sichzh/ndueq5/+ncwG9YwwIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBT2AJWxeDMJqYj+BZXkSuy4/AqT/zAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAGD5o
-yg5wbZkdaU/7yN6Z3Z/MBRRjWcHiEoMYBWcjVzJTYtEtvP0Eb6jQClW5m1BDs+G6
-D6O9e9FNXi26K3x/2QU6jwexkfd5vzrxwCTeJOW/9KiUq0xXcf7uc7sniGse4WhE
-oDhDaSGp+1f4yC6LFgdPggYIA4SK94mhDFIS6XoDQpAPU1fhENbxs1kb5bnvTmMe
-8lWIthsgEv4MBfoHBk+Ilb6zxjA/2GhTLRObQuthcxS2l5VFuThkoOv3QYobW5yu
-zcNFhgo8JRFEAH41DNd2QiwgwdfrQOqgWqUbJP4JZ2CyM7W9Aw9uPezzM4Aj8hFD
-GCdlg18LEvx13ba5EQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idm.hrz.uni-kassel.de/shibboleth-sp/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idm.hrz.uni-kassel.de/shibboleth-sp/Shibboleth.sso/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Kassel</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">idm.hrz.uni-kassel.de</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-kassel.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Zanger</SurName>
-    <EmailAddress>zanger@hrz.uni-kassel.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml b/swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml
deleted file mode 100644
index 62754f5c..00000000
--- a/swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-rt.ph-ludwigsburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rt.ph-ludwigsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
-gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
-BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
-2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
-tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
-tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
-DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
-wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
-9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
-gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
-RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
-OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
-1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
-zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
-bbuICC2tb/mG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
-gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
-BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
-2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
-tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
-tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
-DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
-wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
-9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
-gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
-RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
-OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
-1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
-zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
-bbuICC2tb/mG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rt.ph-ludwigsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
-gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
-BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
-2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
-tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
-tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
-DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
-wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
-9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
-gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
-RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
-OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
-1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
-zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
-bbuICC2tb/mG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
-gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
-BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
-2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
-tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
-tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
-DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
-wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
-9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
-gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
-RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
-OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
-1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
-zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
-bbuICC2tb/mG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH Ludwigsburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH Ludwigsburg - Campus Reutlingen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-ludwigsburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christoph</GivenName>
-    <SurName>List</SurName>
-    <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Eberhard</GivenName>
-    <SurName>Ostertag</SurName>
-    <EmailAddress>ostertag@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bsb-muenchen.de.xml b/swamid-interfederations-2.0/idp.bsb-muenchen.de.xml
deleted file mode 100644
index 5874bd26..00000000
--- a/swamid-interfederations-2.0/idp.bsb-muenchen.de.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bsb-muenchen.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">bsb-muenchen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.bsb-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.bsb-muenchen.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyzCCBLOgAwIBAgIEDqnUpjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNVBAoT
-G0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJpc2No
-ZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG9w0B
-CQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMDkwODE4MDcyNDA2WhcNMTQwODE3
-MDcyNDA2WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UE
-BxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhl
-azEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRwwGgYDVQQD
-ExNpZHAuYnNiLW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAu10Ex/QDbubmYK1QWLogPhfddcwJGVyBH7lsuQ9okyOZ7dO4aw3re1Ls
-XFxWLtxGibDTotM0IuPzZ1up8K8YU22TJMmZEGkaGg1BOtv98und18UnHeR6FBUJ
-cjWrP/Id4uBQQRbrRuxbZaNQn/OAMiKfot+E0TeCUGyoobvrpMtzn7G33UhFpyLO
-GkyFC14hs/OA7KXpBNouRxYBc0wwUCFxBXZ1E5T9VgWF/x9KvcRKJTsSs/nATcBL
-mAbazCqBbh4yHf4w4WVgddQKergqzdFG1e8CqaQB+0B6Gu+TD/5RKjLM5N/vcjZE
-dtTMu/vVVWVDJcntAgUNv1xMnxJ65wIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBRSCVCYWkX6bfOd5rKzPx+gWDFMvzAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMh
-WhsqivOfMeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Ny
-bC9jYWNybC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJp
-c2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
-ygYIKwYBBQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABxaMl/VzI0WspTpteSwMtN3
-McavKK8g1O/hp7yL5ke+QNKS/rLcwbpNn0nZWSjY8Lu+CooyYlKtjT2vbCP2ZIgF
-PflxBL0K1IKuLSbQVYywpAhA9n3V4zWSYqusJgtCcrPQNC5ZSCbaLcdqWKhp5R2q
-xQzo7ZZnuN5FbV4tJJKILTq5LSVVGoAqc3dN+kEvsha+du9rMqY2ts0Y/iT/FaW/
-elX553R4xhOC0PPNdI8GjqXe/xUOVZPDXHzyeyX2651fJCvF2jlsi5dJBvzAHwcT
-3882V6QluB2+yQigVZFHih/MT03/XDkWQGzb/TdbD7RlKAcb7Ft8UP9ZTzXDXn8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://elektra-idp.bsb-muenchen.de:8443/shibboleth/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bsb-muenchen.de/shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">bsb-muenchen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.bsb-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.bsb-muenchen.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyzCCBLOgAwIBAgIEDqnUpjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNVBAoT
-G0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJpc2No
-ZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG9w0B
-CQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMDkwODE4MDcyNDA2WhcNMTQwODE3
-MDcyNDA2WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UE
-BxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhl
-azEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRwwGgYDVQQD
-ExNpZHAuYnNiLW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAu10Ex/QDbubmYK1QWLogPhfddcwJGVyBH7lsuQ9okyOZ7dO4aw3re1Ls
-XFxWLtxGibDTotM0IuPzZ1up8K8YU22TJMmZEGkaGg1BOtv98und18UnHeR6FBUJ
-cjWrP/Id4uBQQRbrRuxbZaNQn/OAMiKfot+E0TeCUGyoobvrpMtzn7G33UhFpyLO
-GkyFC14hs/OA7KXpBNouRxYBc0wwUCFxBXZ1E5T9VgWF/x9KvcRKJTsSs/nATcBL
-mAbazCqBbh4yHf4w4WVgddQKergqzdFG1e8CqaQB+0B6Gu+TD/5RKjLM5N/vcjZE
-dtTMu/vVVWVDJcntAgUNv1xMnxJ65wIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBRSCVCYWkX6bfOd5rKzPx+gWDFMvzAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMh
-WhsqivOfMeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Ny
-bC9jYWNybC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJp
-c2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
-ygYIKwYBBQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABxaMl/VzI0WspTpteSwMtN3
-McavKK8g1O/hp7yL5ke+QNKS/rLcwbpNn0nZWSjY8Lu+CooyYlKtjT2vbCP2ZIgF
-PflxBL0K1IKuLSbQVYywpAhA9n3V4zWSYqusJgtCcrPQNC5ZSCbaLcdqWKhp5R2q
-xQzo7ZZnuN5FbV4tJJKILTq5LSVVGoAqc3dN+kEvsha+du9rMqY2ts0Y/iT/FaW/
-elX553R4xhOC0PPNdI8GjqXe/xUOVZPDXHzyeyX2651fJCvF2jlsi5dJBvzAHwcT
-3882V6QluB2+yQigVZFHih/MT03/XDkWQGzb/TdbD7RlKAcb7Ft8UP9ZTzXDXn8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsb-muenchen.de:8443/shibboleth/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">BSB München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://elektra.bsb-muenchen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Wunderle</GivenName>
-    <SurName>Heinrich</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Wunderle</GivenName>
-    <SurName>Heinrich</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
new file mode 100644
index 00000000..2e3a2ed9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cardiff.ac.uk/shibboleth">
+  <!--
+		This is a Shibboleth IdP (running clustered with Terracotta 3.0) for Cardiff University.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-10-23T17:54:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cy">Prifysgol Caerdydd</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://static.cf.ac.uk/images/FAMLogos/cu-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="126" width="128">https://static.cf.ac.uk/images/FAMLogos/cu-logo-128x126.png</mdui:Logo>
+        <mdui:Logo height="62" width="64">https://static.cf.ac.uk/images/FAMLogos/cu-logo-64x62.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://static.cf.ac.uk/images/FAMLogos/cu-logo-80x60t.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>131.251.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>cardiff.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>cf.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.487626,-3.178638</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEpDCCA4ygAwIBAgIQOAB7zJmYDdlOs5pElATXjjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTExMDkxMjAwMDAwMFoXDTE0MDkxMTIzNTk1OVowgYIxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UE
+						ChMSQ2FyZGlmZiBVbml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2
+						aWNlczEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA2SV/o63uSLmPFh0y6isL9BrgViJ23SovxgwDzlQhshhiZ6nO
+						FxnnbrbVdwTAh63xgMSu5qDay6VSZF62sWVZQwLG9Cdi+eInp4F+eoAQhMztDutV
+						m4PVf5dwLjUG6flDQnFkVBgDqhn3oclVl/tiFR1U+lMMDR2+gW6i2AGUmNGstd5R
+						5AwjGHoguqBHeJ47VcD8UBIaGr4v+bmfsTyZBu9Z39OY7yZ0/XxUoI18kiX4NjwG
+						jf0YfMfbF1eUkF08Y6/lAt6lw5Es9QpUgcdylUzfWfYLduc8BiKMEahl78JzSe4Y
+						RIhksJvqioGgRQ12gePXM6jiL49kFcXq/8xdZwIDAQABo4IBXzCCAVswHwYDVR0j
+						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKrcERbDCnu2zOsc
+						LdMKrxqmKHVNMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5jZi5h
+						Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAhrYmmoW5OdIh78MzIBUjJGkTNJ2BWrB5
+						0IKjlP9Khup4Q6c86qEDWX/Go8t8bC6ab0YphnBulP/yUxcV4iopNZl3YwSyrYHX
+						dRJL68o3dsjlW5qIDq+Priug7/5C9PuxfdHGrRL3keBH/2rrOFf39hHuWBZmEMHj
+						HVqadsAqvJqwP4RUYi3BZ8fvi3QXBdvJlIriKn+2xUdZ3AF/6BMyi63lSWgLe8Lf
+						7n1IeJ61VKfNV2Tq9fFN+VZL1BBdOjoAW2UvoGGB5uvF+prMF9uUSs1zyIMlk5NI
+						BCZEbXB6ZmEupEmDR9Gztw2fvdSgXht3AjxW1+hV4ShOdi/LpYbkZg==                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk/idp/profile/SAML2/SOAP/ECP"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEpDCCA4ygAwIBAgIQOAB7zJmYDdlOs5pElATXjjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTExMDkxMjAwMDAwMFoXDTE0MDkxMTIzNTk1OVowgYIxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UE
+						ChMSQ2FyZGlmZiBVbml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2
+						aWNlczEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA2SV/o63uSLmPFh0y6isL9BrgViJ23SovxgwDzlQhshhiZ6nO
+						FxnnbrbVdwTAh63xgMSu5qDay6VSZF62sWVZQwLG9Cdi+eInp4F+eoAQhMztDutV
+						m4PVf5dwLjUG6flDQnFkVBgDqhn3oclVl/tiFR1U+lMMDR2+gW6i2AGUmNGstd5R
+						5AwjGHoguqBHeJ47VcD8UBIaGr4v+bmfsTyZBu9Z39OY7yZ0/XxUoI18kiX4NjwG
+						jf0YfMfbF1eUkF08Y6/lAt6lw5Es9QpUgcdylUzfWfYLduc8BiKMEahl78JzSe4Y
+						RIhksJvqioGgRQ12gePXM6jiL49kFcXq/8xdZwIDAQABo4IBXzCCAVswHwYDVR0j
+						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKrcERbDCnu2zOsc
+						LdMKrxqmKHVNMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5jZi5h
+						Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAhrYmmoW5OdIh78MzIBUjJGkTNJ2BWrB5
+						0IKjlP9Khup4Q6c86qEDWX/Go8t8bC6ab0YphnBulP/yUxcV4iopNZl3YwSyrYHX
+						dRJL68o3dsjlW5qIDq+Priug7/5C9PuxfdHGrRL3keBH/2rrOFf39hHuWBZmEMHj
+						HVqadsAqvJqwP4RUYi3BZ8fvi3QXBdvJlIriKn+2xUdZ3AF/6BMyi63lSWgLe8Lf
+						7n1IeJ61VKfNV2Tq9fFN+VZL1BBdOjoAW2UvoGGB5uvF+prMF9uUSs1zyIMlk5NI
+						BCZEbXB6ZmEupEmDR9Gztw2fvdSgXht3AjxW1+hV4ShOdi/LpYbkZg==                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Cardiff University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>The Athens Team</GivenName>
+    <EmailAddress>mailto:athens@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn-cert.de.xml b/swamid-interfederations-2.0/idp.dfn-cert.de.xml
deleted file mode 100644
index 882533f1..00000000
--- a/swamid-interfederations-2.0/idp.dfn-cert.de.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn-cert.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn-cert.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFAzCCA+ugAwIBAgIHE1nFqSIIizANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xMjAyMTQxMTQwMTBa
-Fw0xNzAyMTIxMTQwMTBaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VS
-VCBTZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiK
-vnbLnPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH
-7r1POSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5
-wgZrlZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiC
-vqZh3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7H
-Khni/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGj
-ggHgMIIB3DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8G
-A1UdIwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMIGjBgNVHR8EgZswgZgwSqBI
-oEaGRGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21i
-aC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3Js
-LmNybDCBvAYIKwYBBQUHAQEEga8wgawwVAYIKwYBBQUHMAKGSGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY2FjZXJ0
-L2dfY2FjZXJ0LmNydDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tY2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcSKzlUFeCSHaZZwzS1+SW57QtFICzLUef
-BKp/s1syyrCi9IwyASFvKz/xXf2F5GocDsOeChQEdqyNe36wn7zAS/jWl4HfuyHA
-3H/XkqI5F8uoAZbwANkY/D+nLEivSLYICnfGHc3a0ZlJxNgW4Sa4pK7uYaxnudeC
-WSq4tGkmKUohZqozTC516HM6q62Gx5aI1ue/kKz13sX6YXSKxx73HJTTz9G/OIqX
-DhbibRKIEWUj38LD1Ch27wnyhfkMZFrhDoqdGOpVK37+Y6vaIM3gvJsOaljzRONt
-qyOgc+RqwPzmxl8ZI0GATuXgNJ7wJWxULj9tonaiJEtKHHqN062f
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFAzCCA+ugAwIBAgIHE1nFqSIIizANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xMjAyMTQxMTQwMTBa
-Fw0xNzAyMTIxMTQwMTBaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VS
-VCBTZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiK
-vnbLnPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH
-7r1POSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5
-wgZrlZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiC
-vqZh3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7H
-Khni/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGj
-ggHgMIIB3DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8G
-A1UdIwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMIGjBgNVHR8EgZswgZgwSqBI
-oEaGRGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21i
-aC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3Js
-LmNybDCBvAYIKwYBBQUHAQEEga8wgawwVAYIKwYBBQUHMAKGSGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY2FjZXJ0
-L2dfY2FjZXJ0LmNydDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tY2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcSKzlUFeCSHaZZwzS1+SW57QtFICzLUef
-BKp/s1syyrCi9IwyASFvKz/xXf2F5GocDsOeChQEdqyNe36wn7zAS/jWl4HfuyHA
-3H/XkqI5F8uoAZbwANkY/D+nLEivSLYICnfGHc3a0ZlJxNgW4Sa4pK7uYaxnudeC
-WSq4tGkmKUohZqozTC516HM6q62Gx5aI1ue/kKz13sX6YXSKxx73HJTTz9G/OIqX
-DhbibRKIEWUj38LD1Ch27wnyhfkMZFrhDoqdGOpVK37+Y6vaIM3gvJsOaljzRONt
-qyOgc+RqwPzmxl8ZI0GATuXgNJ7wJWxULj9tonaiJEtKHHqN062f
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn-cert.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn-cert.de/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn-cert.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFAzCCA+ugAwIBAgIHE1nFqSIIizANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xMjAyMTQxMTQwMTBa
-Fw0xNzAyMTIxMTQwMTBaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VS
-VCBTZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiK
-vnbLnPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH
-7r1POSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5
-wgZrlZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiC
-vqZh3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7H
-Khni/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGj
-ggHgMIIB3DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8G
-A1UdIwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMIGjBgNVHR8EgZswgZgwSqBI
-oEaGRGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21i
-aC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3Js
-LmNybDCBvAYIKwYBBQUHAQEEga8wgawwVAYIKwYBBQUHMAKGSGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY2FjZXJ0
-L2dfY2FjZXJ0LmNydDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tY2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcSKzlUFeCSHaZZwzS1+SW57QtFICzLUef
-BKp/s1syyrCi9IwyASFvKz/xXf2F5GocDsOeChQEdqyNe36wn7zAS/jWl4HfuyHA
-3H/XkqI5F8uoAZbwANkY/D+nLEivSLYICnfGHc3a0ZlJxNgW4Sa4pK7uYaxnudeC
-WSq4tGkmKUohZqozTC516HM6q62Gx5aI1ue/kKz13sX6YXSKxx73HJTTz9G/OIqX
-DhbibRKIEWUj38LD1Ch27wnyhfkMZFrhDoqdGOpVK37+Y6vaIM3gvJsOaljzRONt
-qyOgc+RqwPzmxl8ZI0GATuXgNJ7wJWxULj9tonaiJEtKHHqN062f
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFAzCCA+ugAwIBAgIHE1nFqSIIizANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xMjAyMTQxMTQwMTBa
-Fw0xNzAyMTIxMTQwMTBaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VS
-VCBTZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiK
-vnbLnPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH
-7r1POSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5
-wgZrlZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiC
-vqZh3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7H
-Khni/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGj
-ggHgMIIB3DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8G
-A1UdIwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMIGjBgNVHR8EgZswgZgwSqBI
-oEaGRGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21i
-aC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3Js
-LmNybDCBvAYIKwYBBQUHAQEEga8wgawwVAYIKwYBBQUHMAKGSGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY2FjZXJ0
-L2dfY2FjZXJ0LmNydDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tY2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcSKzlUFeCSHaZZwzS1+SW57QtFICzLUef
-BKp/s1syyrCi9IwyASFvKz/xXf2F5GocDsOeChQEdqyNe36wn7zAS/jWl4HfuyHA
-3H/XkqI5F8uoAZbwANkY/D+nLEivSLYICnfGHc3a0ZlJxNgW4Sa4pK7uYaxnudeC
-WSq4tGkmKUohZqozTC516HM6q62Gx5aI1ue/kKz13sX6YXSKxx73HJTTz9G/OIqX
-DhbibRKIEWUj38LD1Ch27wnyhfkMZFrhDoqdGOpVK37+Y6vaIM3gvJsOaljzRONt
-qyOgc+RqwPzmxl8ZI0GATuXgNJ7wJWxULj9tonaiJEtKHHqN062f
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DFN-CERT Services GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DFN-CERT Services GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dfn-cert.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Reimer</GivenName>
-    <SurName>Karlsen-Masur</SurName>
-    <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Reimer</GivenName>
-    <SurName>Karlsen-Masur</SurName>
-    <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dhbw-loerrach.de.xml b/swamid-interfederations-2.0/idp.dhbw-loerrach.de.xml
deleted file mode 100644
index fc9e757e..00000000
--- a/swamid-interfederations-2.0/idp.dhbw-loerrach.de.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dhbw-loerrach.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-loerrach.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
-MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
-POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
-31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
-i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
-LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
-eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
-AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
-aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
-cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
-AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
-tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
-NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
-sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
-LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
-B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
-MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
-POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
-31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
-i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
-LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
-eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
-AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
-aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
-cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
-AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
-tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
-NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
-sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
-LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
-B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dhbw-loerrach.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dhbw-loerrach.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dhbw-loerrach.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dhbw-loerrach.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-loerrach.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
-MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
-POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
-31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
-i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
-LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
-eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
-AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
-aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
-cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
-AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
-tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
-NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
-sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
-LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
-B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
-MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
-POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
-31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
-i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
-LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
-eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
-AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
-aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
-cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
-AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
-tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
-NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
-sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
-LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
-B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DHBW Lörrach</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW Lörrach</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-loerrach.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Schwindt</SurName>
-    <EmailAddress>schwindt@dhbw-loerrach.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml b/swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml
deleted file mode 100644
index c71fe6c8..00000000
--- a/swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dhbw-mannheim.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIED5oe9DANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTYxMzQ1MDhaFw0xNTAy
-MTUxMzQ1MDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4HcD6iRl82cDFmVIXVWrt0
-B3mdaeXvAjMwhPP9fwYrjseqCHdB6tGwpM7qGqDqn4oH2cm84Oe5LgsfNEl/de86
-FmG+uwlSO34ztqmgm0fbvssrYUUXDW5sHBdLEcVYfuE7F9FziZ319OAyMfDr0TzA
-QuTx6EskDQi3z6VQDSKd4ecukdzJlPqWXqKSyPgLmBx7cAgi9wLefywxj8MdIy6w
-wYn7EXr2VqxO4FyENLYP3sE4X7OI9cQnjZNpmumMtbYMBsmPlvBrb4zTIBvdeddT
-vnDsAGJnRBwUCSnLSCh181LUd3EouygVKpBC0p1x80x0KLMCAjlrolAKCw8kKRkC
-AwEAAaOCAeUwggHhMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEBW5zFwFRcHimyV0gzL/04l/
-EpUwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswJwYDVR0RBCAwHoEc
-YWFpX3RlY2huaWtAZGhidy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
-hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
-YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
-MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAMaLUWMFvevF1ZcYO+TMm
-ShhWkK7DiZqZ34K/4yqLVZc3JphztPT4ROohQz7xxkAcE8JOiieJCUnGGv4j7q1Z
-u7Enek/8VtFZBCXl/LiE3hH0KNaDEgRS4J+T0slTMGJxNqgPgy09A4xYlXUhznKt
-zFz46kMafDW0djOIzvvaMfkYqd6Px5gjJPiHUfVRMhhMspRSHTAp5aLMhBhznpPo
-7daIwVJjyoLxjm2E2aQ1ICC2uKy+q2qqeQZJB+LNbrYa0i/xtzToa4uD3jnqi/2H
-+hlMbJ6WpFHIBUd4Y1JfW7VEr4Ym1LtRPYYpfE7m0GrM7QPh5ph+YpC6uX2mlIZW
-Tw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dhbw-mannheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dhbw-mannheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dhbw-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dhbw-mannheim.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIED5oe9DANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTYxMzQ1MDhaFw0xNTAy
-MTUxMzQ1MDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4HcD6iRl82cDFmVIXVWrt0
-B3mdaeXvAjMwhPP9fwYrjseqCHdB6tGwpM7qGqDqn4oH2cm84Oe5LgsfNEl/de86
-FmG+uwlSO34ztqmgm0fbvssrYUUXDW5sHBdLEcVYfuE7F9FziZ319OAyMfDr0TzA
-QuTx6EskDQi3z6VQDSKd4ecukdzJlPqWXqKSyPgLmBx7cAgi9wLefywxj8MdIy6w
-wYn7EXr2VqxO4FyENLYP3sE4X7OI9cQnjZNpmumMtbYMBsmPlvBrb4zTIBvdeddT
-vnDsAGJnRBwUCSnLSCh181LUd3EouygVKpBC0p1x80x0KLMCAjlrolAKCw8kKRkC
-AwEAAaOCAeUwggHhMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEBW5zFwFRcHimyV0gzL/04l/
-EpUwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswJwYDVR0RBCAwHoEc
-YWFpX3RlY2huaWtAZGhidy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
-hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
-YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
-MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAMaLUWMFvevF1ZcYO+TMm
-ShhWkK7DiZqZ34K/4yqLVZc3JphztPT4ROohQz7xxkAcE8JOiieJCUnGGv4j7q1Z
-u7Enek/8VtFZBCXl/LiE3hH0KNaDEgRS4J+T0slTMGJxNqgPgy09A4xYlXUhznKt
-zFz46kMafDW0djOIzvvaMfkYqd6Px5gjJPiHUfVRMhhMspRSHTAp5aLMhBhznpPo
-7daIwVJjyoLxjm2E2aQ1ICC2uKy+q2qqeQZJB+LNbrYa0i/xtzToa4uD3jnqi/2H
-+hlMbJ6WpFHIBUd4Y1JfW7VEr4Ym1LtRPYYpfE7m0GrM7QPh5ph+YpC6uX2mlIZW
-Tw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DHBW Mannheim IDP</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW Mannheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-mannheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthias</GivenName>
-    <SurName>Weinbrenner</SurName>
-    <EmailAddress>weinbrenner@dhbw-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dhbw-vs.de.xml b/swamid-interfederations-2.0/idp.dhbw-vs.de.xml
deleted file mode 100644
index c6fdf443..00000000
--- a/swamid-interfederations-2.0/idp.dhbw-vs.de.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dhbw-vs.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-vs.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
-ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
-L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
-7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
-z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
-DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
-vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
-Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
-aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
-zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
-xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
-BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
-9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
-WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
-uxD/wQ4p7Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
-ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
-L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
-7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
-z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
-DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
-vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
-Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
-aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
-zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
-xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
-BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
-9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
-WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
-uxD/wQ4p7Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dhbw-vs.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dhbw-vs.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dhbw-vs.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dhbw-vs.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-vs.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
-ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
-L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
-7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
-z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
-DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
-vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
-Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
-aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
-zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
-xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
-BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
-9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
-WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
-uxD/wQ4p7Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
-ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
-L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
-7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
-z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
-DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
-vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
-Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
-aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
-zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
-xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
-BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
-9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
-WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
-uxD/wQ4p7Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Duale Hochschule BW</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW-VS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-vs.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Speck</SurName>
-    <EmailAddress>Thomas.Speck@dhbw-vs.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dlr.de.xml b/swamid-interfederations-2.0/idp.dlr.de.xml
deleted file mode 100644
index 420d10b1..00000000
--- a/swamid-interfederations-2.0/idp.dlr.de.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dlr.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dlr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dlr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dlr.de,O=Deutsches Zentrum fuer Luft- und Raumfahrt e.V. (DLR),C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEC8u/fjANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTE+MDwGA1UEChM1RGV1dHNjaGVzIFplbnRydW0gZnVlciBMdWZ0LSB1bmQgUmF1
-bWZhaHJ0IGUuVi4gKERMUikxFTATBgNVBAMTDERMUiBDQSAtIEcwMjEYMBYGCSqG
-SIb3DQEJARYJY2FAZGxyLmRlMB4XDTA4MDIwODExNTAwN1oXDTEzMDIwNjExNTAw
-N1owYjELMAkGA1UEBhMCREUxPjA8BgNVBAoTNURldXRzY2hlcyBaZW50cnVtIGZ1
-ZXIgTHVmdC0gdW5kIFJhdW1mYWhydCBlLlYuIChETFIpMRMwEQYDVQQDEwppZHAu
-ZGxyLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxh5rErO6Qlwc
-druGYlRGvcT9dWfHzsas2PJFWqhV/rftZbnWytSVVKhnFkuanBjf8L3J2eV19OW7
-WwX/rp+q5Pi/Z6JaMlP6fxUN/WTpk78g4+0OhRuoLV1KHdu15MoWs3783PlUcJgJ
-ct5WWj+xF7JHbhhNFDe+Rgvj8YxGDBPKP6P2Ut7CZn4NpVxdhklst9+f9atdeZIN
-X1V4o/T9cwzaCOGq/YQpwaelNPftQL+bafAvTti9VjU3mb2j3lE4PzqYYGOV+x6p
-zbo11okLeWqTxjojGPkMdN4N41fa7VFY2ePvI4vB1yMl5+GeK4U3DyVCQLW2QwW5
-qCA6JYbSlwIDAQABo4IBpzCCAaMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQRq/Omucsl/TzT
-65CUDwGldzWRKTAfBgNVHSMEGDAWgBRmoqXzRT2+lHczLTCbISj3/AwdtTAUBgNV
-HREEDTALgQlyYUBkbHIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDCB
-lgYIKwYBBQUHAQEEgYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZGxyLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
-hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rsci1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAEJI2dEuw0JLghN/WqQg5F/3hm+GK
-7O/JP1cumra0PUdRBRcNunqMKFQmZsXs+qOFhsHeYWK6mPfxqOUV7mXLRfintjLZ
-IyvfIEuJgQRL9ksiqs5M0aqdSfjueIdw969pyr2fINpY206EWnoj7w9ULFAEhNPv
-+8sezskmCtSdz67IoKMO/xeboHkXT/gzPwYtqgJUmGollv579ZETb2ILy67OKDAe
-yXbmklXUV0ItF6seXlz1/wtmShoUWmXh7pBLp2Dl/642X0PrsLv1fjCeOlvVHGIo
-HUbHHKBnr2VeUN5gxHUc2RJRuPhywCI8IfdyZP8YboU8BYMt6uE8SmIl3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dlr.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dlr.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dlr.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dlr.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dlr.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dlr.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dlr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dlr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dlr.de,O=Deutsches Zentrum fuer Luft- und Raumfahrt e.V. (DLR),C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEC8u/fjANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTE+MDwGA1UEChM1RGV1dHNjaGVzIFplbnRydW0gZnVlciBMdWZ0LSB1bmQgUmF1
-bWZhaHJ0IGUuVi4gKERMUikxFTATBgNVBAMTDERMUiBDQSAtIEcwMjEYMBYGCSqG
-SIb3DQEJARYJY2FAZGxyLmRlMB4XDTA4MDIwODExNTAwN1oXDTEzMDIwNjExNTAw
-N1owYjELMAkGA1UEBhMCREUxPjA8BgNVBAoTNURldXRzY2hlcyBaZW50cnVtIGZ1
-ZXIgTHVmdC0gdW5kIFJhdW1mYWhydCBlLlYuIChETFIpMRMwEQYDVQQDEwppZHAu
-ZGxyLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxh5rErO6Qlwc
-druGYlRGvcT9dWfHzsas2PJFWqhV/rftZbnWytSVVKhnFkuanBjf8L3J2eV19OW7
-WwX/rp+q5Pi/Z6JaMlP6fxUN/WTpk78g4+0OhRuoLV1KHdu15MoWs3783PlUcJgJ
-ct5WWj+xF7JHbhhNFDe+Rgvj8YxGDBPKP6P2Ut7CZn4NpVxdhklst9+f9atdeZIN
-X1V4o/T9cwzaCOGq/YQpwaelNPftQL+bafAvTti9VjU3mb2j3lE4PzqYYGOV+x6p
-zbo11okLeWqTxjojGPkMdN4N41fa7VFY2ePvI4vB1yMl5+GeK4U3DyVCQLW2QwW5
-qCA6JYbSlwIDAQABo4IBpzCCAaMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQRq/Omucsl/TzT
-65CUDwGldzWRKTAfBgNVHSMEGDAWgBRmoqXzRT2+lHczLTCbISj3/AwdtTAUBgNV
-HREEDTALgQlyYUBkbHIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDCB
-lgYIKwYBBQUHAQEEgYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZGxyLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
-hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rsci1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAEJI2dEuw0JLghN/WqQg5F/3hm+GK
-7O/JP1cumra0PUdRBRcNunqMKFQmZsXs+qOFhsHeYWK6mPfxqOUV7mXLRfintjLZ
-IyvfIEuJgQRL9ksiqs5M0aqdSfjueIdw969pyr2fINpY206EWnoj7w9ULFAEhNPv
-+8sezskmCtSdz67IoKMO/xeboHkXT/gzPwYtqgJUmGollv579ZETb2ILy67OKDAe
-yXbmklXUV0ItF6seXlz1/wtmShoUWmXh7pBLp2Dl/642X0PrsLv1fjCeOlvVHGIo
-HUbHHKBnr2VeUN5gxHUc2RJRuPhywCI8IfdyZP8YboU8BYMt6uE8SmIl3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dlr.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dlr.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DLR - Deutsches Zentrum fuer Luft- und Raumfahrt e.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DLR - Deutsches Zentrum fuer Luft- und Raumfahrt e.V.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dlr.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Gert</GivenName>
-    <SurName>Ohme</SurName>
-    <EmailAddress>Gert.Ohme@t-systems-sfr.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gert</GivenName>
-    <SurName>Ohme</SurName>
-    <EmailAddress>Gert.Ohme@t-systems-sfr.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ed.ac.uk.xml b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
index b3bf6219..0a96e7f9 100644
--- a/swamid-interfederations-2.0/idp.ed.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
@@ -90,6 +90,7 @@
   <Organization>
     <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
     <OrganizationDisplayName xml:lang="en">University of Edinburgh</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="gd">Oilthigh Dhùn Èideann</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index 928ccf15..f3b3a366 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -53,6 +53,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsberg.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidskog.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enebakk.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
@@ -78,6 +79,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
@@ -88,6 +90,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitjar.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
@@ -182,6 +185,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ldh.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leikanger.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leirfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lenvik.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lier.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lierne.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
@@ -232,6 +236,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ralingen.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rana.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">randaberg.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rauma.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml b/swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml
deleted file mode 100644
index 9d5f964d..00000000
--- a/swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-duesseldorf.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-duesseldorf.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
-BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
-MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
-MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
-Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
-BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
-FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
-VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
-C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
-Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
-kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
-KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
-T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
-ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
-Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
-ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
-q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
-VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
-8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
-7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
-PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
-HAfOyhCqg1OPKRSVyFh7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
-BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
-MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
-MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
-Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
-BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
-FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
-VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
-C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
-Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
-kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
-KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
-T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
-ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
-Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
-ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
-q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
-VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
-8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
-7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
-PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
-HAfOyhCqg1OPKRSVyFh7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-duesseldorf.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-duesseldorf.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-duesseldorf.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-duesseldorf.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-duesseldorf.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
-BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
-MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
-MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
-Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
-BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
-FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
-VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
-C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
-Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
-kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
-KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
-T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
-ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
-Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
-ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
-q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
-VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
-8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
-7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
-PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
-HAfOyhCqg1OPKRSVyFh7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
-BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
-MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
-MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
-Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
-BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
-FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
-VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
-C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
-Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
-kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
-KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
-T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
-ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
-Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
-ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
-q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
-VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
-8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
-7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
-PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
-HAfOyhCqg1OPKRSVyFh7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Fachhochschule Düsseldorf</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Fachhochschule Düsseldorf</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-duesseldorf.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Roland</GivenName>
-    <SurName>Conradshaus</SurName>
-    <EmailAddress>roland.conradshaus@fh-duesseldorf.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roland</GivenName>
-    <SurName>Conradshaus</SurName>
-    <EmailAddress>roland.conradshaus@fh-duesseldorf.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-offenburg.de.xml b/swamid-interfederations-2.0/idp.fh-offenburg.de.xml
deleted file mode 100644
index 7beab85d..00000000
--- a/swamid-interfederations-2.0/idp.fh-offenburg.de.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-offenburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-offenburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
-Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
-OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
-cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
-Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
-MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
-k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
-pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
-oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
-aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
-vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
-GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
-E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
-YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
-BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
-OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
-ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
-c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
-3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
-a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
-Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
-OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
-cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
-Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
-MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
-k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
-pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
-oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
-aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
-vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
-GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
-E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
-YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
-BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
-OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
-ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
-c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
-3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
-a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-offenburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-offenburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-offenburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-offenburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-offenburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
-Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
-OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
-cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
-Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
-MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
-k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
-pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
-oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
-aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
-vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
-GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
-E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
-YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
-BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
-OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
-ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
-c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
-3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
-a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
-Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
-OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
-cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
-Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
-MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
-k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
-pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
-oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
-aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
-vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
-GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
-E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
-YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
-BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
-OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
-ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
-c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
-3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
-a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Offenburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Offenburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-offenburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mirko</GivenName>
-    <SurName>Guldner</SurName>
-    <EmailAddress>guldner@fh-offenburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Obermann</SurName>
-    <EmailAddress>christian.obermann@fh-offenburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-trier.de.xml b/swamid-interfederations-2.0/idp.fh-trier.de.xml
deleted file mode 100644
index a454e314..00000000
--- a/swamid-interfederations-2.0/idp.fh-trier.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-trier.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-trier.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
-YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
-DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
-MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
-ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
-HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
-6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
-WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
-3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
-25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
-Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
-DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
-VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
-aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
-cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
-BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
-cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
-g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
-tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
-RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
-c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
-0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
-YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
-DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
-MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
-ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
-HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
-6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
-WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
-3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
-25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
-Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
-DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
-VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
-aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
-cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
-BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
-cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
-g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
-tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
-RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
-c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
-0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-trier.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-trier.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-trier.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-trier.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-trier.de/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-trier.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-trier.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
-YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
-DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
-MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
-ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
-HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
-6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
-WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
-3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
-25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
-Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
-DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
-VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
-aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
-cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
-BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
-cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
-g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
-tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
-RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
-c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
-0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
-YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
-DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
-MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
-ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
-HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
-6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
-WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
-3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
-25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
-Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
-DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
-VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
-aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
-cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
-BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
-cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
-g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
-tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
-RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
-c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
-0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-trier.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-trier.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Trier Rechenzentrum (r/ft)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Fachhochschule Trier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-trier.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Becker</SurName>
-    <EmailAddress>beckerr@fh-trier.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Becker</SurName>
-    <EmailAddress>beckerr@fh-trier.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fraunhofer.de.xml b/swamid-interfederations-2.0/idp.fraunhofer.de.xml
deleted file mode 100644
index b876867f..00000000
--- a/swamid-interfederations-2.0/idp.fraunhofer.de.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fraunhofer.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fraunhofer.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fraunhofer.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fraunhofer.de,OU=Services,O=Fraunhofer,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlzCCBH+gAwIBAgIKItv3iwAAAAAFZjANBgkqhkiG9w0BAQUFADBqMQswCQYD
-VQQGEwJERTETMBEGA1UEChMKRnJhdW5ob2ZlcjEhMB8GA1UECxMYRnJhdW5ob2Zl
-ciBDb3Jwb3JhdGUgUEtJMSMwIQYDVQQDExpGcmF1bmhvZmVyIFNlcnZpY2UgQ0Eg
-MjAwNzAeFw0wOTEwMTkxMjU4MzVaFw0xMjEwMTgxMjU4MzVaMFExCzAJBgNVBAYT
-AkRFMRMwEQYDVQQKEwpGcmF1bmhvZmVyMREwDwYDVQQLEwhTZXJ2aWNlczEaMBgG
-A1UEAxMRaWRwLmZyYXVuaG9mZXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDPUzd9s+oAZjXcRndTpxcQWCLnMdzWQxDgJKCcJpIi1Q8sy5fNF1g2
-8OHf265MI8CjVxE+aszRF6gon1EJ2xNB1JHWHIF5WPWXRpZ3eU7rZvD7Yg3Pn9Gx
-AknE/6VG6h9bETLdR83VrH9kNgrba6+Es/xmfBv+YIMNmwit6LG18bolUV2Yck3h
-KvvvjMjrabivBff+QvdbxkqNMJQDOJ/eKvpe9DF24xCdJH0xdAfgFBuLiN3LTW3z
-pN/if2bc5nBIcN6azpdfqAQKPwoQ3tj+kvY+7f7wTjjGgDqd6mYBDptwY5JGUSHP
-r7UVxDHWD2OSIdMc7CwoehroGAQXBnl5AgMBAAGjggJWMIICUjAdBgNVHQ4EFgQU
-Xbfs+lf4eVt4eeEXLUR3IrRQK7MwHwYDVR0jBBgwFoAUOE0MHcR3p7P4Z4bQGFGf
-WJ8eniUwewYDVR0fBHQwcjBwoG6gbIY0aHR0cDovL2NybC5wa2kuZnJhdW5ob2Zl
-ci5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybIY0aHR0cDovL2NybC5mcmF1bmhv
-ZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybDCCARgGCCsGAQUFBwEB
-BIIBCjCCAQYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZXJ0LnBraS5mcmF1bmhvZmVy
-LmRlL2ZoZy1zZXJ2aWNlLWNhLTIwMDcuY2VyMEEGCCsGAQUFBzAChjVodHRwOi8v
-Y2VydC5mcmF1bmhvZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNlcjA+
-BggrBgEFBQcwAYYyaHR0cDovL2ZoZy1zZXJ2aWNlLWNhLTIwMDcub2NzcC5wa2ku
-ZnJhdW5ob2Zlci5kZS8wPgYIKwYBBQUHMAGGMmh0dHA6Ly9maGctc2VydmljZS1j
-YS0yMDA3Lm9jc3AuZnJhdW5ob2Zlci1wa2kuZGUvMAwGA1UdEwEB/wQCMAAwDgYD
-VR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMEQGA1UdIAQ9MDswOQYL
-KwYBBAGGClADAQEwKjAoBggrBgEFBQcCARYcaHR0cDovL3BraS5mcmF1bmhvZmVy
-LmRlL2NwLzANBgkqhkiG9w0BAQUFAAOCAQEAFMT1W6HlRwoeSoqZu7LyWqPVAV0P
-8i3Mhv9x0By4hsXpekDivJTjkb8agXEY6180Pxwcw7fzNoNKPZNRxRSSojCFVQ85
-20EPKzuzWchsS+UxtPK9CzdobpzTFFfCsO3RAxOogYD6WvrjfOwsSQ2s3cgrEziy
-WX93W5Ff2rtSxwDqNnIgWOPfbkK5cQ233iSxsDAl1kiqpQbtlVqGo3flLeVbIeDJ
-DGTj0/pCHl9hInA7+4bNWtIWVgU/5yJKe/Tnqhve7CBWtne0sT7P55cgvd4eCPUB
-h+etu2WeqrKmqJBZ6ZSrvDWFkUHg7WprvPK2tGS+aNA3tpCDPdfh6wEoLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fraunhofer.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fraunhofer.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fraunhofer.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fraunhofer.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fraunhofer.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fraunhofer.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fraunhofer.de,OU=Services,O=Fraunhofer,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlzCCBH+gAwIBAgIKItv3iwAAAAAFZjANBgkqhkiG9w0BAQUFADBqMQswCQYD
-VQQGEwJERTETMBEGA1UEChMKRnJhdW5ob2ZlcjEhMB8GA1UECxMYRnJhdW5ob2Zl
-ciBDb3Jwb3JhdGUgUEtJMSMwIQYDVQQDExpGcmF1bmhvZmVyIFNlcnZpY2UgQ0Eg
-MjAwNzAeFw0wOTEwMTkxMjU4MzVaFw0xMjEwMTgxMjU4MzVaMFExCzAJBgNVBAYT
-AkRFMRMwEQYDVQQKEwpGcmF1bmhvZmVyMREwDwYDVQQLEwhTZXJ2aWNlczEaMBgG
-A1UEAxMRaWRwLmZyYXVuaG9mZXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDPUzd9s+oAZjXcRndTpxcQWCLnMdzWQxDgJKCcJpIi1Q8sy5fNF1g2
-8OHf265MI8CjVxE+aszRF6gon1EJ2xNB1JHWHIF5WPWXRpZ3eU7rZvD7Yg3Pn9Gx
-AknE/6VG6h9bETLdR83VrH9kNgrba6+Es/xmfBv+YIMNmwit6LG18bolUV2Yck3h
-KvvvjMjrabivBff+QvdbxkqNMJQDOJ/eKvpe9DF24xCdJH0xdAfgFBuLiN3LTW3z
-pN/if2bc5nBIcN6azpdfqAQKPwoQ3tj+kvY+7f7wTjjGgDqd6mYBDptwY5JGUSHP
-r7UVxDHWD2OSIdMc7CwoehroGAQXBnl5AgMBAAGjggJWMIICUjAdBgNVHQ4EFgQU
-Xbfs+lf4eVt4eeEXLUR3IrRQK7MwHwYDVR0jBBgwFoAUOE0MHcR3p7P4Z4bQGFGf
-WJ8eniUwewYDVR0fBHQwcjBwoG6gbIY0aHR0cDovL2NybC5wa2kuZnJhdW5ob2Zl
-ci5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybIY0aHR0cDovL2NybC5mcmF1bmhv
-ZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybDCCARgGCCsGAQUFBwEB
-BIIBCjCCAQYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZXJ0LnBraS5mcmF1bmhvZmVy
-LmRlL2ZoZy1zZXJ2aWNlLWNhLTIwMDcuY2VyMEEGCCsGAQUFBzAChjVodHRwOi8v
-Y2VydC5mcmF1bmhvZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNlcjA+
-BggrBgEFBQcwAYYyaHR0cDovL2ZoZy1zZXJ2aWNlLWNhLTIwMDcub2NzcC5wa2ku
-ZnJhdW5ob2Zlci5kZS8wPgYIKwYBBQUHMAGGMmh0dHA6Ly9maGctc2VydmljZS1j
-YS0yMDA3Lm9jc3AuZnJhdW5ob2Zlci1wa2kuZGUvMAwGA1UdEwEB/wQCMAAwDgYD
-VR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMEQGA1UdIAQ9MDswOQYL
-KwYBBAGGClADAQEwKjAoBggrBgEFBQcCARYcaHR0cDovL3BraS5mcmF1bmhvZmVy
-LmRlL2NwLzANBgkqhkiG9w0BAQUFAAOCAQEAFMT1W6HlRwoeSoqZu7LyWqPVAV0P
-8i3Mhv9x0By4hsXpekDivJTjkb8agXEY6180Pxwcw7fzNoNKPZNRxRSSojCFVQ85
-20EPKzuzWchsS+UxtPK9CzdobpzTFFfCsO3RAxOogYD6WvrjfOwsSQ2s3cgrEziy
-WX93W5Ff2rtSxwDqNnIgWOPfbkK5cQ233iSxsDAl1kiqpQbtlVqGo3flLeVbIeDJ
-DGTj0/pCHl9hInA7+4bNWtIWVgU/5yJKe/Tnqhve7CBWtne0sT7P55cgvd4eCPUB
-h+etu2WeqrKmqJBZ6ZSrvDWFkUHg7WprvPK2tGS+aNA3tpCDPdfh6wEoLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Fraunhofer-Gesellschaft</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Fraunhofer-Gesellschaft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fraunhofer.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Björn</GivenName>
-    <SurName>Vollmer</SurName>
-    <EmailAddress>bjoern.vollmer@zv.fraunhofer.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hebis.de.xml b/swamid-interfederations-2.0/idp.hebis.de.xml
deleted file mode 100644
index 74129dec..00000000
--- a/swamid-interfederations-2.0/idp.hebis.de.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hebis.de/uni-frankfurt">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-frankfurt.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hebis.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
-LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
-EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
-dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
-BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
-YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
-dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
-aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
-xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
-vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
-GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
-2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
-7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
-b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
-YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
-OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
-2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
-DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
-hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
-jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
-DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hebis.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
-LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
-EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
-dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
-BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
-YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
-dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
-aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
-xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
-vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
-GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
-2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
-7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
-b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
-YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
-OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
-2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
-DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
-hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
-jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
-DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hebis.de/uni-frankfurt/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hebis.de/uni-frankfurt/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hebis.de/uni-frankfurt/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hebis.de/uni-frankfurt/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-frankfurt.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hebis.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
-LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
-EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
-dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
-BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
-YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
-dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
-aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
-xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
-vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
-GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
-2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
-7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
-b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
-YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
-OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
-2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
-DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
-hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
-jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
-DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hebis.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
-LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
-EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
-dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
-BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
-YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
-dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
-aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
-xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
-vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
-GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
-2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
-7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
-b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
-YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
-OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
-2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
-DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
-hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
-jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
-DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Frankfurt am Main (Johann Wolfgang Goethe-Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Frankfurt</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-frankfurt.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Axel</GivenName>
-    <SurName>Dörrer</SurName>
-    <EmailAddress>doerrer@hebis.uni-frankfurt.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Axel</GivenName>
-    <SurName>Dörrer</SurName>
-    <EmailAddress>doerrer@hebis.uni-frankfurt.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hig.se.xml b/swamid-interfederations-2.0/idp.hig.se.xml
index 1fca3c64..f3915543 100644
--- a/swamid-interfederations-2.0/idp.hig.se.xml
+++ b/swamid-interfederations-2.0/idp.hig.se.xml
@@ -96,11 +96,13 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
   <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">HIG</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Högskolan i Gävle</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Gävle</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
   </Organization>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Högskolan i Gävle</Company>
-    <EmailAddress>anders.lordal@hig.se</EmailAddress>
+    <GivenName>Network</GivenName>
+    <SurName>Operations</SurName>
+    <EmailAddress>nat@hig.se</EmailAddress>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hochschule-bc.de.xml b/swamid-interfederations-2.0/idp.hochschule-bc.de.xml
deleted file mode 100644
index 3a653d33..00000000
--- a/swamid-interfederations-2.0/idp.hochschule-bc.de.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hochschule-bc.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hochschule-bc.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rz1ads.fh-biberach.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hochschule-bc.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hochschule-bc.de,OU=Rechenzentrum,O=Hochschule Biberach,L=Biberach,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIEEV0vSzANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIQmliZXJh
-Y2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUgQmliZXJhY2gxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xHTAbBgNVBAMTFEhCQy1HbG9iYWwgQ0EgLSBHIDAxMSEwHwYJKoZI
-hvcNAQkBFhJwa2lAZmgtYmliZXJhY2guZGUwHhcNMTEwMTI0MTcwNzA4WhcNMTYw
-MTIzMTcwNzA4WjCBkjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0
-dGVtYmVyZzERMA8GA1UEBxMIQmliZXJhY2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUg
-QmliZXJhY2gxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHTAbBgNVBAMTFGlkcC5o
-b2Noc2NodWxlLWJjLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-qtj8K4twdlFO6g3v+5yAWFmcQF2w3RB5dt6fUhF79dhb52jSWwqax/zhGjznGHsh
-cGa2ssx0Srbdd0q6B8pE4qj/6aj7Zwex/mUTZpn1ohvAxmtXhu8UorK42klm9NJV
-A/RSs1mNKqG1sMJIVVAxzJrQ0AcIfYVgkh5pY0tuzCWu2badGTdoiY5xzhy1jcGm
-zRZlWFUO/0iUlEPAZbIHbvqjDrEQ5I/O9AGEIoY2bS2ezEqIULPKXILdFLl/W5m6
-15ctpggBz3iIBZXMnmFNhWYsGGMwv+Q2poANbKlZFZBFsjwwa3DJ9YpNzJKyILgm
-16LqgL+fCGMGPOkvmLIgcwIDAQABo4IBzDCCAcgwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-8JgV2opFP3hcLzImHnukv6OGpjAfBgNVHSMEGDAWgBSREBR4GID92wzwllHKuEQz
-3ElITTAkBgNVHREEHTAbgRlzdHVldHpsZUBob2Noc2NodWxlLWJjLmRlMIGFBgNV
-HR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hiYy1nbG9iYWwt
-Y2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvaGJjLWdsb2JhbC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEE
-gZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGJjLWds
-b2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaGJjLWdsb2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE5WRkxDRsl5jqKwvJCgE4d223Q0n1Tm
-/6tcHlZRGF9U+xktoJbGW3RWMIEWlhO0fdRpF+5yNoYaCjWRsnb3cHT87RecdMCm
-dr2I3fqtuThgpyU+zfUJKfBBqBsp6bQzxxXqcDvnRuhs6AlFMs4s1TG7NyqAs91u
-jqqXuLDDqLvZ/sYxFbSf1CXga/ccJPds6NVnMjQgE4bh3FawgFkOD/YWwXjTKbFC
-T7JWbpKEY0A7BSZxatAiCiRYlZSQdvAed4gcD2u5exbUehy9H53yaNX/3Kq3W5Zs
-+rz+tAL97HDBS6P/Dla1hVADcTSuIrFu7C4rJ92NHkT4Ol5261esM9s=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hochschule-bc.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hochschule-bc.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hochschule-bc.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hochschule-bc.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hochschule-bc.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rz1ads.fh-biberach.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hochschule-bc.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hochschule-bc.de,OU=Rechenzentrum,O=Hochschule Biberach,L=Biberach,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIEEV0vSzANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIQmliZXJh
-Y2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUgQmliZXJhY2gxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xHTAbBgNVBAMTFEhCQy1HbG9iYWwgQ0EgLSBHIDAxMSEwHwYJKoZI
-hvcNAQkBFhJwa2lAZmgtYmliZXJhY2guZGUwHhcNMTEwMTI0MTcwNzA4WhcNMTYw
-MTIzMTcwNzA4WjCBkjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0
-dGVtYmVyZzERMA8GA1UEBxMIQmliZXJhY2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUg
-QmliZXJhY2gxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHTAbBgNVBAMTFGlkcC5o
-b2Noc2NodWxlLWJjLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-qtj8K4twdlFO6g3v+5yAWFmcQF2w3RB5dt6fUhF79dhb52jSWwqax/zhGjznGHsh
-cGa2ssx0Srbdd0q6B8pE4qj/6aj7Zwex/mUTZpn1ohvAxmtXhu8UorK42klm9NJV
-A/RSs1mNKqG1sMJIVVAxzJrQ0AcIfYVgkh5pY0tuzCWu2badGTdoiY5xzhy1jcGm
-zRZlWFUO/0iUlEPAZbIHbvqjDrEQ5I/O9AGEIoY2bS2ezEqIULPKXILdFLl/W5m6
-15ctpggBz3iIBZXMnmFNhWYsGGMwv+Q2poANbKlZFZBFsjwwa3DJ9YpNzJKyILgm
-16LqgL+fCGMGPOkvmLIgcwIDAQABo4IBzDCCAcgwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-8JgV2opFP3hcLzImHnukv6OGpjAfBgNVHSMEGDAWgBSREBR4GID92wzwllHKuEQz
-3ElITTAkBgNVHREEHTAbgRlzdHVldHpsZUBob2Noc2NodWxlLWJjLmRlMIGFBgNV
-HR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hiYy1nbG9iYWwt
-Y2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvaGJjLWdsb2JhbC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEE
-gZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGJjLWds
-b2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaGJjLWdsb2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE5WRkxDRsl5jqKwvJCgE4d223Q0n1Tm
-/6tcHlZRGF9U+xktoJbGW3RWMIEWlhO0fdRpF+5yNoYaCjWRsnb3cHT87RecdMCm
-dr2I3fqtuThgpyU+zfUJKfBBqBsp6bQzxxXqcDvnRuhs6AlFMs4s1TG7NyqAs91u
-jqqXuLDDqLvZ/sYxFbSf1CXga/ccJPds6NVnMjQgE4bh3FawgFkOD/YWwXjTKbFC
-T7JWbpKEY0A7BSZxatAiCiRYlZSQdvAed4gcD2u5exbUehy9H53yaNX/3Kq3W5Zs
-+rz+tAL97HDBS6P/Dla1hVADcTSuIrFu7C4rJ92NHkT4Ol5261esM9s=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Biberach</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Biberach</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hochschule-bc.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roland</GivenName>
-    <SurName>Forderer</SurName>
-    <EmailAddress>forderer@hochschule-bc.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DFN-AAI</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml b/swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml
deleted file mode 100644
index b1fb7c5f..00000000
--- a/swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hrz.uni-kassel.de/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hrz.uni-kassel.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-kassel.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
-NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
-lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
-gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
-fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
-pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
-9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
-akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
-6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
-E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
-WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
-dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
-NvJcsfo5OyQT/KjEqA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
-NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
-lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
-gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
-fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
-pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
-9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
-akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
-6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
-E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
-WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
-dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
-NvJcsfo5OyQT/KjEqA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hrz.uni-kassel.de:8443/shibboleth-idp/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hrz.uni-kassel.de/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hrz.uni-kassel.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-kassel.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
-NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
-lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
-gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
-fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
-pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
-9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
-akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
-6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
-E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
-WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
-dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
-NvJcsfo5OyQT/KjEqA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
-NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
-lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
-gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
-fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
-pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
-9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
-akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
-6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
-E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
-WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
-dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
-NvJcsfo5OyQT/KjEqA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hrz.uni-kassel.de:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Kassel</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Kassel</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-kassel.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Peter</GivenName>
-    <SurName>Zanger</SurName>
-    <EmailAddress>zanger@hrz.uni-kassel.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Zanger</SurName>
-    <EmailAddress>zanger@hrz.uni-kassel.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-harz.de.xml b/swamid-interfederations-2.0/idp.hs-harz.de.xml
deleted file mode 100644
index 71b89871..00000000
--- a/swamid-interfederations-2.0/idp.hs-harz.de.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-harz.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-harz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-harz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
-RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
-SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
-ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
-Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
-aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
-kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
-MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
-V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
-XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
-vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
-djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
-cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
-AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
-r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
-uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
-ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
-ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
-NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-harz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
-RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
-SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
-ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
-Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
-aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
-kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
-MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
-V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
-XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
-vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
-djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
-cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
-AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
-r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
-uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
-ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
-ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
-NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-harz.de/shibboleth/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-harz.de/shibboleth/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-harz.de/shibboleth/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-harz.de/shibboleth/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-harz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-harz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
-RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
-SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
-ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
-Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
-aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
-kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
-MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
-V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
-XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
-vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
-djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
-cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
-AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
-r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
-uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
-ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
-ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
-NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-harz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
-RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
-SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
-ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
-Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
-aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
-kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
-MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
-V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
-XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
-vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
-djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
-cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
-AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
-r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
-uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
-ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
-ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
-NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Harz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HS-Harz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-harz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Friedemann</GivenName>
-    <SurName>Hass</SurName>
-    <EmailAddress>fhass@hs-harz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sandra</GivenName>
-    <SurName>Thielert</SurName>
-    <EmailAddress>sthielert@hs-harz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-magdeburg.de.xml b/swamid-interfederations-2.0/idp.hs-magdeburg.de.xml
deleted file mode 100644
index 03d5560e..00000000
--- a/swamid-interfederations-2.0/idp.hs-magdeburg.de.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-magdeburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-magdeburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-magdeburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-magdeburg.de,OU=ZKI,O=Hochschule Magdeburg Stendal (FH),L=Magdeburg,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwzCCBKugAwIBAgIEEZQuNDANBgkqhkiG9w0BAQUFADCBtzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MRIwEAYDVQQHEwlNYWdkZWJ1cmcx
-KjAoBgNVBAoTIUhvY2hzY2h1bGUgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKTErMCkG
-A1UEAxMiSFMgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKSBDQSAtIEcwMTEiMCAGCSqG
-SIb3DQEJARYTcGtpQGhzLW1hZ2RlYnVyZy5kZTAeFw0xMTAzMDcxMDE3MDlaFw0x
-NjAzMDUxMDE3MDlaMIGSMQswCQYDVQQGEwJERTEXMBUGA1UECBMOU2FjaHNlbi1B
-bmhhbHQxEjAQBgNVBAcTCU1hZ2RlYnVyZzEqMCgGA1UEChMhSG9jaHNjaHVsZSBN
-YWdkZWJ1cmcgU3RlbmRhbCAoRkgpMQwwCgYDVQQLEwNaS0kxHDAaBgNVBAMTE2lk
-cC5ocy1tYWdkZWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCfWra0QxT7kYz3JZJ71Suvvz0SwJwXDmBkbGQAs0UQHlu5TSPQk/bKwx4/A6dg
-1KK3IQTnIa0lVzC6sWNTKIt0he4R88PbnxmexZviCqLrQpBshTJ/MhwshlmUP8N7
-1rf5qG8HwUmRj210gITgioc5HPX8nN77NU1PTS4MwwJOmyDKd20C9NpMXk1HudR0
-ZRcy1CuSixH9qNN7IWCIFGidqQe3i625OKnbLfiZ/SzjebhcmNmbipkdPeNMxuFF
-qb6oFsQk66Ij+xp8Suhky3Nzf7H/YizaMNsm5HxQQSMSvNNeZ+Jwod7VcvrTm+O1
-0u+P4AOGIfTHg8y6yJcBabTHAgMBAAGjggH4MIIB9DAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYE
-FB2AyfkgZTkk9/lbj6qo2Jh7/BAnMB8GA1UdIwQYMBaAFDm8cMweiB37HYTeozpy
-6gk3U3vjMCYGA1UdEQQfMB2BG3BldGVyLm1vZXJsQGhzLW1hZ2RlYnVyZy5kZTCB
-mwYDVR0fBIGTMIGQMEagRKBChkBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLW1h
-Z2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEagRKBChkBodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2hzLW1hZ2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIG0BggrBgEFBQcBAQSBpzCBpDBQBggrBgEFBQcwAoZEaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tYWdkZWJ1cmctc3RlbmRhbC1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwUAYIKwYBBQUHMAKGRGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvaHMtbWFnZGVidXJnLXN0ZW5kYWwtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR76NfHDFqHP2f4XVJbCF4swQV6G5fbjJb
-vnzJN9wMUeoCm07GqSquW8j0H2yvusM5jetU5rXjRizKzNkTL5JZ06odU4cyIWEH
-bvRcFU5ZW0o7S94F++QobaL/8p59ucBARaJGacOYPZNpVMIi4SxC5tuii+bmDkWN
-P/R44wJtNwihO8hRj3XybwP3NXKkhYCnxvq9kY719O0hJPC+HQvAtsMpOEI7D6sx
-38CdBNOOW8YSQbkMKJeeRxzrJy4SwpNvXLwznNVxz01SFNN8w/xeGgpgs+7aBEmK
-XnP7uBaLb4yttKtp2OPvZRMu9QtTFOH90Dk7A+HUF97T41tmJgnl
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-magdeburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-magdeburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-magdeburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-magdeburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-magdeburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-magdeburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-magdeburg.de,OU=ZKI,O=Hochschule Magdeburg Stendal (FH),L=Magdeburg,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwzCCBKugAwIBAgIEEZQuNDANBgkqhkiG9w0BAQUFADCBtzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MRIwEAYDVQQHEwlNYWdkZWJ1cmcx
-KjAoBgNVBAoTIUhvY2hzY2h1bGUgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKTErMCkG
-A1UEAxMiSFMgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKSBDQSAtIEcwMTEiMCAGCSqG
-SIb3DQEJARYTcGtpQGhzLW1hZ2RlYnVyZy5kZTAeFw0xMTAzMDcxMDE3MDlaFw0x
-NjAzMDUxMDE3MDlaMIGSMQswCQYDVQQGEwJERTEXMBUGA1UECBMOU2FjaHNlbi1B
-bmhhbHQxEjAQBgNVBAcTCU1hZ2RlYnVyZzEqMCgGA1UEChMhSG9jaHNjaHVsZSBN
-YWdkZWJ1cmcgU3RlbmRhbCAoRkgpMQwwCgYDVQQLEwNaS0kxHDAaBgNVBAMTE2lk
-cC5ocy1tYWdkZWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCfWra0QxT7kYz3JZJ71Suvvz0SwJwXDmBkbGQAs0UQHlu5TSPQk/bKwx4/A6dg
-1KK3IQTnIa0lVzC6sWNTKIt0he4R88PbnxmexZviCqLrQpBshTJ/MhwshlmUP8N7
-1rf5qG8HwUmRj210gITgioc5HPX8nN77NU1PTS4MwwJOmyDKd20C9NpMXk1HudR0
-ZRcy1CuSixH9qNN7IWCIFGidqQe3i625OKnbLfiZ/SzjebhcmNmbipkdPeNMxuFF
-qb6oFsQk66Ij+xp8Suhky3Nzf7H/YizaMNsm5HxQQSMSvNNeZ+Jwod7VcvrTm+O1
-0u+P4AOGIfTHg8y6yJcBabTHAgMBAAGjggH4MIIB9DAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYE
-FB2AyfkgZTkk9/lbj6qo2Jh7/BAnMB8GA1UdIwQYMBaAFDm8cMweiB37HYTeozpy
-6gk3U3vjMCYGA1UdEQQfMB2BG3BldGVyLm1vZXJsQGhzLW1hZ2RlYnVyZy5kZTCB
-mwYDVR0fBIGTMIGQMEagRKBChkBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLW1h
-Z2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEagRKBChkBodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2hzLW1hZ2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIG0BggrBgEFBQcBAQSBpzCBpDBQBggrBgEFBQcwAoZEaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tYWdkZWJ1cmctc3RlbmRhbC1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwUAYIKwYBBQUHMAKGRGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvaHMtbWFnZGVidXJnLXN0ZW5kYWwtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR76NfHDFqHP2f4XVJbCF4swQV6G5fbjJb
-vnzJN9wMUeoCm07GqSquW8j0H2yvusM5jetU5rXjRizKzNkTL5JZ06odU4cyIWEH
-bvRcFU5ZW0o7S94F++QobaL/8p59ucBARaJGacOYPZNpVMIi4SxC5tuii+bmDkWN
-P/R44wJtNwihO8hRj3XybwP3NXKkhYCnxvq9kY719O0hJPC+HQvAtsMpOEI7D6sx
-38CdBNOOW8YSQbkMKJeeRxzrJy4SwpNvXLwznNVxz01SFNN8w/xeGgpgs+7aBEmK
-XnP7uBaLb4yttKtp2OPvZRMu9QtTFOH90Dk7A+HUF97T41tmJgnl
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Magdeburg-Stendal</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Magdeburg-Stendal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-magdeburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Mörl</SurName>
-    <EmailAddress>peter.moerl@hs-magdeburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-ruhrwest.de.xml b/swamid-interfederations-2.0/idp.hs-ruhrwest.de.xml
deleted file mode 100644
index b1753d0f..00000000
--- a/swamid-interfederations-2.0/idp.hs-ruhrwest.de.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-ruhrwest.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-ruhrwest.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.hs-rw.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-ruhrwest.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-ruhrwest.de,O=Hochschule Ruhr West,L=Muelheim an der Ruhr,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1zCCBL+gAwIBAgIHEwAAF/HYlDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xHTAbBgNVBAcTFE11
-ZWxoZWltIGFuIGRlciBSdWhyMR0wGwYDVQQKExRIb2Noc2NodWxlIFJ1aHIgV2Vz
-dDETMBEGA1UECxMKSVQgU2VydmljZTEgMB4GA1UEAxMXSG9jaHNjaHVsZSBSdWhy
-IFdlc3QgQ0ExHTAbBgkqhkiG9w0BCQEWDmFkbWluQGhzLXJ3LmRlMB4XDTExMTIw
-ODA5MjUyN1oXDTE2MTIwNjA5MjUyN1owgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQI
-ExNOb3JkcmhlaW4tV2VzdGZhbGVuMR0wGwYDVQQHExRNdWVsaGVpbSBhbiBkZXIg
-UnVocjEdMBsGA1UEChMUSG9jaHNjaHVsZSBSdWhyIFdlc3QxGzAZBgNVBAMTEmlk
-cC5ocy1ydWhyd2VzdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIVwmo5PETA8/cS/ziw8SthhM5n7mW7g5k6H+u4yOYKuVmq+ewRnwjNlmfU6MeIZ
-t1IwuSLcYkqDVZdpE+1tZPH+44AC5bnll4lmUBGZNc1JGlj5u/PTEDfG8WvtesoK
-YLtqRDKpmiV1EFOUKcfG3pEur7k+4vckwqaS7bhW2tKsrsXzhpaTVn0wXrMk24vI
-kG1kTpfLGDPV6bs/DmCLXtP3JkVzyUswqISmWZK+QZhU8Bre+Y/kLxKGr/z5FytD
-8FBW0HwA9Ae5kxQvW6ascq2REWqSHEFhQmw0rqTM/DuwoNZjOAnCmaugAegRfHAy
-GmC7R49YrCttPCCztDrL+uMCAwEAAaOCAg0wggIJMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-pbNwG30kNLJJzYIJ9UYdSQhOQBUwHwYDVR0jBBgwFoAU7gxM+vyS0NqR5Prbdovf
-fG7Z/rEwWwYDVR0RBFQwUoISaWRwLmhzLXJ1aHJ3ZXN0LmRlggxpZHAuaHMtcncu
-ZGWCGXNoaWJib2xldGguaHMtcnVocndlc3QuZGWCE3NoaWJib2xldGguaHMtcncu
-ZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-cy1ydWhyLXdlc3QtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtcnVoci13ZXN0LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9ocy1ydWhyLXdlc3QtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLXJ1aHItd2VzdC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE0hP0U5
-NYA6R8nDfN3YAIGx42phaGKQ2Xv0sMvDwUosaRtq2vaBjQTAyO5MihfPRD0hDvbO
-faJei8av7Nxfz7GeDUXbKxaPcfLG2oQH+YzXNp3iPPMgcuBJb95GQ6VlFQbgxfl9
-5k1DHA0TDPlCLqqZGmd42zc1ug70/AOh022RDhSKHDoqpVKy814Bs3GZU5k+grkf
-Y3YQLaQZF3f4M1gTWsHnGw4VZL8xa6KJslb78KtHqOeIxqgx2z9VM97XWiyf6WgD
-nRJPHh1Pfo5p5bDFo94SbUKgOny5fQvPE7ZU8Y7Pw6WAN7gWn5wsm+5kykBbKsCQ
-SdioFUOZjcXImts=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-ruhrwest.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-ruhrwest.de,O=Hochschule Ruhr West,L=Muelheim an der Ruhr,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1zCCBL+gAwIBAgIHEwAAF/HYlDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xHTAbBgNVBAcTFE11
-ZWxoZWltIGFuIGRlciBSdWhyMR0wGwYDVQQKExRIb2Noc2NodWxlIFJ1aHIgV2Vz
-dDETMBEGA1UECxMKSVQgU2VydmljZTEgMB4GA1UEAxMXSG9jaHNjaHVsZSBSdWhy
-IFdlc3QgQ0ExHTAbBgkqhkiG9w0BCQEWDmFkbWluQGhzLXJ3LmRlMB4XDTExMTIw
-ODA5MjUyN1oXDTE2MTIwNjA5MjUyN1owgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQI
-ExNOb3JkcmhlaW4tV2VzdGZhbGVuMR0wGwYDVQQHExRNdWVsaGVpbSBhbiBkZXIg
-UnVocjEdMBsGA1UEChMUSG9jaHNjaHVsZSBSdWhyIFdlc3QxGzAZBgNVBAMTEmlk
-cC5ocy1ydWhyd2VzdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIVwmo5PETA8/cS/ziw8SthhM5n7mW7g5k6H+u4yOYKuVmq+ewRnwjNlmfU6MeIZ
-t1IwuSLcYkqDVZdpE+1tZPH+44AC5bnll4lmUBGZNc1JGlj5u/PTEDfG8WvtesoK
-YLtqRDKpmiV1EFOUKcfG3pEur7k+4vckwqaS7bhW2tKsrsXzhpaTVn0wXrMk24vI
-kG1kTpfLGDPV6bs/DmCLXtP3JkVzyUswqISmWZK+QZhU8Bre+Y/kLxKGr/z5FytD
-8FBW0HwA9Ae5kxQvW6ascq2REWqSHEFhQmw0rqTM/DuwoNZjOAnCmaugAegRfHAy
-GmC7R49YrCttPCCztDrL+uMCAwEAAaOCAg0wggIJMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-pbNwG30kNLJJzYIJ9UYdSQhOQBUwHwYDVR0jBBgwFoAU7gxM+vyS0NqR5Prbdovf
-fG7Z/rEwWwYDVR0RBFQwUoISaWRwLmhzLXJ1aHJ3ZXN0LmRlggxpZHAuaHMtcncu
-ZGWCGXNoaWJib2xldGguaHMtcnVocndlc3QuZGWCE3NoaWJib2xldGguaHMtcncu
-ZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-cy1ydWhyLXdlc3QtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtcnVoci13ZXN0LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9ocy1ydWhyLXdlc3QtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLXJ1aHItd2VzdC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE0hP0U5
-NYA6R8nDfN3YAIGx42phaGKQ2Xv0sMvDwUosaRtq2vaBjQTAyO5MihfPRD0hDvbO
-faJei8av7Nxfz7GeDUXbKxaPcfLG2oQH+YzXNp3iPPMgcuBJb95GQ6VlFQbgxfl9
-5k1DHA0TDPlCLqqZGmd42zc1ug70/AOh022RDhSKHDoqpVKy814Bs3GZU5k+grkf
-Y3YQLaQZF3f4M1gTWsHnGw4VZL8xa6KJslb78KtHqOeIxqgx2z9VM97XWiyf6WgD
-nRJPHh1Pfo5p5bDFo94SbUKgOny5fQvPE7ZU8Y7Pw6WAN7gWn5wsm+5kykBbKsCQ
-SdioFUOZjcXImts=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-ruhrwest.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-ruhrwest.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-ruhrwest.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-ruhrwest.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-ruhrwest.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-ruhrwest.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-ruhrwest.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.hs-rw.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-ruhrwest.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-ruhrwest.de,O=Hochschule Ruhr West,L=Muelheim an der Ruhr,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1zCCBL+gAwIBAgIHEwAAF/HYlDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xHTAbBgNVBAcTFE11
-ZWxoZWltIGFuIGRlciBSdWhyMR0wGwYDVQQKExRIb2Noc2NodWxlIFJ1aHIgV2Vz
-dDETMBEGA1UECxMKSVQgU2VydmljZTEgMB4GA1UEAxMXSG9jaHNjaHVsZSBSdWhy
-IFdlc3QgQ0ExHTAbBgkqhkiG9w0BCQEWDmFkbWluQGhzLXJ3LmRlMB4XDTExMTIw
-ODA5MjUyN1oXDTE2MTIwNjA5MjUyN1owgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQI
-ExNOb3JkcmhlaW4tV2VzdGZhbGVuMR0wGwYDVQQHExRNdWVsaGVpbSBhbiBkZXIg
-UnVocjEdMBsGA1UEChMUSG9jaHNjaHVsZSBSdWhyIFdlc3QxGzAZBgNVBAMTEmlk
-cC5ocy1ydWhyd2VzdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIVwmo5PETA8/cS/ziw8SthhM5n7mW7g5k6H+u4yOYKuVmq+ewRnwjNlmfU6MeIZ
-t1IwuSLcYkqDVZdpE+1tZPH+44AC5bnll4lmUBGZNc1JGlj5u/PTEDfG8WvtesoK
-YLtqRDKpmiV1EFOUKcfG3pEur7k+4vckwqaS7bhW2tKsrsXzhpaTVn0wXrMk24vI
-kG1kTpfLGDPV6bs/DmCLXtP3JkVzyUswqISmWZK+QZhU8Bre+Y/kLxKGr/z5FytD
-8FBW0HwA9Ae5kxQvW6ascq2REWqSHEFhQmw0rqTM/DuwoNZjOAnCmaugAegRfHAy
-GmC7R49YrCttPCCztDrL+uMCAwEAAaOCAg0wggIJMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-pbNwG30kNLJJzYIJ9UYdSQhOQBUwHwYDVR0jBBgwFoAU7gxM+vyS0NqR5Prbdovf
-fG7Z/rEwWwYDVR0RBFQwUoISaWRwLmhzLXJ1aHJ3ZXN0LmRlggxpZHAuaHMtcncu
-ZGWCGXNoaWJib2xldGguaHMtcnVocndlc3QuZGWCE3NoaWJib2xldGguaHMtcncu
-ZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-cy1ydWhyLXdlc3QtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtcnVoci13ZXN0LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9ocy1ydWhyLXdlc3QtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLXJ1aHItd2VzdC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE0hP0U5
-NYA6R8nDfN3YAIGx42phaGKQ2Xv0sMvDwUosaRtq2vaBjQTAyO5MihfPRD0hDvbO
-faJei8av7Nxfz7GeDUXbKxaPcfLG2oQH+YzXNp3iPPMgcuBJb95GQ6VlFQbgxfl9
-5k1DHA0TDPlCLqqZGmd42zc1ug70/AOh022RDhSKHDoqpVKy814Bs3GZU5k+grkf
-Y3YQLaQZF3f4M1gTWsHnGw4VZL8xa6KJslb78KtHqOeIxqgx2z9VM97XWiyf6WgD
-nRJPHh1Pfo5p5bDFo94SbUKgOny5fQvPE7ZU8Y7Pw6WAN7gWn5wsm+5kykBbKsCQ
-SdioFUOZjcXImts=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-ruhrwest.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-ruhrwest.de,O=Hochschule Ruhr West,L=Muelheim an der Ruhr,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1zCCBL+gAwIBAgIHEwAAF/HYlDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xHTAbBgNVBAcTFE11
-ZWxoZWltIGFuIGRlciBSdWhyMR0wGwYDVQQKExRIb2Noc2NodWxlIFJ1aHIgV2Vz
-dDETMBEGA1UECxMKSVQgU2VydmljZTEgMB4GA1UEAxMXSG9jaHNjaHVsZSBSdWhy
-IFdlc3QgQ0ExHTAbBgkqhkiG9w0BCQEWDmFkbWluQGhzLXJ3LmRlMB4XDTExMTIw
-ODA5MjUyN1oXDTE2MTIwNjA5MjUyN1owgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQI
-ExNOb3JkcmhlaW4tV2VzdGZhbGVuMR0wGwYDVQQHExRNdWVsaGVpbSBhbiBkZXIg
-UnVocjEdMBsGA1UEChMUSG9jaHNjaHVsZSBSdWhyIFdlc3QxGzAZBgNVBAMTEmlk
-cC5ocy1ydWhyd2VzdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIVwmo5PETA8/cS/ziw8SthhM5n7mW7g5k6H+u4yOYKuVmq+ewRnwjNlmfU6MeIZ
-t1IwuSLcYkqDVZdpE+1tZPH+44AC5bnll4lmUBGZNc1JGlj5u/PTEDfG8WvtesoK
-YLtqRDKpmiV1EFOUKcfG3pEur7k+4vckwqaS7bhW2tKsrsXzhpaTVn0wXrMk24vI
-kG1kTpfLGDPV6bs/DmCLXtP3JkVzyUswqISmWZK+QZhU8Bre+Y/kLxKGr/z5FytD
-8FBW0HwA9Ae5kxQvW6ascq2REWqSHEFhQmw0rqTM/DuwoNZjOAnCmaugAegRfHAy
-GmC7R49YrCttPCCztDrL+uMCAwEAAaOCAg0wggIJMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-pbNwG30kNLJJzYIJ9UYdSQhOQBUwHwYDVR0jBBgwFoAU7gxM+vyS0NqR5Prbdovf
-fG7Z/rEwWwYDVR0RBFQwUoISaWRwLmhzLXJ1aHJ3ZXN0LmRlggxpZHAuaHMtcncu
-ZGWCGXNoaWJib2xldGguaHMtcnVocndlc3QuZGWCE3NoaWJib2xldGguaHMtcncu
-ZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-cy1ydWhyLXdlc3QtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtcnVoci13ZXN0LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9ocy1ydWhyLXdlc3QtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLXJ1aHItd2VzdC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE0hP0U5
-NYA6R8nDfN3YAIGx42phaGKQ2Xv0sMvDwUosaRtq2vaBjQTAyO5MihfPRD0hDvbO
-faJei8av7Nxfz7GeDUXbKxaPcfLG2oQH+YzXNp3iPPMgcuBJb95GQ6VlFQbgxfl9
-5k1DHA0TDPlCLqqZGmd42zc1ug70/AOh022RDhSKHDoqpVKy814Bs3GZU5k+grkf
-Y3YQLaQZF3f4M1gTWsHnGw4VZL8xa6KJslb78KtHqOeIxqgx2z9VM97XWiyf6WgD
-nRJPHh1Pfo5p5bDFo94SbUKgOny5fQvPE7ZU8Y7Pw6WAN7gWn5wsm+5kykBbKsCQ
-SdioFUOZjcXImts=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-ruhrwest.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-ruhrwest.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Ruhr West</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Ruhr West</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-ruhrwest.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ossama</GivenName>
-    <SurName>El Abbadi</SurName>
-    <EmailAddress>ossama.elabbadi@hs-ruhrwest.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ossama</GivenName>
-    <SurName>El Abbadi</SurName>
-    <EmailAddress>ossama.elabbadi@hs-ruhrwest.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-zigr.de.xml b/swamid-interfederations-2.0/idp.hs-zigr.de.xml
deleted file mode 100644
index ad794ec7..00000000
--- a/swamid-interfederations-2.0/idp.hs-zigr.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-zigr.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-zigr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-zigr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-zigr.de,OU=HRZ,O=Hochschule Zittau/Goerlitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFKDCCBBCgAwIBAgIECvSmDDANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJE
-RTEjMCEGA1UEChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxEzARBgNVBAMT
-CkhTLVpJR1IgQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQGhzLXppZ3IuZGUwHhcNMDcw
-ODI5MDgwNDEzWhcNMTIwODI3MDgwNDEzWjBZMQswCQYDVQQGEwJERTEjMCEGA1UE
-ChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxDDAKBgNVBAsTA0hSWjEXMBUG
-A1UEAxMOaWRwLmhzLXppZ3IuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCnIYUEzUHEZUiynwccnpsDz/Op6yAxhy1qBiFzGTdgAdQIAw0XapeuzuIV
-kmVrJvxi4tQIl5PYTAJKT+FAVtehFAwZQKf+yDBZBS6UHfH0f1u0VkgSo8BwHm4g
-PyXETqXSsqB+BE4o+CiUF3YrY0xgY9FMGKvr++8kBuIWHSbg9OPQHmsYBO6tqd0x
-iSWSMikv+SyZfHZ6Ytic0/pM5Wx65fGBnGSIoClTR8L2RpJlmq42Ty8sHfqBXbCu
-fngagqvrOxrQWrcF8dTvp6ZcVCQYQRAd0gdDr+8HDW094s8xAT3UgESxmWR+GCW/
-LIe4fi9bQTWZrneS60YcDpidhj9zAgMBAAGjggHqMIIB5jAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFNHfYAxYCmo6FBhoBUJfKQcKV+WpMB8GA1UdIwQYMBaAFOgDhs9GD/aylS0Z
-IAlPiV5ZJKBHMCAGA1UdEQQZMBeBFXBvc3RtYXN0ZXJAaHMtemlnci5kZTCBlwYD
-VR0fBIGPMIGMMESgQqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXppdHRh
-dS1nb2VybGl0ei1jYS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9ocy16aXR0YXUtZ29lcmxpdHotY2EvcHViL2NybC9jYWNy
-bC5jcmwwgbAGCCsGAQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXppdHRhdS1nb2VybGl0ei1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwTgYIKwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMt
-eml0dGF1LWdvZXJsaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAV/Sc6U0LeqKCXNsbTN6WAc6NIfjxE+Znh753BGYiynMKsPXk
-alD64fU6xbLmETLBX0r/UG2ZCfrBp/v94TIFZ+vaQZz/1Qd4DJNjpnjbeA8PNS+C
-teZUgyHanXZue/rdjP7tHVz1B+DX9K1OcExTKDSeDdNzGGC4XN7nsZ71BrcjNPDI
-2cI8s5f1993EcyZE0p0HOM8siKfFaLOhw9KI5jaxr1Z/2EjX7Scm5BQo0SoaFinE
-QXENHu32fRyd0Lo1uO8SzFj16Lpkl2OvZ8v0KBMf6DYnKHAeZe4uVaAi17gphhSn
-olQBNYiM5GZ6vCysmKgMPSbwsQuXkRt8ohOSjg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-zigr.de/shibboleth-idp/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-zigr.de/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-zigr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-zigr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-zigr.de,OU=HRZ,O=Hochschule Zittau/Goerlitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFKDCCBBCgAwIBAgIECvSmDDANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJE
-RTEjMCEGA1UEChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxEzARBgNVBAMT
-CkhTLVpJR1IgQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQGhzLXppZ3IuZGUwHhcNMDcw
-ODI5MDgwNDEzWhcNMTIwODI3MDgwNDEzWjBZMQswCQYDVQQGEwJERTEjMCEGA1UE
-ChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxDDAKBgNVBAsTA0hSWjEXMBUG
-A1UEAxMOaWRwLmhzLXppZ3IuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCnIYUEzUHEZUiynwccnpsDz/Op6yAxhy1qBiFzGTdgAdQIAw0XapeuzuIV
-kmVrJvxi4tQIl5PYTAJKT+FAVtehFAwZQKf+yDBZBS6UHfH0f1u0VkgSo8BwHm4g
-PyXETqXSsqB+BE4o+CiUF3YrY0xgY9FMGKvr++8kBuIWHSbg9OPQHmsYBO6tqd0x
-iSWSMikv+SyZfHZ6Ytic0/pM5Wx65fGBnGSIoClTR8L2RpJlmq42Ty8sHfqBXbCu
-fngagqvrOxrQWrcF8dTvp6ZcVCQYQRAd0gdDr+8HDW094s8xAT3UgESxmWR+GCW/
-LIe4fi9bQTWZrneS60YcDpidhj9zAgMBAAGjggHqMIIB5jAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFNHfYAxYCmo6FBhoBUJfKQcKV+WpMB8GA1UdIwQYMBaAFOgDhs9GD/aylS0Z
-IAlPiV5ZJKBHMCAGA1UdEQQZMBeBFXBvc3RtYXN0ZXJAaHMtemlnci5kZTCBlwYD
-VR0fBIGPMIGMMESgQqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXppdHRh
-dS1nb2VybGl0ei1jYS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9ocy16aXR0YXUtZ29lcmxpdHotY2EvcHViL2NybC9jYWNy
-bC5jcmwwgbAGCCsGAQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXppdHRhdS1nb2VybGl0ei1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwTgYIKwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMt
-eml0dGF1LWdvZXJsaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAV/Sc6U0LeqKCXNsbTN6WAc6NIfjxE+Znh753BGYiynMKsPXk
-alD64fU6xbLmETLBX0r/UG2ZCfrBp/v94TIFZ+vaQZz/1Qd4DJNjpnjbeA8PNS+C
-teZUgyHanXZue/rdjP7tHVz1B+DX9K1OcExTKDSeDdNzGGC4XN7nsZ71BrcjNPDI
-2cI8s5f1993EcyZE0p0HOM8siKfFaLOhw9KI5jaxr1Z/2EjX7Scm5BQo0SoaFinE
-QXENHu32fRyd0Lo1uO8SzFj16Lpkl2OvZ8v0KBMf6DYnKHAeZe4uVaAi17gphhSn
-olQBNYiM5GZ6vCysmKgMPSbwsQuXkRt8ohOSjg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-zigr.de:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Zittau / Görlitz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Zittau/Goerlitz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-zigr.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Thomas</GivenName>
-    <SurName>Jaeger</SurName>
-    <EmailAddress>tjaeger@hs-zigr.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Jaeger</SurName>
-    <EmailAddress>tjaeger@hs-zigr.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.htwg-konstanz.de.xml b/swamid-interfederations-2.0/idp.htwg-konstanz.de.xml
deleted file mode 100644
index ec48a491..00000000
--- a/swamid-interfederations-2.0/idp.htwg-konstanz.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.htwg-konstanz.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">htwg-konstanz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.htwg-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.htwg-konstanz.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCTCCA/GgAwIBAgIED3krjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAxMjIxMzU0MDdaFw0xNTAx
-MjExMzU0MDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuaHR3Zy1rb25zdGFuei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCvB8y8jN5yPI18S2YaLk9+
-x8txqfITAVZrVBCb8u8F/bPMso3evG9om1qDeUPlJ8xIhyIsNFfKjWQSrP6EmiI9
-XZXL9Gm4xZhMmDgZ1+cLUViIYT/X+V62h3TKrgMvnzISVFvEZjxINgitV823DZRk
-7zWswOvwV/V4ilDwJRhx6jLCbrztltPMpjIxMFvJFVDvllfPxykg2xQP5rhGa1gn
-ezpWh/ESyeE1VRworNZYQINvUQdTIuJlpj3iSC+pQvldDScEuai4CgGYg6p7gCzG
-1sS7DJnytq5MUgtsduNpELzjFD2xtzQ/3LhsUf0ySpErSGAn5fKWg3Eab7K5NBUC
-AwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU+w/Cf4aHFawZhnChB+GawB41
-2Q4wHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIwYDVR0RBBwwGoEY
-c3RldWVydEBodHdnLWtvbnN0YW56LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZow
-SwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
-Y2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAax3k4gqD7d5XAwDWmPs0oPCwW
-DgEofj++OOyp+LqVmayARGMWo501Xew1p/TX1XSRYWKiya+B+qTca7EmI/yThn8v
-yhadmTYazbcZndMv9QScDIVpO1+TdSrPgIF2mL5a+eiI8jNa8PIu04vSGUU5lw52
-i2qcqy905Ip5EmeLUl+ZF3Evy3bFQPcbMHKbTz3Pp3wEnlzH4nv5IaAwOjGhCBCu
-wlDZxietS5h6mhn+0BSBa65u0e8tTzoJn1ZehI0f8lFZTkRTSyPw4J3FPi8aLGvb
-qKa8zt6MpiiTn10CDGdvLnRJ/CzTDL1DZgeCLm4nxZg5CdiYzpWxAaDoHOlV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.htwg-konstanz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.htwg-konstanz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.htwg-konstanz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.htwg-konstanz.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">htwg-konstanz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.htwg-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.htwg-konstanz.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCTCCA/GgAwIBAgIED3krjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAxMjIxMzU0MDdaFw0xNTAx
-MjExMzU0MDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuaHR3Zy1rb25zdGFuei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCvB8y8jN5yPI18S2YaLk9+
-x8txqfITAVZrVBCb8u8F/bPMso3evG9om1qDeUPlJ8xIhyIsNFfKjWQSrP6EmiI9
-XZXL9Gm4xZhMmDgZ1+cLUViIYT/X+V62h3TKrgMvnzISVFvEZjxINgitV823DZRk
-7zWswOvwV/V4ilDwJRhx6jLCbrztltPMpjIxMFvJFVDvllfPxykg2xQP5rhGa1gn
-ezpWh/ESyeE1VRworNZYQINvUQdTIuJlpj3iSC+pQvldDScEuai4CgGYg6p7gCzG
-1sS7DJnytq5MUgtsduNpELzjFD2xtzQ/3LhsUf0ySpErSGAn5fKWg3Eab7K5NBUC
-AwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU+w/Cf4aHFawZhnChB+GawB41
-2Q4wHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIwYDVR0RBBwwGoEY
-c3RldWVydEBodHdnLWtvbnN0YW56LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZow
-SwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
-Y2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAax3k4gqD7d5XAwDWmPs0oPCwW
-DgEofj++OOyp+LqVmayARGMWo501Xew1p/TX1XSRYWKiya+B+qTca7EmI/yThn8v
-yhadmTYazbcZndMv9QScDIVpO1+TdSrPgIF2mL5a+eiI8jNa8PIu04vSGUU5lw52
-i2qcqy905Ip5EmeLUl+ZF3Evy3bFQPcbMHKbTz3Pp3wEnlzH4nv5IaAwOjGhCBCu
-wlDZxietS5h6mhn+0BSBa65u0e8tTzoJn1ZehI0f8lFZTkRTSyPw4J3FPi8aLGvb
-qKa8zt6MpiiTn10CDGdvLnRJ/CzTDL1DZgeCLm4nxZg5CdiYzpWxAaDoHOlV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Konstanz Technik, Wirtschaft und Gestaltung</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HTWG Konstanz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.htwg-konstanz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Konrad</GivenName>
-    <SurName>Mauz</SurName>
-    <EmailAddress>hostmaster@htwg-konstanz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.helsinki.fi.xml b/swamid-interfederations-2.0/idp.it.helsinki.fi.xml
deleted file mode 100644
index cbd09b15..00000000
--- a/swamid-interfederations-2.0/idp.it.helsinki.fi.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:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.it.helsinki.fi/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEcTCCA1mgAwIBAgIQb6wlPCEcExhVve9XkInJdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQxNzAwMDAwMFoXDTE2MDQyNTIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuaXQuaGVs
-c2lua2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDcw5b6Irs
-srBw/ZqlYBd56/3TuwKlffQ/PMEWtXlREAr0AqEvfkwkDBcw2l1SukBgxrOrTSt+
-V22gNr4MYG4e5TZXdz/0zE3cIKK0yyl3J2Nx2XlmI9fiR9Sek1nLAOtnLuwWRI8N
-QWdX/Xfy3y2/lQlMMNhhp7aSENrD0aHjtnGkM0VabUps643cTBriFHh7StggFRc8
-hTMRtKiy8YJ/1Zsc9ga5ybM94zu3XIK4zeTJhYyGOgF6TKF7/mZvvLrPNjVOHSeA
-0J/zojBV6GPCxlLSOAdkvV9uVhslLAbGii/0hEZ3pSS7U5XJ6xf54it/ygIgUxIf
-IOb985uDENrlAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUINR5wYeKLCfMrr3Wr5ritvhAkfowDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5pdC5oZWxzaW5raS5m
-aTANBgkqhkiG9w0BAQUFAAOCAQEADRpnZTiCX9noNJx4oRL58PTTLYVlh/VlBMen
-56T532hwjM5mweKxLHdNO4aLSQjTLJG0QrJJwNM8of39eDv5UArRgiwnd9jfw0at
-S006LfAa2a68PWLmeg4MfwQ5IneMvFkS9+1SNL0sGd7nNFz86go7B3UpHbEiHJdv
-S/fr/RDEW7w/VIniSkVp7pSxCPLU0uRxXwIcQ4CLKUJXOPF3pzDPeos79qLMVY9c
-3nqnZg9C2k24ELF6azswhYyTzXHp80ldMrshRglu8oNiVxQP1PuZJQW6UrIJBGeX
-tuqXWyJCptDt66Xp9smuVpRI45ikr+HoVSJnxmAoW/ImSH0oBg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <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.it.helsinki.fi/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.helsinki.fi/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">helsinki.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEcTCCA1mgAwIBAgIQb6wlPCEcExhVve9XkInJdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQxNzAwMDAwMFoXDTE2MDQyNTIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuaXQuaGVs
-c2lua2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDcw5b6Irs
-srBw/ZqlYBd56/3TuwKlffQ/PMEWtXlREAr0AqEvfkwkDBcw2l1SukBgxrOrTSt+
-V22gNr4MYG4e5TZXdz/0zE3cIKK0yyl3J2Nx2XlmI9fiR9Sek1nLAOtnLuwWRI8N
-QWdX/Xfy3y2/lQlMMNhhp7aSENrD0aHjtnGkM0VabUps643cTBriFHh7StggFRc8
-hTMRtKiy8YJ/1Zsc9ga5ybM94zu3XIK4zeTJhYyGOgF6TKF7/mZvvLrPNjVOHSeA
-0J/zojBV6GPCxlLSOAdkvV9uVhslLAbGii/0hEZ3pSS7U5XJ6xf54it/ygIgUxIf
-IOb985uDENrlAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUINR5wYeKLCfMrr3Wr5ritvhAkfowDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5pdC5oZWxzaW5raS5m
-aTANBgkqhkiG9w0BAQUFAAOCAQEADRpnZTiCX9noNJx4oRL58PTTLYVlh/VlBMen
-56T532hwjM5mweKxLHdNO4aLSQjTLJG0QrJJwNM8of39eDv5UArRgiwnd9jfw0at
-S006LfAa2a68PWLmeg4MfwQ5IneMvFkS9+1SNL0sGd7nNFz86go7B3UpHbEiHJdv
-S/fr/RDEW7w/VIniSkVp7pSxCPLU0uRxXwIcQ4CLKUJXOPF3pzDPeos79qLMVY9c
-3nqnZg9C2k24ELF6azswhYyTzXHp80ldMrshRglu8oNiVxQP1PuZJQW6UrIJBGeX
-tuqXWyJCptDt66Xp9smuVpRI45ikr+HoVSJnxmAoW/ImSH0oBg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.helsinki.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.helsinki.fi: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="fi">Helsingin yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Olli</md:GivenName>
-    <md:SurName>Saikko</md:SurName>
-    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Aarno</md:GivenName>
-    <md:SurName>Sandvik</md:SurName>
-    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.xml b/swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.xml
deleted file mode 100644
index aa991d56..00000000
--- a/swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itmc.tu-dortmund.de:8443/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-dortmund.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
-CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
-CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
-N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
-VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
-nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
-Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
-xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
-pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
-MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
-m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
-O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
-ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
-BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
-C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
-rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
-9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
-r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
-CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
-CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
-N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
-VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
-nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
-Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
-xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
-pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
-MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
-m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
-O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
-ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
-BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
-C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
-rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
-9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
-r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-dortmund.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
-CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
-CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
-N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
-VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
-nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
-Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
-xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
-pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
-MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
-m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
-O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
-ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
-BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
-C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
-rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
-9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
-r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
-CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
-CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
-N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
-VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
-nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
-Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
-xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
-pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
-MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
-m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
-O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
-ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
-BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
-C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
-rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
-9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
-r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Dortmund (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Dortmund (Technische Universität)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-dortmund.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Stefan</GivenName>
-    <SurName>Rapp</SurName>
-    <EmailAddress>stefan.rapp@tu-dortmund.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Arne</GivenName>
-    <SurName>von Irmer</SurName>
-    <EmailAddress>Arne.vonIrmer@tu-dortmund.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mta.hu.xml b/swamid-interfederations-2.0/idp.mta.hu.xml
new file mode 100644
index 00000000..3d1419d0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mta.hu.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mta.hu/idp/saml2/idp/metadata.php">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-test</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">mtatitk</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">titkarsag.mta.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEEjCCAvqgAwIBAgIJAM4B1jSKcSpIMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAkhVMQowCAYDVQQIEwEgMREwDwYDVQQHEwhCdWRhcGVzdDEMMAoGA1UEChMDTVRBMRIwEAYDVQQLEwlUaXRrYXJzYWcxEzARBgNVBAMTCmlkcC5tdGEuaHUwHhcNMTQwMjE4MDgxODQ4WhcNMzMwNDE5MDgxODQ4WjBjMQswCQYDVQQGEwJIVTEKMAgGA1UECBMBIDERMA8GA1UEBxMIQnVkYXBlc3QxDDAKBgNVBAoTA01UQTESMBAGA1UECxMJVGl0a2Fyc2FnMRMwEQYDVQQDEwppZHAubXRhLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArXgM7QbY9DMXbKVA2N0pYeN2pOpvCjfchMWdCLwccd4n02NSff/+K2gyvQutMaxsYtCY8JjY2FIeU+IMig2LjuMCMHXIpntGhULa2+T6xcyclt5sp7hp7+NdD/L6dt2GRAEFJto3ostW4PV3eX5D3r0P7NjaC3LrtcDM+iwpp6HqFsUYZXPT0EiH5tJnZDo+EhlfPm3j5fMvQOiSe0hp5hjtoSgn/etcve9WlEH7pqF8AlDk7SkSvTUgbMUtGPmvdNxk6H1ENJRsad2vf7CxxtXfKvKKi1tYEmPQsY4A/9X9FCmprWxJ4bMvGdjST/mEvRwtpKihJ7PiU1qrMU7prwIDAQABo4HIMIHFMB0GA1UdDgQWBBTHn9gU0vszSRWaAnv7wekfRqUqkzCBlQYDVR0jBIGNMIGKgBTHn9gU0vszSRWaAnv7wekfRqUqk6FnpGUwYzELMAkGA1UEBhMCSFUxCjAIBgNVBAgTASAxETAPBgNVBAcTCEJ1ZGFwZXN0MQwwCgYDVQQKEwNNVEExEjAQBgNVBAsTCVRpdGthcnNhZzETMBEGA1UEAxMKaWRwLm10YS5odYIJAM4B1jSKcSpIMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABU1PdlMVAXcFlAbKRjy6Oo1Y4TkmGihKcfUooTdSU45em1ZpichtPtOM4UocQwC95HXgEk28FJqJasVAlRoGoOmtBY9+D8bitVz/xVPcHgt9U7XY8+Q0O07iCdsKFeUCO7iH9kezfIvHPL9jVm0NJMUFZzME3mFcm2+5Qq8ZmYSGTXnkdEamR9EFL2CgC8QnuMxNK3VHbmU2Wc/QjOW0Mp9DdSIBZNXc5i2ANiyHDVl2iIK6U06r4Dr3zafoaLuQrbP15bZgoSda958GYYKnCV58cj5HdXM7ugT18L4KCG+bZkSQtI6ow4aBSxUMGrlf1qJIRNci9Q8FiBbF09hrLc=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.mta.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mta.hu/idp/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mta.hu/idp/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">MTA Titkárság</OrganizationName>
+    <OrganizationName xml:lang="en">MTA Titkárság</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">MTA Akadémiai Adattár (AAT)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">MTA Akadémiai Adattár (AAT)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://aat.mta.hu/aat</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://aat.mta.hu/aat</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>AAT</SurName>
+    <EmailAddress>mailto:szervezes@titkarsag.mta.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>AAT</SurName>
+    <EmailAddress>mailto:szervezes@titkarsag.mta.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>AAT</SurName>
+    <EmailAddress>mailto:szervezes@titkarsag.mta.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.niif.hu.xml b/swamid-interfederations-2.0/idp.niif.hu.xml
index 51d2f9ab..8d773161 100644
--- a/swamid-interfederations-2.0/idp.niif.hu.xml
+++ b/swamid-interfederations-2.0/idp.niif.hu.xml
@@ -5,7 +5,7 @@
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexxa</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexaa</ns9:MetadataSet>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/idp.ph-freiburg.de.xml b/swamid-interfederations-2.0/idp.ph-freiburg.de.xml
deleted file mode 100644
index 21727df0..00000000
--- a/swamid-interfederations-2.0/idp.ph-freiburg.de.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-freiburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-freiburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-freiburg.de,O=Paedagogische Hochschule Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0XYvTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIRnJlaWJ1
-cmcxKjAoBgNVBAoTIVBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBGcmVpYnVyZzEM
-MAoGA1UECxMDWklLMREwDwYDVQQDEwhQSC1GUiBDQTEhMB8GCSqGSIb3DQEJARYS
-cGtpQHBoLWZyZWlidXJnLmRlMB4XDTA5MTIxNDE1MzUxMFoXDTE0MTIxMzE1MzUx
-MFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-ETAPBgNVBAcTCEZyZWlidXJnMSowKAYDVQQKEyFQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgRnJlaWJ1cmcxGzAZBgNVBAMTEmlkcC5waC1mcmVpYnVyZy5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM828KxElHwjl/c6j9CG8AFT+y7J
-4w4yw0qc9Up8zZtzQPuJa+xaG3D3vDcfYB12i2mqdsOrB2ONYUSBgq29myZ6h1kx
-SqQTuOS0Ms+L6xH40XYkApDq76knlDgSzVWy3rnoT539QXLwyo5lMjqqo+/1a5hV
-KP3fygx0BRO45IGgfgvvjSHvEuxWOSTFYSFawj1QhZj1Kdr5LORt1BhG02QADVnA
-j4cTA3gv9O/MN9MnViBM4Vmp4pIUi7SgcwGLxAQcDgoaA4LADU2PF2qsoKCdJOv9
-W4LKtLLqv8rrLajinD/F6rFfbF0Y0MkiE/wQKHY6+DE2LbP5EZwSc8vj5a8CAwEA
-AaOCAaswggGnMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUbBM+NKAEus52mOzdt5CcTaSKs8Qw
-HwYDVR0jBBgwFoAUcc1Tb+nFrN3ri2RPPjhAO2OMRaIwgYgGA1UdHwSBgDB+MD2g
-O6A5hjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWZyZWlidXJnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWZy
-ZWlidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBH
-BggrBgEFBQcwAoY7aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1mcmVpYnVyZy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvcGgtZnJlaWJ1cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQB50CER7ZpXfLAHmrAOUCQXWTDAYWmRCx+kuM93
-LmsV51v9wj3ABXW6gTYf5/uBOqepakXVh6F4UDrOMudsyANOGVAyjKKGsf9O80y2
-RcB44enObtzulPJruBlTjuDeJa0JMG2fktq/G24OQ0EbsE/iU7Bjzi/bhBJ8PZ/Q
-+C2L4u2g+MzuP715KXq0TvF1WrqU6E4SlNo57GGwOTEcc236ldrWkA7E2c27x0Gr
-ACQ2fRteTKA1w2KTSEDlL+tI4L0fj4Vs/6utxsFGQKsLlZh3XYJV6UN+LWuuV4Ld
-skKvylp9V9RQYU0paW2EUEcSWQ4LqNBNFBfyMYd0FkhipnTt
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ph-freiburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ph-freiburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-freiburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-freiburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-freiburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-freiburg.de,O=Paedagogische Hochschule Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0XYvTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIRnJlaWJ1
-cmcxKjAoBgNVBAoTIVBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBGcmVpYnVyZzEM
-MAoGA1UECxMDWklLMREwDwYDVQQDEwhQSC1GUiBDQTEhMB8GCSqGSIb3DQEJARYS
-cGtpQHBoLWZyZWlidXJnLmRlMB4XDTA5MTIxNDE1MzUxMFoXDTE0MTIxMzE1MzUx
-MFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-ETAPBgNVBAcTCEZyZWlidXJnMSowKAYDVQQKEyFQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgRnJlaWJ1cmcxGzAZBgNVBAMTEmlkcC5waC1mcmVpYnVyZy5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM828KxElHwjl/c6j9CG8AFT+y7J
-4w4yw0qc9Up8zZtzQPuJa+xaG3D3vDcfYB12i2mqdsOrB2ONYUSBgq29myZ6h1kx
-SqQTuOS0Ms+L6xH40XYkApDq76knlDgSzVWy3rnoT539QXLwyo5lMjqqo+/1a5hV
-KP3fygx0BRO45IGgfgvvjSHvEuxWOSTFYSFawj1QhZj1Kdr5LORt1BhG02QADVnA
-j4cTA3gv9O/MN9MnViBM4Vmp4pIUi7SgcwGLxAQcDgoaA4LADU2PF2qsoKCdJOv9
-W4LKtLLqv8rrLajinD/F6rFfbF0Y0MkiE/wQKHY6+DE2LbP5EZwSc8vj5a8CAwEA
-AaOCAaswggGnMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUbBM+NKAEus52mOzdt5CcTaSKs8Qw
-HwYDVR0jBBgwFoAUcc1Tb+nFrN3ri2RPPjhAO2OMRaIwgYgGA1UdHwSBgDB+MD2g
-O6A5hjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWZyZWlidXJnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWZy
-ZWlidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBH
-BggrBgEFBQcwAoY7aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1mcmVpYnVyZy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvcGgtZnJlaWJ1cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQB50CER7ZpXfLAHmrAOUCQXWTDAYWmRCx+kuM93
-LmsV51v9wj3ABXW6gTYf5/uBOqepakXVh6F4UDrOMudsyANOGVAyjKKGsf9O80y2
-RcB44enObtzulPJruBlTjuDeJa0JMG2fktq/G24OQ0EbsE/iU7Bjzi/bhBJ8PZ/Q
-+C2L4u2g+MzuP715KXq0TvF1WrqU6E4SlNo57GGwOTEcc236ldrWkA7E2c27x0Gr
-ACQ2fRteTKA1w2KTSEDlL+tI4L0fj4Vs/6utxsFGQKsLlZh3XYJV6UN+LWuuV4Ld
-skKvylp9V9RQYU0paW2EUEcSWQ4LqNBNFBfyMYd0FkhipnTt
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Pädagogische Hochschule Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH-Freiburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-freiburg.de/zik/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephan</GivenName>
-    <SurName>Lauffer</SurName>
-    <EmailAddress>lauffer@ph-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Martin</GivenName>
-    <SurName>Duffner</SurName>
-    <EmailAddress>duffner@ph-freiburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-gmuend.de.xml b/swamid-interfederations-2.0/idp.ph-gmuend.de.xml
deleted file mode 100644
index 8a5f7562..00000000
--- a/swamid-interfederations-2.0/idp.ph-gmuend.de.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-gmuend.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gmuend.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
-YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
-U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
-aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
-LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
-AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
-ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
-IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
-cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
-aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
-ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
-Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
-YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
-z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
-ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
-wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
-LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
-Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
-BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
-ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
-RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
-ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
-/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
-t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
-LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
-YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
-U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
-aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
-LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
-AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
-ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
-IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
-cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
-aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
-ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
-Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
-YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
-z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
-ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
-wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
-LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
-Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
-BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
-ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
-RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
-ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
-/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
-t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
-LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ph-gmuend.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ph-gmuend.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-gmuend.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-gmuend.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gmuend.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
-YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
-U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
-aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
-LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
-AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
-ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
-IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
-cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
-aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
-ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
-Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
-YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
-z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
-ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
-wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
-LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
-Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
-BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
-ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
-RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
-ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
-/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
-t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
-LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
-YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
-U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
-aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
-LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
-AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
-ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
-IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
-cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
-aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
-ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
-Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
-YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
-z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
-ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
-wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
-LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
-Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
-BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
-ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
-RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
-ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
-/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
-t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
-LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH Schwaebisch Gmuend</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH Schwäbisch Gmünd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-gmuend.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christoph</GivenName>
-    <SurName>List</SurName>
-    <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Markus</GivenName>
-    <SurName>Opferkuch</SurName>
-    <EmailAddress>markus.opferkuch@ph-gmuend.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml b/swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml
deleted file mode 100644
index 3a50ca28..00000000
--- a/swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-karlsruhe.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
-MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
-a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
-OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
-c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
-T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
-qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
-4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
-Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
-beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
-AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
-GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
-aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
-AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
-4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
-Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
-7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
-N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
-kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
-MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
-a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
-OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
-c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
-T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
-qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
-4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
-Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
-beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
-AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
-GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
-aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
-AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
-4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
-Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
-7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
-N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
-kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ph-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ph-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
-MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
-a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
-OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
-c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
-T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
-qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
-4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
-Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
-beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
-AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
-GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
-aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
-AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
-4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
-Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
-7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
-N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
-kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
-MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
-a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
-OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
-c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
-T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
-qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
-4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
-Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
-beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
-AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
-GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
-aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
-AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
-4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
-Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
-7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
-N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
-kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH Karlsruhe</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH Karlsruhe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-karlsruhe.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christoph</GivenName>
-    <SurName>List</SurName>
-    <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Helmut</GivenName>
-    <SurName>Filipp</SurName>
-    <EmailAddress>filipp@ph-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml b/swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml
deleted file mode 100644
index aee81ee5..00000000
--- a/swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-ludwigsburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.ph-ludwigsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
-gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
-BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
-GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
-lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
-MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
-lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
-xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
-KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
-goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
-MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
-BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
-aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
-FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
-z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
-DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
-s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
-p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
-dPUEeVju
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
-gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
-BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
-GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
-lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
-MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
-lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
-xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
-KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
-goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
-MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
-BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
-aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
-FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
-z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
-DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
-s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
-p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
-dPUEeVju
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ph-ludwigsburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-ludwigsburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-ludwigsburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.ph-ludwigsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
-gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
-BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
-GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
-lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
-MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
-lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
-xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
-KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
-goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
-MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
-BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
-aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
-FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
-z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
-DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
-s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
-p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
-dPUEeVju
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
-gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
-BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
-GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
-lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
-MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
-lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
-xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
-KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
-goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
-MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
-BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
-aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
-FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
-z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
-DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
-s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
-p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
-dPUEeVju
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH Ludwigsburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH Ludwigsburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-ludwigsburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christoph</GivenName>
-    <SurName>List</SurName>
-    <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Eberhard</GivenName>
-    <SurName>Ostertag</SurName>
-    <EmailAddress>ostertag@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reuna.cl.xml b/swamid-interfederations-2.0/idp.reuna.cl.xml
index b0b03247..5791c843 100644
--- a/swamid-interfederations-2.0/idp.reuna.cl.xml
+++ b/swamid-interfederations-2.0/idp.reuna.cl.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reuna.cl/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2010-01-01T00:00:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2012-01-01T00:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="es">
-	http://cofre.reuna.cl/index.php/es/reglas-federacion
+http://cofre.reuna.cl/index.php/es/reglas-federacion
 </mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
@@ -22,30 +22,18 @@
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z
-MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm
-pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE
-6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6
-lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T
-LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU
-bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ
-KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB
-kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR
-f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX
-fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h
-i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa
-BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=</ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE 6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6 lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl: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:transient
+</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reuna.cl/idp/profile/Shibboleth/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reuna.cl/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reuna.cl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -58,34 +46,22 @@ BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=</ds:X509Certificate>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z
-MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm
-pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE
-6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6
-lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T
-LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU
-bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ
-KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB
-kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR
-f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX
-fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h
-i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa
-BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=</ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE 6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6 lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl: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:transient
+</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">REUNA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">REUNA IdP</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">REUNA</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.reuna.cl</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp.reutlingen-university.de.xml b/swamid-interfederations-2.0/idp.reutlingen-university.de.xml
deleted file mode 100644
index ca204a2e..00000000
--- a/swamid-interfederations-2.0/idp.reutlingen-university.de.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reutlingen-university.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">reutlingen-university.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
-b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
-Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
-cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
-L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
-VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
-YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
-GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
-pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
-Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
-m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
-aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
-AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
-dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
-dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
-7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
-mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
-E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
-IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
-B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
-kanNbZOkV2o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
-b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
-Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
-cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
-L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
-VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
-YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
-GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
-pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
-Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
-m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
-aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
-AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
-dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
-dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
-7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
-mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
-E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
-IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
-B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
-kanNbZOkV2o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reutlingen-university.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reutlingen-university.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reutlingen-university.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reutlingen-university.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">reutlingen-university.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
-b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
-Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
-cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
-L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
-VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
-YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
-GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
-pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
-Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
-m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
-aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
-AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
-dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
-dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
-7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
-mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
-E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
-IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
-B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
-kanNbZOkV2o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
-b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
-Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
-cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
-L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
-VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
-YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
-GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
-pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
-Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
-m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
-aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
-AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
-dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
-dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
-7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
-mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
-E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
-IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
-B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
-kanNbZOkV2o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Reutlingen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Reutlingen University / Hochschule Reutlingen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.reutlingen-university.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Wolfgang</GivenName>
-    <SurName>Honigberger</SurName>
-    <EmailAddress>wolfgang.honigberger@reutlingen-university.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Thalmann</SurName>
-    <EmailAddress>michael.thalmann@reutlingen-university.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml b/swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml
deleted file mode 100644
index f8419da2..00000000
--- a/swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rrz.uni-koeln.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIED2PRijANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJE
-RTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2Vs
-bjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFzdGVy
-QHVuaS1rb2Vsbi5kZTAeFw0xMDAxMDYwOTEyMjdaFw0xNTAxMDUwOTEyMjdaMIGd
-MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwG
-A1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEhMB8G
-A1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAucnJ6
-LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4G
-P8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LStIl0
-MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ7Ply
-wN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkncm3B
-P93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bHpamd
-VckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySNOMOK
-dVsRdu9DpohKTwk4knECAwEAAaOCAaIwggGeMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEe
-YjgdNwAgmGE/uXTabsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29P
-CbowgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYB
-BQUHAQEEgZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBYGBCNNx1TJKuenCFTde4Qs++t
-PTzt3NaPas3IeHdipsxZlrWPV1HyNhX1dJmWd1fvTITBQ8srHOwAZe8oQEvgNh1S
-++2CB9hhHXy3cxmLe2cPFOppmCNna3cV2YViCZZqTJu5EtM0W04F2/aKOZtW9dsU
-zz9+f1iFiI8P0kJEyqpvvbvEEAIiupgsyTZ2L9fTFVm13gG1ypieKfiyxp0M+X+K
-K9nheFGb/VuOJ9BP71gMZVLyvHoLPgCZ9Je+i5LIJbV7AEnjaPfZYM028FETpWqQ
-mb0utRy/FfLpTIGA6BtGZ6SGWModfl4RVB7YydSN8nwUOtJb4jDseKzT8ENR
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rrz.uni-koeln.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIED2PRijANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJE
-RTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2Vs
-bjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFzdGVy
-QHVuaS1rb2Vsbi5kZTAeFw0xMDAxMDYwOTEyMjdaFw0xNTAxMDUwOTEyMjdaMIGd
-MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwG
-A1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEhMB8G
-A1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAucnJ6
-LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4G
-P8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LStIl0
-MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ7Ply
-wN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkncm3B
-P93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bHpamd
-VckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySNOMOK
-dVsRdu9DpohKTwk4knECAwEAAaOCAaIwggGeMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEe
-YjgdNwAgmGE/uXTabsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29P
-CbowgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYB
-BQUHAQEEgZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBYGBCNNx1TJKuenCFTde4Qs++t
-PTzt3NaPas3IeHdipsxZlrWPV1HyNhX1dJmWd1fvTITBQ8srHOwAZe8oQEvgNh1S
-++2CB9hhHXy3cxmLe2cPFOppmCNna3cV2YViCZZqTJu5EtM0W04F2/aKOZtW9dsU
-zz9+f1iFiI8P0kJEyqpvvbvEEAIiupgsyTZ2L9fTFVm13gG1ypieKfiyxp0M+X+K
-K9nheFGb/VuOJ9BP71gMZVLyvHoLPgCZ9Je+i5LIJbV7AEnjaPfZYM028FETpWqQ
-mb0utRy/FfLpTIGA6BtGZ6SGWModfl4RVB7YydSN8nwUOtJb4jDseKzT8ENR
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität zu Köln</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität zu Köln</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-koeln.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Beate</GivenName>
-    <SurName>Schlesiona</SurName>
-    <EmailAddress>beate.schlesiona@uni-koeln.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Beate</GivenName>
-    <SurName>Schlesiona</SurName>
-    <EmailAddress>beate.schlesiona@uni-koeln.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml b/swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml
deleted file mode 100644
index bbd88d90..00000000
--- a/swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rz.uni-hohenheim.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hohenheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
-YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
-bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
-aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
-nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
-MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
-dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
-CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
-SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
-Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
-Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
-iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
-/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
-bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
-aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
-OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
-S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
-XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
-KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
-dQrQJapTFuFmBHtINb8rzGQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
-YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
-bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
-aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
-nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
-MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
-dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
-CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
-SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
-Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
-Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
-iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
-/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
-bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
-aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
-OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
-S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
-XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
-KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
-dQrQJapTFuFmBHtINb8rzGQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rz.uni-hohenheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rz.uni-hohenheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rz.uni-hohenheim.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hohenheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
-YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
-bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
-aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
-nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
-MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
-dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
-CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
-SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
-Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
-Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
-iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
-/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
-bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
-aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
-OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
-S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
-XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
-KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
-dQrQJapTFuFmBHtINb8rzGQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
-YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
-bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
-aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
-nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
-MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
-dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
-CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
-SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
-Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
-Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
-iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
-/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
-bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
-aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
-OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
-S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
-XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
-KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
-dQrQJapTFuFmBHtINb8rzGQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Hohenheim</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Hohenheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.uni-hohenheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Steffen</GivenName>
-    <SurName>Bücheler</SurName>
-    <EmailAddress>stb@uni-hohenheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steffen</GivenName>
-    <SurName>Bücheler</SurName>
-    <EmailAddress>stb@uni-hohenheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Björn</GivenName>
-    <SurName>Breiner</SurName>
-    <EmailAddress>bjoern.breiner@uni-hohenheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.scc.kit.edu.xml b/swamid-interfederations-2.0/idp.scc.kit.edu.xml
deleted file mode 100644
index 4cb31e97..00000000
--- a/swamid-interfederations-2.0/idp.scc.kit.edu.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.scc.kit.edu/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
-JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
-AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
-MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
-YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
-S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
-c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
-HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
-rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
-OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
-wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
-NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
-g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
-kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
-6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
-NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
-shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
-I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
-RK42gc2r8jP4hr5kQZhmEkk0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
-JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
-AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
-MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
-YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
-S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
-c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
-HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
-rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
-OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
-wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
-NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
-g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
-kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
-6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
-NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
-shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
-I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
-RK42gc2r8jP4hr5kQZhmEkk0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.scc.kit.edu/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scc.kit.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
-JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
-AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
-MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
-YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
-S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
-c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
-HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
-rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
-OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
-wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
-NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
-g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
-kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
-6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
-NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
-shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
-I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
-RK42gc2r8jP4hr5kQZhmEkk0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
-JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
-AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
-MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
-YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
-S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
-c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
-HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
-rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
-OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
-wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
-NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
-g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
-kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
-6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
-NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
-shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
-I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
-RK42gc2r8jP4hr5kQZhmEkk0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Karlsruhe Institute of Technology (KIT)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Karlsruhe Institute of Technology (KIT)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.scc.kit.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Simon</SurName>
-    <EmailAddress>simon@kit.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Sebastian</GivenName>
-    <SurName>Labitzke</SurName>
-    <EmailAddress>labitzke@kit.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ssc.cas.cz.xml b/swamid-interfederations-2.0/idp.ssc.cas.cz.xml
new file mode 100644
index 00000000..8ab27c57
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ssc.cas.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.ssc.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ssc.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SSC AV CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">SSČ AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider SSC AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance SSČ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ssc.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ssc.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="74">https://jiftach.cas.cz/loga/logo-ssc-44.png</mdui:Logo>
+        <mdui:Logo height="638" width="1080">https://jiftach.cas.cz/loga/logo-ssc-638.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAM17FMyMTScGvy0JdedneKzQSTuJMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5zc2MuY2FzLmN6MB4XDTE0MDEyMTEzNDgxN1oX
+DTM0MDEyMTEzNDgxN1owGTEXMBUGA1UEAxMOaWRwLnNzYy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCO9p492zRmGFmhH7Qq7l1Vy3OBRyZc
+tIyaocn/FLBJ9TkGUqYdR29wHCmKnGOwXFF6VIBdfsmVmuFczjQcpAqPQ4zcS+kl
++Y6yDMINQv0eAZvRvIDK4jfF5GVZAXwbUuPLr8Cl0L0ZbzNPT7ewi7sHO+8upqv7
+7bhwyG8ZMYgMSPeM4jWuThv+6x5DRlnMqjq+qBev95MRK0bZRSJ3XKyDa+Nso8Df
+R7rYnFHF+Al4AujMgQzN+hDRjxyD2Wp1xYK9BguctIFyHiS0aXr0CB3PcCnRfdRk
+GTH2SX3pNIJ1olEODLyHfNF9uJt120bfaFgaGau/iRCXwuj7Ap5PLiURAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5zc2MuY2FzLmN6hiVodHRwczovL2lkcC5zc2Mu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRWD+N0hIllSytm0SBw/34M
+IGBstDANBgkqhkiG9w0BAQUFAAOCAQEAXqvCIxGFBSBtfecHgvx3j5kYiG0rutzh
+XhdFJZrPWARnMdL0VLfK064Y+OWsv1sbovS31HWxvCWqfBTmIu2e658IGnCYUBGX
+/e8/NG7u9SeS6ie7U6B1kFQIYrgSKHH4jookel03sIF0n36C3XMG95h7TNgZQ5Vf
+JQwAd/6FCX9a+NzhTJZWMXPCIEjGICjwbddAPsX6aSAUgIyif0EkIDSvcckkeLT0
+Jy+EMpZzHBrcYckNCLqr8PsQxGAM6g7mUC8ebGVX9bjkOGplkUUzlsNQE4djcNvY
+qOgmzrGDcWxrRDaRKM2/jYdmcKg6FmAZE1Vpdy+W7j2tbvLDXjLpOg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ssc.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ssc.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAM17FMyMTScGvy0JdedneKzQSTuJMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5zc2MuY2FzLmN6MB4XDTE0MDEyMTEzNDgxN1oX
+DTM0MDEyMTEzNDgxN1owGTEXMBUGA1UEAxMOaWRwLnNzYy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCO9p492zRmGFmhH7Qq7l1Vy3OBRyZc
+tIyaocn/FLBJ9TkGUqYdR29wHCmKnGOwXFF6VIBdfsmVmuFczjQcpAqPQ4zcS+kl
++Y6yDMINQv0eAZvRvIDK4jfF5GVZAXwbUuPLr8Cl0L0ZbzNPT7ewi7sHO+8upqv7
+7bhwyG8ZMYgMSPeM4jWuThv+6x5DRlnMqjq+qBev95MRK0bZRSJ3XKyDa+Nso8Df
+R7rYnFHF+Al4AujMgQzN+hDRjxyD2Wp1xYK9BguctIFyHiS0aXr0CB3PcCnRfdRk
+GTH2SX3pNIJ1olEODLyHfNF9uJt120bfaFgaGau/iRCXwuj7Ap5PLiURAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5zc2MuY2FzLmN6hiVodHRwczovL2lkcC5zc2Mu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRWD+N0hIllSytm0SBw/34M
+IGBstDANBgkqhkiG9w0BAQUFAAOCAQEAXqvCIxGFBSBtfecHgvx3j5kYiG0rutzh
+XhdFJZrPWARnMdL0VLfK064Y+OWsv1sbovS31HWxvCWqfBTmIu2e658IGnCYUBGX
+/e8/NG7u9SeS6ie7U6B1kFQIYrgSKHH4jookel03sIF0n36C3XMG95h7TNgZQ5Vf
+JQwAd/6FCX9a+NzhTJZWMXPCIEjGICjwbddAPsX6aSAUgIyif0EkIDSvcckkeLT0
+Jy+EMpZzHBrcYckNCLqr8PsQxGAM6g7mUC8ebGVX9bjkOGplkUUzlsNQE4djcNvY
+qOgmzrGDcWxrRDaRKM2/jYdmcKg6FmAZE1Vpdy+W7j2tbvLDXjLpOg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Centre of Administration and Operations of ASCR</OrganizationName>
+    <OrganizationName xml:lang="cs">Středisko společných činností AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Centre of Administration and Operations of ASCR, v. v. i.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Středisko společných činností AV ČR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ssc.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.ssc.cas.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tu-clausthal.de.xml b/swamid-interfederations-2.0/idp.tu-clausthal.de.xml
deleted file mode 100644
index 5882bc73..00000000
--- a/swamid-interfederations-2.0/idp.tu-clausthal.de.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tu-clausthal.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-clausthal.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFajCCBFKgAwIBAgIHEzeWYlp+0DANBgkqhkiG9w0BAQUFADCBmDELMAkGA1UE
-BhMCREUxKjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhh
-bDEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVVFUgQ2xhdXN0aGFs
-IENBIC0gRzAyMSUwIwYJKoZIhvcNAQkBFhZwa2lAcnoudHUtY2xhdXN0aGFsLmRl
-MB4XDTEyMDExOTEzMjEyMloXDTE3MDExNzEzMjEyMlowbzELMAkGA1UEBhMCREUx
-KjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhhbDEWMBQG
-A1UECxMNUmVjaGVuemVudHJ1bTEcMBoGA1UEAxMTaWRwLnR1LWNsYXVzdGhhbC5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTXMm5lk1dD5aFAodbn
-3Hb1BO6e91Z4lMKSnYeWErJhs91SvbeKPRIF9Hsp6jJJWcxhN7yX8LsQlFyxf6Y6
-T9RGtJYdaalamdVc+E9hfojRC3ZMcmiR9Mw29JZuHOQenRRzOqkKWBwtphZqdwMw
-iFQ1dI/c4ZvIs0a2iTfXOENY+b3R/MLX3TEKvGL0dDiLqfP086Brp2D3ZYT64/yn
-QFvRHQOJ92HVZUJ+rzTtFcwycU3ylFzLnxMml/6gRYzO1Q10EtGB7TnNo0sNXY9d
-Nk/ypCNfxP9nYVpFjTQzhUx9hPJUL9ONjbRqPuDN6wmZZORwMfNppa0nqIIZ+a79
-micCAwEAAaOCAd8wggHbMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUMzoVo6zpqDLp6HBsV7Kv
-rcDrXMswHwYDVR0jBBgwFoAUYvySt+ft8x81VVvJQ99Qs170ECUwJQYDVR0RBB4w
-HIEac3VwcG9ydEByei50dS1jbGF1c3RoYWwuZGUwgY8GA1UdHwSBhzCBhDBAoD6g
-PIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS90dS1jbGF1c3RoYWwtY2EvcHViL2Ny
-bC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1j
-bGF1c3RoYWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZsw
-gZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2xhdXN0
-aGFsLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3R1LWNsYXVzdGhhbC1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARsQhmJny/CMVM0+iHo/bchZa
-6crTTbKyEcBexnQlTcKxid6DK+gquIM4U9eCE+1cxgY0kZ9Q/aph1kV0OwGMFGQM
-k5NSRVBlI9Ih/5pWm1lLXEs7tQLF4+L63Z/N15mjzVrnxXZDuQI9YV4V8MnWyRb9
-hEw2ifP/jHV+6yqCe6Nl09DZK4miW5KGEQxVpM975zfCRIOf2INo1//b7wFD7aMR
-mOApGzt7PRZFHR0in3DGFTN5ILSyavrNvHbBXGtaEV2NAtTCqmFBOnlDpGrVz8L8
-yozMpjXfBly8IwiZNQ8GiI4m4oGiv4973ZOwk1njfaI8s82Uq45yjKxs/xhK8g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tu-clausthal.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-clausthal.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFajCCBFKgAwIBAgIHEzeWYlp+0DANBgkqhkiG9w0BAQUFADCBmDELMAkGA1UE
-BhMCREUxKjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhh
-bDEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVVFUgQ2xhdXN0aGFs
-IENBIC0gRzAyMSUwIwYJKoZIhvcNAQkBFhZwa2lAcnoudHUtY2xhdXN0aGFsLmRl
-MB4XDTEyMDExOTEzMjEyMloXDTE3MDExNzEzMjEyMlowbzELMAkGA1UEBhMCREUx
-KjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhhbDEWMBQG
-A1UECxMNUmVjaGVuemVudHJ1bTEcMBoGA1UEAxMTaWRwLnR1LWNsYXVzdGhhbC5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTXMm5lk1dD5aFAodbn
-3Hb1BO6e91Z4lMKSnYeWErJhs91SvbeKPRIF9Hsp6jJJWcxhN7yX8LsQlFyxf6Y6
-T9RGtJYdaalamdVc+E9hfojRC3ZMcmiR9Mw29JZuHOQenRRzOqkKWBwtphZqdwMw
-iFQ1dI/c4ZvIs0a2iTfXOENY+b3R/MLX3TEKvGL0dDiLqfP086Brp2D3ZYT64/yn
-QFvRHQOJ92HVZUJ+rzTtFcwycU3ylFzLnxMml/6gRYzO1Q10EtGB7TnNo0sNXY9d
-Nk/ypCNfxP9nYVpFjTQzhUx9hPJUL9ONjbRqPuDN6wmZZORwMfNppa0nqIIZ+a79
-micCAwEAAaOCAd8wggHbMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUMzoVo6zpqDLp6HBsV7Kv
-rcDrXMswHwYDVR0jBBgwFoAUYvySt+ft8x81VVvJQ99Qs170ECUwJQYDVR0RBB4w
-HIEac3VwcG9ydEByei50dS1jbGF1c3RoYWwuZGUwgY8GA1UdHwSBhzCBhDBAoD6g
-PIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS90dS1jbGF1c3RoYWwtY2EvcHViL2Ny
-bC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1j
-bGF1c3RoYWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZsw
-gZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2xhdXN0
-aGFsLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3R1LWNsYXVzdGhhbC1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARsQhmJny/CMVM0+iHo/bchZa
-6crTTbKyEcBexnQlTcKxid6DK+gquIM4U9eCE+1cxgY0kZ9Q/aph1kV0OwGMFGQM
-k5NSRVBlI9Ih/5pWm1lLXEs7tQLF4+L63Z/N15mjzVrnxXZDuQI9YV4V8MnWyRb9
-hEw2ifP/jHV+6yqCe6Nl09DZK4miW5KGEQxVpM975zfCRIOf2INo1//b7wFD7aMR
-mOApGzt7PRZFHR0in3DGFTN5ILSyavrNvHbBXGtaEV2NAtTCqmFBOnlDpGrVz8L8
-yozMpjXfBly8IwiZNQ8GiI4m4oGiv4973ZOwk1njfaI8s82Uq45yjKxs/xhK8g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Technische Universitaet Claustha</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Technische Universität Clausthal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-clausthal.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Alexander</GivenName>
-    <SurName>Hasenfuß</SurName>
-    <EmailAddress>hasenfuss@rz.tu-clausthal.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tu-ilmenau.de.xml b/swamid-interfederations-2.0/idp.tu-ilmenau.de.xml
deleted file mode 100644
index 038d4caf..00000000
--- a/swamid-interfederations-2.0/idp.tu-ilmenau.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tu-ilmenau.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-ilmenau.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-ilmenau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-ilmenau.de,O=Technische Universitaet Ilmenau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE6jCCA9KgAwIBAgIEDy9EHDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJE
-RTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEWMBQG
-A1UEAxMNVFUgSWxtZW5hdSBDQTEgMB4GCSqGSIb3DQEJARYRcGtpQHR1LWlsbWVu
-YXUuZGUwHhcNMDkxMTI3MTIzMTA5WhcNMTQxMTI2MTIzMTA5WjBTMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEa
-MBgGA1UEAxMRaWRwLnR1LWlsbWVuYXUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDGHzz+8LX3FKDhBfG0cR57P7CSxTH+HMlETF9aBVLCjz94Xmbj
-8cdbqUaNmnXett+gpSpv1GqeoRRJV6eJX28O1W/L6GWq7bjKpIlqAX4JFrl3rzDM
-gGdGfZTHeVXE9ZOTdqzChK56t7g0ESMcKvR6qSLi/khPdQVK/0wmVaok7rQkNk1P
-MdyVDIvSqIT+7PpzRSMYOJgyc9jq1w1ZegnesWbfPG6oDwX9RNyhpFbOPy+PJZUV
-3nlst3uUIIFjQ72T6tJt8F/e/iRLc2JJHdNvu7P3wTzP3L9nvP1V2QW5VpZjFRpa
-NUwdjS3tCC/6iQjjRGj5ug8EMzyANLNOoOf/AgMBAAGjggGmMIIBojAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFPmo0qBBDnJPpqs+B2LxkPepL1s9MB8GA1UdIwQYMBaAFNTDRRKK
-qetNpcpWf2nRwmh0Y/0BMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3R1LWlsbWVuYXUtY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiG
-Nmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5h
-dS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABdc
-mXTLe/TlwLaKdKZTLZO5TjTH3zSWocQ0O6+kBJ2EVfYfmeL+ZS/J5v17tVMsQWBg
-rB1dtLSwuqbKYmuQBSQCIN8HdGC4iudCd93hGkSKxr11fByjvIb4fWUUcKObFmcI
-/1LpS/MSqxlOk3FRIMKs7fL7EFs59iyI3zjJixsQTx8AlU+7OHACGuC7VCfKJk7B
-1ChawQJNn6R1vMguYFXbGGhSQiUfeLVBDan7Px5eVgAIo2GLFKhNifPcG4lMHnfv
-0gOxyxgL/mnHXNkM+W47BpE1HO4fgoJiluR60Q0O+yjPCTjES3pjJtYb2ZOcXjNb
-s/NTn9EiARtxg0zkLNo=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tu-ilmenau.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-ilmenau.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tu-ilmenau.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-ilmenau.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-ilmenau.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-ilmenau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-ilmenau.de,O=Technische Universitaet Ilmenau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE6jCCA9KgAwIBAgIEDy9EHDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJE
-RTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEWMBQG
-A1UEAxMNVFUgSWxtZW5hdSBDQTEgMB4GCSqGSIb3DQEJARYRcGtpQHR1LWlsbWVu
-YXUuZGUwHhcNMDkxMTI3MTIzMTA5WhcNMTQxMTI2MTIzMTA5WjBTMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEa
-MBgGA1UEAxMRaWRwLnR1LWlsbWVuYXUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDGHzz+8LX3FKDhBfG0cR57P7CSxTH+HMlETF9aBVLCjz94Xmbj
-8cdbqUaNmnXett+gpSpv1GqeoRRJV6eJX28O1W/L6GWq7bjKpIlqAX4JFrl3rzDM
-gGdGfZTHeVXE9ZOTdqzChK56t7g0ESMcKvR6qSLi/khPdQVK/0wmVaok7rQkNk1P
-MdyVDIvSqIT+7PpzRSMYOJgyc9jq1w1ZegnesWbfPG6oDwX9RNyhpFbOPy+PJZUV
-3nlst3uUIIFjQ72T6tJt8F/e/iRLc2JJHdNvu7P3wTzP3L9nvP1V2QW5VpZjFRpa
-NUwdjS3tCC/6iQjjRGj5ug8EMzyANLNOoOf/AgMBAAGjggGmMIIBojAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFPmo0qBBDnJPpqs+B2LxkPepL1s9MB8GA1UdIwQYMBaAFNTDRRKK
-qetNpcpWf2nRwmh0Y/0BMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3R1LWlsbWVuYXUtY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiG
-Nmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5h
-dS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABdc
-mXTLe/TlwLaKdKZTLZO5TjTH3zSWocQ0O6+kBJ2EVfYfmeL+ZS/J5v17tVMsQWBg
-rB1dtLSwuqbKYmuQBSQCIN8HdGC4iudCd93hGkSKxr11fByjvIb4fWUUcKObFmcI
-/1LpS/MSqxlOk3FRIMKs7fL7EFs59iyI3zjJixsQTx8AlU+7OHACGuC7VCfKJk7B
-1ChawQJNn6R1vMguYFXbGGhSQiUfeLVBDan7Px5eVgAIo2GLFKhNifPcG4lMHnfv
-0gOxyxgL/mnHXNkM+W47BpE1HO4fgoJiluR60Q0O+yjPCTjES3pjJtYb2ZOcXjNb
-s/NTn9EiARtxg0zkLNo=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Technische Universitaet Ilmenau</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Technische Universität Ilmenau</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-ilmenau.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jörg</GivenName>
-    <SurName>Deutschmann</SurName>
-    <EmailAddress>joerg.deutschmann@tu-ilmenau.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml b/swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml
deleted file mode 100644
index 97c6a5b1..00000000
--- a/swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ub.hsu-hh.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hsu-hh.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
-REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
-aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
-RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
-WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
-cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
-aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
-MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
-CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
-QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
-Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
-o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
-NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
-vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
-MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
-bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
-dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
-RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
-oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
-bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
-s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
-g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
-md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
-REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
-aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
-RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
-WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
-cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
-aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
-MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
-CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
-QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
-Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
-o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
-NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
-vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
-MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
-bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
-dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
-RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
-oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
-bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
-s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
-g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
-md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ub.hsu-hh.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.hsu-hh.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ub.hsu-hh.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.hsu-hh.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hsu-hh.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
-REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
-aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
-RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
-WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
-cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
-aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
-MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
-CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
-QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
-Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
-o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
-NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
-vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
-MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
-bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
-dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
-RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
-oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
-bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
-s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
-g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
-md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
-REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
-aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
-RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
-WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
-cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
-aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
-MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
-CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
-QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
-Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
-o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
-NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
-vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
-MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
-bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
-dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
-RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
-oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
-bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
-s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
-g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
-md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Helmut-Schmidt-Universität</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HSU Hamburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://ub.hsu-hh.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Hahn</SurName>
-    <EmailAddress>idp@hsu-bibliothek.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Hahn</SurName>
-    <EmailAddress>uhahn@hsu-bibliothek.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml b/swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml
deleted file mode 100644
index 41ebfe7b..00000000
--- a/swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ub.uni-heidelberg.de">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-heidelberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
-A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
-ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
-MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
-MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
-ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
-BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
-GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
-F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
-ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
-c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
-WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
-oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
-YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
-C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
-We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
-vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
-jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
-w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
-A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
-ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
-MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
-MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
-ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
-BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
-GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
-F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
-ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
-c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
-WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
-oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
-YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
-C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
-We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
-vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
-jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
-w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-heidelberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
-A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
-ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
-MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
-MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
-ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
-BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
-GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
-F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
-ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
-c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
-WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
-oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
-YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
-C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
-We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
-vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
-jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
-w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
-A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
-ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
-MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
-MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
-ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
-BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
-GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
-F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
-ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
-c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
-WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
-oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
-YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
-C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
-We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
-vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
-jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
-w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Heidelberg (Ruprecht-Karls-Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Heidelberg - Universitätsbibliothek</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-heidelberg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Leonhard</GivenName>
-    <SurName>Maylein</SurName>
-    <EmailAddress>maylein@ub.uni-heidelberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Leonhard</GivenName>
-    <SurName>Maylein</SurName>
-    <EmailAddress>maylein@ub.uni-heidelberg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umk.pl.xml b/swamid-interfederations-2.0/idp.umk.pl.xml
index 4ff0fa3a..e5b548a0 100644
--- a/swamid-interfederations-2.0/idp.umk.pl.xml
+++ b/swamid-interfederations-2.0/idp.umk.pl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.umk.pl/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-02-22T14:05:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-03-13T14:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/idp.uni-bremen.de.xml b/swamid-interfederations-2.0/idp.uni-bremen.de.xml
deleted file mode 100644
index f2971319..00000000
--- a/swamid-interfederations-2.0/idp.uni-bremen.de.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-bremen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-bremen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-bremen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-bremen.de,OU=Zentrum fuer Netze,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIEEeC7EjANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
-aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
-Q0EwHhcNMTEwNTA0MTE1MDI2WhcNMTYwNDA3MTE1MDI2WjCBhjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
-bml2ZXJzaXRhZXQgQnJlbWVuMRswGQYDVQQLExJaZW50cnVtIGZ1ZXIgTmV0emUx
-GjAYBgNVBAMTEWlkcC51bmktYnJlbWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEApaY06TS1aw15pSqeKBc5LicSB5al2zEGFe8Ag6htRduRvhKQ
-e/UeX5NbLUBy4dfzJHOGN3nC+9sY1d2+KVQhSy5PMdMwFp5uw9l5tbdp1skmAzT3
-u/JhZm4w6AtJrNg/XNsia85zmYb7MEwupApg1LHWv22GUeEaVKUifizsIMJJcmht
-FEkdZoGRhnrxa9VMk4bc9yczp94HWKkNEDSMrs1GF6tkbuYBcUuMlSbfTaokyBRf
-5VFWIcyBNH/UBMYEJwvY3E8yGwCyaazNvqz88vKk+XciVLQBQrO4R5jqH3GOfbMO
-8/llxsEpANKAQvw14CpF0mMCeEb2SuSDYNsi/wIDAQABo4ICMjCCAi4wCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBTk6oB1ISuGvHfp94oq2VEvftpafDAfBgNVHSMEGDAWgBTky8Ts
-edDfrm6skomunUkvxeWYQTCBiQYDVR0RBIGBMH+CEWlkcC51bmktYnJlbWVuLmRl
-ghJpZHAxLnVuaS1icmVtZW4uZGWCEmlkcDIudW5pLWJyZW1lbi5kZYISaWRwMy51
-bmktYnJlbWVuLmRlhwSGZhQZhihodHRwczovL2lkcC51bmktYnJlbWVuLmRlL2lk
-cC9zaGliYm9sZXRoMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-RgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALNUmLvk
-7NLulNhseHToJtgNE5TiXz6UqIWDtcukfBOrE9ThbdsnrP/93tfAM9S1MFDTNdlX
-dtrMhi7qbI8CyrN6r634hHu4GVCvFWCJvAhRPP+sGnhHeRKFm7z8N7suQ/qXzBPF
-oGAKYaQ0KNtILHt+tv6P3/NhLm3J9U/fpw/MG1E0hPbscJw87fT++MXjHO5FjzTw
-K+Ye1zxNgxBGY50+z5zS3BaNMztSjVgIZEzKg3VtPJwoKcbmKlkgkB/L7yn4xfxk
-YZZqgqqd8RkVkuWNPitwW6SDFD1Lcz4Wsqb1aslOVfwzLD6JLaVM+8GNqlsTWfJv
-WrtCKL4uiSA/ovg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-bremen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-bremen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-bremen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-bremen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-bremen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-bremen.de,OU=Zentrum fuer Netze,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIEEeC7EjANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
-aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
-Q0EwHhcNMTEwNTA0MTE1MDI2WhcNMTYwNDA3MTE1MDI2WjCBhjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
-bml2ZXJzaXRhZXQgQnJlbWVuMRswGQYDVQQLExJaZW50cnVtIGZ1ZXIgTmV0emUx
-GjAYBgNVBAMTEWlkcC51bmktYnJlbWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEApaY06TS1aw15pSqeKBc5LicSB5al2zEGFe8Ag6htRduRvhKQ
-e/UeX5NbLUBy4dfzJHOGN3nC+9sY1d2+KVQhSy5PMdMwFp5uw9l5tbdp1skmAzT3
-u/JhZm4w6AtJrNg/XNsia85zmYb7MEwupApg1LHWv22GUeEaVKUifizsIMJJcmht
-FEkdZoGRhnrxa9VMk4bc9yczp94HWKkNEDSMrs1GF6tkbuYBcUuMlSbfTaokyBRf
-5VFWIcyBNH/UBMYEJwvY3E8yGwCyaazNvqz88vKk+XciVLQBQrO4R5jqH3GOfbMO
-8/llxsEpANKAQvw14CpF0mMCeEb2SuSDYNsi/wIDAQABo4ICMjCCAi4wCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBTk6oB1ISuGvHfp94oq2VEvftpafDAfBgNVHSMEGDAWgBTky8Ts
-edDfrm6skomunUkvxeWYQTCBiQYDVR0RBIGBMH+CEWlkcC51bmktYnJlbWVuLmRl
-ghJpZHAxLnVuaS1icmVtZW4uZGWCEmlkcDIudW5pLWJyZW1lbi5kZYISaWRwMy51
-bmktYnJlbWVuLmRlhwSGZhQZhihodHRwczovL2lkcC51bmktYnJlbWVuLmRlL2lk
-cC9zaGliYm9sZXRoMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-RgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALNUmLvk
-7NLulNhseHToJtgNE5TiXz6UqIWDtcukfBOrE9ThbdsnrP/93tfAM9S1MFDTNdlX
-dtrMhi7qbI8CyrN6r634hHu4GVCvFWCJvAhRPP+sGnhHeRKFm7z8N7suQ/qXzBPF
-oGAKYaQ0KNtILHt+tv6P3/NhLm3J9U/fpw/MG1E0hPbscJw87fT++MXjHO5FjzTw
-K+Ye1zxNgxBGY50+z5zS3BaNMztSjVgIZEzKg3VtPJwoKcbmKlkgkB/L7yn4xfxk
-YZZqgqqd8RkVkuWNPitwW6SDFD1Lcz4Wsqb1aslOVfwzLD6JLaVM+8GNqlsTWfJv
-WrtCKL4uiSA/ovg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Bremen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bremen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-bremen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Schlittchen</SurName>
-    <EmailAddress>schlittchen@uni-bremen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Christian</GivenName>
-    <SurName>Schlittchen</SurName>
-    <EmailAddress>schlittchen@uni-bremen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml b/swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml
deleted file mode 100644
index 53d8d618..00000000
--- a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-duisburg-essen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
-bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
-54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
-Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
-F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
-2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
-nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
-p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
-QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
-MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
-VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
-JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
-oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
-RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
-/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
-bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
-54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
-Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
-F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
-2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
-nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
-p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
-QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
-MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
-VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
-JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
-oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
-RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
-/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-duisburg-essen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
-bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
-54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
-Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
-F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
-2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
-nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
-p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
-QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
-MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
-VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
-JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
-oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
-RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
-/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
-bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
-54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
-Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
-F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
-2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
-nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
-p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
-QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
-MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
-VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
-JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
-oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
-RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
-/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Duisburg-Essen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Harald</GivenName>
-    <SurName>Schüler</SurName>
-    <EmailAddress>harald.schueler@uni-duisburg-essen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Harald</GivenName>
-    <SurName>Schüler</SurName>
-    <EmailAddress>harald.schueler@uni-duisburg-essen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-konstanz.de.xml b/swamid-interfederations-2.0/idp.uni-konstanz.de.xml
deleted file mode 100644
index 40787d37..00000000
--- a/swamid-interfederations-2.0/idp.uni-konstanz.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-konstanz.de/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-konstanz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
-Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
-MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
-BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
-dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
-6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
-8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
-JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
-4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
-I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
-psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
-IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
-A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
-c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
-YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
-zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
-MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
-NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
-DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
-vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
-Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
-MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
-BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
-dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
-6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
-8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
-JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
-4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
-I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
-psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
-IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
-A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
-c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
-YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
-zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
-MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
-NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
-DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
-vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-konstanz.de/idp2/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-konstanz.de/idp2/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-konstanz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
-Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
-MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
-BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
-dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
-6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
-8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
-JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
-4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
-I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
-psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
-IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
-A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
-c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
-YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
-zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
-MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
-NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
-DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
-vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
-Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
-MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
-BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
-dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
-6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
-8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
-JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
-4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
-I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
-psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
-IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
-A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
-c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
-YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
-zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
-MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
-NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
-DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
-vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-konstanz.de/idp2/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-konstanz.de/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Konstanz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Konstanz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-konstanz.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Michael</GivenName>
-    <SurName>Längle</SurName>
-    <EmailAddress>michael.laengle@uni-konstanz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Markus</GivenName>
-    <SurName>Grandpre</SurName>
-    <EmailAddress>idp@uni-konstanz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Doreen</GivenName>
-    <SurName>Liebenau</SurName>
-    <EmailAddress>idp@uni-konstanz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-mannheim.de.xml b/swamid-interfederations-2.0/idp.uni-mannheim.de.xml
deleted file mode 100644
index b2f799fb..00000000
--- a/swamid-interfederations-2.0/idp.uni-mannheim.de.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-mannheim.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
-aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
-dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
-Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
-MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
-MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
-aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
-FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
-E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
-DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
-6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
-05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
-AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
-PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
-gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
-cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
-lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
-bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
-azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
-nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
-+/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
-lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
-NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
-aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
-dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
-Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
-MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
-MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
-aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
-FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
-E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
-DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
-6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
-05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
-AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
-PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
-gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
-cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
-lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
-bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
-azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
-nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
-+/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
-lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
-NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-mannheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-mannheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-mannheim.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
-aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
-dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
-Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
-MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
-MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
-aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
-FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
-E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
-DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
-6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
-05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
-AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
-PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
-gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
-cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
-lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
-bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
-azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
-nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
-+/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
-lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
-NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
-aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
-dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
-Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
-MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
-MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
-aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
-FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
-E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
-DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
-6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
-05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
-AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
-PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
-gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
-cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
-lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
-bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
-azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
-nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
-+/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
-lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
-NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Mannheim</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Mannheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-mannheim.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Magnus</GivenName>
-    <SurName>Pfeffer</SurName>
-    <EmailAddress>pfeffer@bib.uni-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Magnus</GivenName>
-    <SurName>Pfeffer</SurName>
-    <EmailAddress>pfeffer@bib.uni-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-oldenburg.de.xml b/swamid-interfederations-2.0/idp.uni-oldenburg.de.xml
deleted file mode 100644
index 125341fe..00000000
--- a/swamid-interfederations-2.0/idp.uni-oldenburg.de.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-oldenburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-oldenburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-oldenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-oldenburg.de,OU=IT-Dienste,O=Universitaet Oldenburg,L=Oldenburg,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHDjCCBfagAwIBAgIHEplo8IxnyjANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEjAQBgNVBAcTCU9sZGVuYnVy
-ZzEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IE9sZGVuYnVyZzETMBEGA1UECxMKSVQt
-RGllbnN0ZTEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0IE9sZGVuYnVyZyBQS0kxIzAh
-BgkqhkiG9w0BCQEWFHBraUB1bmktb2xkZW5idXJnLmRlMB4XDTExMDkyMTEzNDky
-MFoXDTE2MDkxOTEzNDkyMFowgY4xCzAJBgNVBAYTAkRFMRYwFAYDVQQIEw1OaWVk
-ZXJzYWNoc2VuMRIwEAYDVQQHEwlPbGRlbmJ1cmcxHzAdBgNVBAoTFlVuaXZlcnNp
-dGFldCBPbGRlbmJ1cmcxEzARBgNVBAsTCklULURpZW5zdGUxHTAbBgNVBAMTFGlk
-cC51bmktb2xkZW5idXJnLmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAs15u8dUfaE1ArfvQSc/wvoOcfl3OsdFfkipWDyPm/2JtuHw4FKd6gfYgXHKL
-JHBwolaxPynjp807RKFEjGyIKhjoBZjUQvb6jsl14cSlPEIByHA4fdKpDpMzhEEV
-9QtsI0OmqOdx6bQoXwiF3j0Ns/g/8W62iW077LJgMjygWjXAsIZRwU1qA9R9N/3/
-+oyIiKIrqNuYZJzYqg3DBlNOei32OA5nJ9lIQcWHP1pTFNACHoPBzoES2v1yLhnk
-em00291hy20+NV5s9zyq+EKaCcKaBkyM8GhLYSuXN7j0o5t8n8C2FMj0E9p+CDVn
-/FcjEYCKmWiVCYTEItnx0LMj8z5JlpnuuJvucR/FZiSH1upRNeBjuFLhazaY2buv
-SzmCK9SbaAssFfoq4Weu03IlFbJ8i+581D4jH+oez5DwYvR1ujfCehie9DpoFqVs
-6hyMaiYuFYS6P4Tk8OREROZPjESYmb9Qi+Z3S95lczKKr54pWpufRKH0pZ+WoW7A
-BvZ6bf0xDT2dV78wyv75aDKG6fTKbNanB/SFIAftJHiFAW76eO6KDhPuLQ+mKHOw
-D7XOvaY5wlU5t93y+kSJSkrrdU0Nq0qPWVKDFHhtAJcB0VNRvSV0RQQs60F0ba4a
-lNqmb3taz9hxJQWSgleMUYOyYeKYQE8iRWFbIgG8ruPpLtkCAwEAAaOCAkIwggI+
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
-A1UdDgQWBBQ9StoW4Czg2vvQHoUD5tJkV8evAzAfBgNVHSMEGDAWgBQYj0Rh3N14
-cjfS9bkFeN5/PSnO6DCBlQYDVR0RBIGNMIGKghRpZHAudW5pLW9sZGVuYnVyZy5k
-ZYIbaWRwMDEudmlydC51bmktb2xkZW5idXJnLmRlghtpZHAwMi52aXJ0LnVuaS1v
-bGRlbmJ1cmcuZGWCG2lkcDAzLnZpcnQudW5pLW9sZGVuYnVyZy5kZYIbaWRwMDQu
-dmlydC51bmktb2xkZW5idXJnLmRlMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW9sZGVuYnVyZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb2xkZW5idXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGmBggrBgEFBQcBAQSBmTCBljBJBggrBgEF
-BQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAS6dV/3BmpPKBykvxbhYSX7uZOoV0BJBkLdJ8PthY
-dD+xvEC7lCGBtS0KiRVws4QHIzaSnFTUYZd2WqvcOu5iUR0RXyqS30FqvHwME5V4
-FI81Etb0lGu5PHA2Cg/M8uz+bYGav6322rVFte2xvdbVmGsHcnwbP5L3ZqxXehJD
-wRHKvp9JtANDDLPRtyqYCRFo5+6kUNkdR7OcpidBpZPZETtj1mAxFiLfeGoCI62l
-Q+LoQjURLUiwcqlUKQSMVYzCA67HAgsE8P8XWbDvkCpCKD8Vv0hBnB/237i+7Aeh
-q9IDXljT9qGCmnSi3z5W0Y+2x9RI3nuNIHeFbz25j8+Hrg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-oldenburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-oldenburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-oldenburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-oldenburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-oldenburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-oldenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-oldenburg.de,OU=IT-Dienste,O=Universitaet Oldenburg,L=Oldenburg,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHDjCCBfagAwIBAgIHEplo8IxnyjANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEjAQBgNVBAcTCU9sZGVuYnVy
-ZzEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IE9sZGVuYnVyZzETMBEGA1UECxMKSVQt
-RGllbnN0ZTEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0IE9sZGVuYnVyZyBQS0kxIzAh
-BgkqhkiG9w0BCQEWFHBraUB1bmktb2xkZW5idXJnLmRlMB4XDTExMDkyMTEzNDky
-MFoXDTE2MDkxOTEzNDkyMFowgY4xCzAJBgNVBAYTAkRFMRYwFAYDVQQIEw1OaWVk
-ZXJzYWNoc2VuMRIwEAYDVQQHEwlPbGRlbmJ1cmcxHzAdBgNVBAoTFlVuaXZlcnNp
-dGFldCBPbGRlbmJ1cmcxEzARBgNVBAsTCklULURpZW5zdGUxHTAbBgNVBAMTFGlk
-cC51bmktb2xkZW5idXJnLmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAs15u8dUfaE1ArfvQSc/wvoOcfl3OsdFfkipWDyPm/2JtuHw4FKd6gfYgXHKL
-JHBwolaxPynjp807RKFEjGyIKhjoBZjUQvb6jsl14cSlPEIByHA4fdKpDpMzhEEV
-9QtsI0OmqOdx6bQoXwiF3j0Ns/g/8W62iW077LJgMjygWjXAsIZRwU1qA9R9N/3/
-+oyIiKIrqNuYZJzYqg3DBlNOei32OA5nJ9lIQcWHP1pTFNACHoPBzoES2v1yLhnk
-em00291hy20+NV5s9zyq+EKaCcKaBkyM8GhLYSuXN7j0o5t8n8C2FMj0E9p+CDVn
-/FcjEYCKmWiVCYTEItnx0LMj8z5JlpnuuJvucR/FZiSH1upRNeBjuFLhazaY2buv
-SzmCK9SbaAssFfoq4Weu03IlFbJ8i+581D4jH+oez5DwYvR1ujfCehie9DpoFqVs
-6hyMaiYuFYS6P4Tk8OREROZPjESYmb9Qi+Z3S95lczKKr54pWpufRKH0pZ+WoW7A
-BvZ6bf0xDT2dV78wyv75aDKG6fTKbNanB/SFIAftJHiFAW76eO6KDhPuLQ+mKHOw
-D7XOvaY5wlU5t93y+kSJSkrrdU0Nq0qPWVKDFHhtAJcB0VNRvSV0RQQs60F0ba4a
-lNqmb3taz9hxJQWSgleMUYOyYeKYQE8iRWFbIgG8ruPpLtkCAwEAAaOCAkIwggI+
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
-A1UdDgQWBBQ9StoW4Czg2vvQHoUD5tJkV8evAzAfBgNVHSMEGDAWgBQYj0Rh3N14
-cjfS9bkFeN5/PSnO6DCBlQYDVR0RBIGNMIGKghRpZHAudW5pLW9sZGVuYnVyZy5k
-ZYIbaWRwMDEudmlydC51bmktb2xkZW5idXJnLmRlghtpZHAwMi52aXJ0LnVuaS1v
-bGRlbmJ1cmcuZGWCG2lkcDAzLnZpcnQudW5pLW9sZGVuYnVyZy5kZYIbaWRwMDQu
-dmlydC51bmktb2xkZW5idXJnLmRlMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW9sZGVuYnVyZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb2xkZW5idXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGmBggrBgEFBQcBAQSBmTCBljBJBggrBgEF
-BQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAS6dV/3BmpPKBykvxbhYSX7uZOoV0BJBkLdJ8PthY
-dD+xvEC7lCGBtS0KiRVws4QHIzaSnFTUYZd2WqvcOu5iUR0RXyqS30FqvHwME5V4
-FI81Etb0lGu5PHA2Cg/M8uz+bYGav6322rVFte2xvdbVmGsHcnwbP5L3ZqxXehJD
-wRHKvp9JtANDDLPRtyqYCRFo5+6kUNkdR7OcpidBpZPZETtj1mAxFiLfeGoCI62l
-Q+LoQjURLUiwcqlUKQSMVYzCA67HAgsE8P8XWbDvkCpCKD8Vv0hBnB/237i+7Aeh
-q9IDXljT9qGCmnSi3z5W0Y+2x9RI3nuNIHeFbz25j8+Hrg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Oldenburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Oldenburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-oldenburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Timm</GivenName>
-    <SurName>Stamer</SurName>
-    <EmailAddress>idm@uni-oldenburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Czernik</SurName>
-    <EmailAddress>ulrich.czernik@uni-oldenburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-stuttgart.de.xml b/swamid-interfederations-2.0/idp.uni-stuttgart.de.xml
deleted file mode 100644
index 69c8eada..00000000
--- a/swamid-interfederations-2.0/idp.uni-stuttgart.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-stuttgart.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-stuttgart.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
-MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
-cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
-qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
-mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
-ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
-uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
-6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
-FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
-cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
-AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
-qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
-YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
-kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
-7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
-yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
-MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
-cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
-qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
-mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
-ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
-uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
-6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
-FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
-cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
-AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
-qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
-YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
-kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
-7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
-yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-stuttgart.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-stuttgart.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-stuttgart.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
-MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
-cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
-qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
-mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
-ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
-uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
-6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
-FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
-cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
-AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
-qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
-YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
-kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
-7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
-yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
-MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
-cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
-qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
-mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
-ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
-uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
-6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
-FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
-cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
-AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
-qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
-YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
-kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
-7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
-yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-stuttgart.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Lutz</SurName>
-    <EmailAddress>lutz@rus.uni-stuttgart.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>David</GivenName>
-    <SurName>Lutz</SurName>
-    <EmailAddress>lutz@rus.uni-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-tuebingen.de.xml b/swamid-interfederations-2.0/idp.uni-tuebingen.de.xml
deleted file mode 100644
index 18fe7cc6..00000000
--- a/swamid-interfederations-2.0/idp.uni-tuebingen.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-tuebingen.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-tuebingen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
-aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
-QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
-9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
-l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
-9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
-kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
-eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
-4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
-MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
-BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
-Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
-LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
-FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
-0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
-Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
-wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
-9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
-aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
-QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
-9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
-l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
-9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
-kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
-eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
-4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
-MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
-BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
-Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
-LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
-FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
-0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
-Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
-wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
-9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-tuebingen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-tuebingen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
-aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
-QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
-9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
-l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
-9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
-kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
-eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
-4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
-MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
-BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
-Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
-LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
-FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
-0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
-Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
-wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
-9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
-aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
-QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
-9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
-l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
-9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
-kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
-eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
-4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
-MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
-BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
-Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
-LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
-FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
-0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
-Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
-wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
-9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Tübingen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Tübingen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Dr. Abele</SurName>
-    <EmailAddress>heinrich.abele@uni-tuebingen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ina</GivenName>
-    <SurName>Müller</SurName>
-    <EmailAddress>ina.mueller@uni-tuebingen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-ulm.de.xml b/swamid-interfederations-2.0/idp.uni-ulm.de.xml
deleted file mode 100644
index 2bbb7205..00000000
--- a/swamid-interfederations-2.0/idp.uni-ulm.de.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-ulm.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-ulm.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
-RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
-aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
-MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
-VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
-TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
-noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
-+PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
-qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
-+j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
-ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
-A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
-M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
-dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
-da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
-KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
-AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
-NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
-jrSXV8bqE4onz+nFV6gyew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
-RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
-aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
-MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
-VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
-TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
-noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
-+PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
-qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
-+j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
-ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
-A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
-M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
-dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
-da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
-KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
-AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
-NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
-jrSXV8bqE4onz+nFV6gyew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-ulm.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-ulm.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-ulm.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-ulm.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-ulm.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
-RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
-aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
-MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
-VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
-TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
-noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
-+PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
-qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
-+j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
-ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
-A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
-M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
-dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
-da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
-KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
-AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
-NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
-jrSXV8bqE4onz+nFV6gyew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
-RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
-aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
-MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
-VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
-TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
-noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
-+PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
-qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
-+j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
-ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
-A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
-M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
-dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
-da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
-KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
-AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
-NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
-jrSXV8bqE4onz+nFV6gyew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Ulm</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Ulm</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-ulm.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Harald</GivenName>
-    <SurName>Däubler</SurName>
-    <EmailAddress>harald.daeubler@uni-ulm.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-wuppertal.de.xml b/swamid-interfederations-2.0/idp.uni-wuppertal.de.xml
deleted file mode 100644
index 92786a21..00000000
--- a/swamid-interfederations-2.0/idp.uni-wuppertal.de.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-wuppertal.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFaTCCBFGgAwIBAgIED/eV6DANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1cHBl
-cnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwx
-DDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEGCSqG
-SIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTAwNDI4MTExMzI4WhcN
-MTUwNDI3MTExMzI4WjBXMQswCQYDVQQGEwJERTEpMCcGA1UEChMgQmVyZ2lzY2hl
-IFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMTFGlkcC51bmktd3VwcGVy
-dGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKYnT23i7mX
-ryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOqRzPzTvrR
-Kmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuOj3hB3CV4
-3WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQfEsNWMykB
-o3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA+xj3TQ76
-uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht35fM7Yd/A
-Ys1g6BfAXQIDAQABo4IB2TCCAdUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L
-83/B5MjuYAX6czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAjBgNV
-HREEHDAagRh6ZWlwZWx0QHVuaS13dXBwZXJ0YWwuZGUwgY0GA1UdHwSBhTCBgjA/
-oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZ
-MIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS13dXBw
-ZXJ0YWwtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDVsvT8z+AmPlmk/MEKY5Nt5vP
-w3B3oUunFn+sbe2EKFVHr72cArNYSMGifmfTEMEpq3BStFG/o+oC0r6UEV58sLOk
-Xm3YiD9H82ZAtoHwn73b/bCXftUugPAj/cHXp1VuEA74Gsh+EoeTk2lgD++AdgCN
-7owrEXrDgtZ8howA/wRhEg8QQxrUVviY1wyfxfU4F6RGS7RpQpqrmvx5ER/dkuIs
-dSxphgBVgx8fkgALpLoD+UhRa3rqTA+0ZKRdKQpxBpGU5/3aN6btgI3pbaSbjtYl
-WVERos0F4cDzSzGONgdQWlLLndqyEZwW33kGpnxHgtDXQf9QtbY3JgawBNAV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-wuppertal.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFaTCCBFGgAwIBAgIED/eV6DANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1cHBl
-cnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwx
-DDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEGCSqG
-SIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTAwNDI4MTExMzI4WhcN
-MTUwNDI3MTExMzI4WjBXMQswCQYDVQQGEwJERTEpMCcGA1UEChMgQmVyZ2lzY2hl
-IFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMTFGlkcC51bmktd3VwcGVy
-dGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKYnT23i7mX
-ryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOqRzPzTvrR
-Kmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuOj3hB3CV4
-3WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQfEsNWMykB
-o3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA+xj3TQ76
-uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht35fM7Yd/A
-Ys1g6BfAXQIDAQABo4IB2TCCAdUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L
-83/B5MjuYAX6czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAjBgNV
-HREEHDAagRh6ZWlwZWx0QHVuaS13dXBwZXJ0YWwuZGUwgY0GA1UdHwSBhTCBgjA/
-oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZ
-MIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS13dXBw
-ZXJ0YWwtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDVsvT8z+AmPlmk/MEKY5Nt5vP
-w3B3oUunFn+sbe2EKFVHr72cArNYSMGifmfTEMEpq3BStFG/o+oC0r6UEV58sLOk
-Xm3YiD9H82ZAtoHwn73b/bCXftUugPAj/cHXp1VuEA74Gsh+EoeTk2lgD++AdgCN
-7owrEXrDgtZ8howA/wRhEg8QQxrUVviY1wyfxfU4F6RGS7RpQpqrmvx5ER/dkuIs
-dSxphgBVgx8fkgALpLoD+UhRa3rqTA+0ZKRdKQpxBpGU5/3aN6btgI3pbaSbjtYl
-WVERos0F4cDzSzGONgdQWlLLndqyEZwW33kGpnxHgtDXQf9QtbY3JgawBNAV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bergische Universität Wuppertal</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bergische Universität Wuppertal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-wuppertal.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Rene</GivenName>
-    <SurName>Zeipelt</SurName>
-    <EmailAddress>zeipelt@uni-wuppertal.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rene</GivenName>
-    <SurName>Zeipelt</SurName>
-    <EmailAddress>zeipelt@uni-wuppertal.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it.xml b/swamid-interfederations-2.0/idp.uniroma3.it.xml
index 39be6e63..2080f859 100644
--- a/swamid-interfederations-2.0/idp.uniroma3.it.xml
+++ b/swamid-interfederations-2.0/idp.uniroma3.it.xml
@@ -46,7 +46,7 @@
                             WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
                             wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
                             cTXFyKPFTrE=
-			</ds:X509Certificate>
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -100,7 +100,7 @@
                             WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
                             wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
                             cTXFyKPFTrE=
-			</ds:X509Certificate>
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utia.cas.cz.xml b/swamid-interfederations-2.0/idp.utia.cas.cz.xml
new file mode 100644
index 00000000..a33939f5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.utia.cas.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.utia.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">utia.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UTIA AV CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">ÚTIA AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider UTIA AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTIA AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.utia.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.utia.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-utia-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-utia-411.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAPWAIIDpvyOIAKgxvS8uAGvErbFIMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejAeFw0xNDAxMjExMzQ5MzFa
+Fw0zNDAxMjExMzQ5MzFaMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIMlroofDB1hzFwO3vg/GyYuWHzq
+ltlkURfEPJOAnKG/W2ax+ljT+4OvFochFR3Tn2z9k9BzjK2TNbK4SSHnojSn/7ml
+UEe5GcSqUzWRz7N6IPWqq95bpHAjttP9GChbwn9TWbiim+rom7azfJ5GMNpECE6x
+J6hnZLLqe9tH3MRjHq/g1EgoYwkRN4p+GH50zpPfZmqdChoxN4+ipiwodGHUGLbK
+qjrCkusd3nx9hjkZNsB9Xwcws4HJhnfKmUaRXccBeXI+93rOVTVgRdzC4AoV18xZ
+DT4mZJHi0rAr+S8k/qHpYapp4BJX8FlGxzfUM/KtJft6aupc2KkacFeJzXkCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLnV0aWEuY2FzLmN6hiZodHRwczovL2lkcC51
+dGlhLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQULF0CAFze9Eoavjce
+J1fkA5ZwtzEwDQYJKoZIhvcNAQEFBQADggEBAEdPs/pVXrBbxB8Gs7V3a9gGn7Va
+4svNZ7mosAAWvlXPLGKzdmp8GdqH1UNjNZouxSXJDVC4sbOKcFiyu7gr+Bc+SbhH
+vd5/D4EzzaF5LrfCcy4z0z/Z2GmoejJUkysYTnvfDJwUk57JKfeF7JP0WTxtGwBX
+us9wwyhp00Lvq91NAddg0YCHgYkNNJ+nEqinRTUHtF1/NM0kOxj5Bldl+Ea5ofMi
+4xHhOx6IKjHfhU+xSBtA5JalGefjXT8reS2EPc8NY8YQE7fxytldlc3C4nkLilwp
+p6lZaMAngitaUamaZdgJTVokp6H6D9o6qommaXW6BFw0RskMVAO4QKWnanc=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utia.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utia.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utia.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">utia.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAPWAIIDpvyOIAKgxvS8uAGvErbFIMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejAeFw0xNDAxMjExMzQ5MzFa
+Fw0zNDAxMjExMzQ5MzFaMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIMlroofDB1hzFwO3vg/GyYuWHzq
+ltlkURfEPJOAnKG/W2ax+ljT+4OvFochFR3Tn2z9k9BzjK2TNbK4SSHnojSn/7ml
+UEe5GcSqUzWRz7N6IPWqq95bpHAjttP9GChbwn9TWbiim+rom7azfJ5GMNpECE6x
+J6hnZLLqe9tH3MRjHq/g1EgoYwkRN4p+GH50zpPfZmqdChoxN4+ipiwodGHUGLbK
+qjrCkusd3nx9hjkZNsB9Xwcws4HJhnfKmUaRXccBeXI+93rOVTVgRdzC4AoV18xZ
+DT4mZJHi0rAr+S8k/qHpYapp4BJX8FlGxzfUM/KtJft6aupc2KkacFeJzXkCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLnV0aWEuY2FzLmN6hiZodHRwczovL2lkcC51
+dGlhLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQULF0CAFze9Eoavjce
+J1fkA5ZwtzEwDQYJKoZIhvcNAQEFBQADggEBAEdPs/pVXrBbxB8Gs7V3a9gGn7Va
+4svNZ7mosAAWvlXPLGKzdmp8GdqH1UNjNZouxSXJDVC4sbOKcFiyu7gr+Bc+SbhH
+vd5/D4EzzaF5LrfCcy4z0z/Z2GmoejJUkysYTnvfDJwUk57JKfeF7JP0WTxtGwBX
+us9wwyhp00Lvq91NAddg0YCHgYkNNJ+nEqinRTUHtF1/NM0kOxj5Bldl+Ea5ofMi
+4xHhOx6IKjHfhU+xSBtA5JalGefjXT8reS2EPc8NY8YQE7fxytldlc3C4nkLilwp
+p6lZaMAngitaUamaZdgJTVokp6H6D9o6qommaXW6BFw0RskMVAO4QKWnanc=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Institute of Information Theory and Automation</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav teorie informace a automatizace AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Information Theory and Automation, Public Research Institution</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Ústav teorie informace a automatizace AV ČR, v.v.i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.utia.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.utia.cas.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml b/swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml
deleted file mode 100644
index 0bc2821c..00000000
--- a/swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wlb-stuttgart.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">wlb-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.wlb-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.wlb-stuttgart.de,OU=EDV,O=Wuerttembergische Landesbibliothek,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVTCCBD2gAwIBAgIEELqHxTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4tV3Vl
-cnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG9w0B
-CQEWDXBraUBic3otYncuZGUwHhcNMTAwOTIzMDgwNTA5WhcNMTQwOTIyMjM1OTU5
-WjCBmDELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzES
-MBAGA1UEBxMJU3R1dHRnYXJ0MSswKQYDVQQKEyJXdWVydHRlbWJlcmdpc2NoZSBM
-YW5kZXNiaWJsaW90aGVrMQwwCgYDVQQLEwNFRFYxHTAbBgNVBAMTFGlkcC53bGIt
-c3R1dHRnYXJ0LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwIE9
-X0v4R32KFOFYzeredu/vS4wxmuk4HEYdidHEXmsVnfckcHOM323e4+mUh2RV9syU
-PCmZSrvCrqARQVpmvypvPY3eR8lTje1KyeY1J7UUb7JdHTNoO4ri0RJ/Z2FxUUgo
-pEI5Mo/XfiV89j2kPui8Jenck5Mahc3YdMcHzVRR2BEDAvEzLIS9Zygs0lgCW5HU
-ua/1dE4fVYk0VDhuc9ECpB8fe5xMnprpZMXveEHaAD1ZG0rgstQ3hpj2uVqJumbm
-IOdce2rIGDUGHk9SajCXq2NDaj4heQYYTwVymkQJ0jUmu2HBkkBse/EUwOlUmj0k
-jlUGtEbs8pV1PVUjMwIDAQABo4IBvzCCAbswCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBT43X+Z
-KgiAHC6kQ8SivTZ83GAq1TAfBgNVHSMEGDAWgBQprQDey2blH96qjW3snLRC/vub
-ITAfBgNVHREEGDAWgRRlZHZAd2xiLXN0dXR0Z2FydC5kZTCBgQYDVR0fBHoweDA6
-oDigNoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ic3otYnctY2EvcHViL2NybC9n
-X2NhY3JsLmNybDA6oDigNoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ic3otYnct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBnAYIKwYBBQUHAQEEgY8wgYwwRAYIKwYB
-BQUHMAKGOGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYnN6LWJ3LWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MEQGCCsGAQUFBzAChjhodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2Jzei1idy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQUFAAOCAQEAhOsm/wAynp2EwfUnAZyIM9QHGMPqBhGQX8GAAXVmMe8N/gSzEKs/
-QIkoFOplyMxDYduUnBOeKr5zV5TWhgmlqZs3AM9RQq/xWJA/XAk/XIlYd1ABpdAZ
-N0cYZj2B6mR3gw1y8h9OqN5xxizTyq37rJe2a5GBvqO+W1g/0+My8oxFGen1Ui10
-lNs5EXO4DnqsOJmG1vM+zsEbc/PyJaau/v3DVw5XS7+gx8PanN24P1rtLwUA7iCf
-K+99+9nuT00B0SO1kd2bQOOZth98ennBqB+cXYxM8q3eO9/rzMNWyGb3AtDMIX0Y
-vkncr5R65ffZnIyA5Ey1/VBh8NY99H+/ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wlb-stuttgart.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wlb-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wlb-stuttgart.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wlb-stuttgart.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">wlb-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.wlb-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.wlb-stuttgart.de,OU=EDV,O=Wuerttembergische Landesbibliothek,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVTCCBD2gAwIBAgIEELqHxTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4tV3Vl
-cnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG9w0B
-CQEWDXBraUBic3otYncuZGUwHhcNMTAwOTIzMDgwNTA5WhcNMTQwOTIyMjM1OTU5
-WjCBmDELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzES
-MBAGA1UEBxMJU3R1dHRnYXJ0MSswKQYDVQQKEyJXdWVydHRlbWJlcmdpc2NoZSBM
-YW5kZXNiaWJsaW90aGVrMQwwCgYDVQQLEwNFRFYxHTAbBgNVBAMTFGlkcC53bGIt
-c3R1dHRnYXJ0LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwIE9
-X0v4R32KFOFYzeredu/vS4wxmuk4HEYdidHEXmsVnfckcHOM323e4+mUh2RV9syU
-PCmZSrvCrqARQVpmvypvPY3eR8lTje1KyeY1J7UUb7JdHTNoO4ri0RJ/Z2FxUUgo
-pEI5Mo/XfiV89j2kPui8Jenck5Mahc3YdMcHzVRR2BEDAvEzLIS9Zygs0lgCW5HU
-ua/1dE4fVYk0VDhuc9ECpB8fe5xMnprpZMXveEHaAD1ZG0rgstQ3hpj2uVqJumbm
-IOdce2rIGDUGHk9SajCXq2NDaj4heQYYTwVymkQJ0jUmu2HBkkBse/EUwOlUmj0k
-jlUGtEbs8pV1PVUjMwIDAQABo4IBvzCCAbswCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBT43X+Z
-KgiAHC6kQ8SivTZ83GAq1TAfBgNVHSMEGDAWgBQprQDey2blH96qjW3snLRC/vub
-ITAfBgNVHREEGDAWgRRlZHZAd2xiLXN0dXR0Z2FydC5kZTCBgQYDVR0fBHoweDA6
-oDigNoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ic3otYnctY2EvcHViL2NybC9n
-X2NhY3JsLmNybDA6oDigNoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ic3otYnct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBnAYIKwYBBQUHAQEEgY8wgYwwRAYIKwYB
-BQUHMAKGOGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYnN6LWJ3LWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MEQGCCsGAQUFBzAChjhodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2Jzei1idy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQUFAAOCAQEAhOsm/wAynp2EwfUnAZyIM9QHGMPqBhGQX8GAAXVmMe8N/gSzEKs/
-QIkoFOplyMxDYduUnBOeKr5zV5TWhgmlqZs3AM9RQq/xWJA/XAk/XIlYd1ABpdAZ
-N0cYZj2B6mR3gw1y8h9OqN5xxizTyq37rJe2a5GBvqO+W1g/0+My8oxFGen1Ui10
-lNs5EXO4DnqsOJmG1vM+zsEbc/PyJaau/v3DVw5XS7+gx8PanN24P1rtLwUA7iCf
-K+99+9nuT00B0SO1kd2bQOOZth98ennBqB+cXYxM8q3eO9/rzMNWyGb3AtDMIX0Y
-vkncr5R65ffZnIyA5Ey1/VBh8NY99H+/ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Württembergische Landesbibliothek Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Württembergische Landesbibliothek Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.wlb-stuttgart.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jörg</GivenName>
-    <SurName>Oberfell</SurName>
-    <EmailAddress>shibboleth-admin@wlb-stuttgart.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Jörg</GivenName>
-    <SurName>Oberfell</SurName>
-    <EmailAddress>shibboleth-admin@wlb-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.hs-augsburg.de.xml b/swamid-interfederations-2.0/idp1.hs-augsburg.de.xml
deleted file mode 100644
index 449a1082..00000000
--- a/swamid-interfederations-2.0/idp1.hs-augsburg.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.hs-augsburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-augsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
-CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
-MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
-Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
-E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
-kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
-VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
-42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
-ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
-aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
-OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
-gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
-BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
-AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
-iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
-dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
-f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
-OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
-AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
-cln+zg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
-CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
-MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
-Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
-E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
-kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
-VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
-42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
-ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
-aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
-OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
-gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
-BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
-AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
-iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
-dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
-f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
-OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
-AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
-cln+zg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.hs-augsburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hs-augsburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-augsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
-CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
-MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
-Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
-E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
-kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
-VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
-42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
-ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
-aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
-OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
-gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
-BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
-AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
-iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
-dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
-f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
-OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
-AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
-cln+zg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
-CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
-MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
-Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
-E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
-kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
-VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
-42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
-ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
-aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
-OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
-gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
-BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
-AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
-iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
-dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
-f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
-OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
-AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
-cln+zg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Augsburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Augsburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-augsburg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Arno</GivenName>
-    <SurName>Schneider</SurName>
-    <EmailAddress>arno.schneider@hs-augsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Arno</GivenName>
-    <SurName>Schneider</SurName>
-    <EmailAddress>arno.schneider@hs-augsburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2-1.slu.se.xml b/swamid-interfederations-2.0/idp2-1.slu.se.xml
new file mode 100644
index 00000000..c7a18791
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2-1.slu.se.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2-1.slu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Sveriges Lantbruksuniversitet.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Swedish University of Agricultural Science</mdui:Description>
+        <mdui:Logo height="100" width="100">https://idp2-1.slu.se/info/images/slu_logotyp_web_100.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp2-1.slu.se/info/images/slu_logotyp_web_16.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIUIDSi2H8dePffTFkVUjtBaLv6ctUwDQYJKoZIhvcNAQEF
+BQAwETEPMA0GA1UEAxMGaWRwMi0xMB4XDTEzMDMxNDA3NTU0OVoXDTMzMDMxNDA3
+NTU0OVowETEPMA0GA1UEAxMGaWRwMi0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA1L9PRiIOUnTbMQoU0LwTtlSeQLwvXbu87PfFMTTpQgdUBrMCPDWL
+mrT6Wko9WmGoAGkYft7bMjFDEkA03Cj5qTbFtemN6Jp/ZqieDnh09wxBdfzOAkSv
+jSdHQK08ITpH91PYtubd9Id6sEI5M6oZ2gSqim/BitjEOh2X1pd5wlLRCtX+YKPE
+UhOdHOuxFfiZALpWoQDWSID0g+yOc9qPj9BvO4gE+YsHbVw+T4f+7IdMEQj+WX1e
+x6EDWSJ8yjRc8RyCXw3AtGWEaCU6NkL5ksTV7DfkozWDjfF6srFck6ksDKN+EEZ4
+wBC+ZCRevaqO/BRfQmsn3JxWRUU9ddTP8QIDAQABo1MwUTAwBgNVHREEKTAnggZp
+ZHAyLTGGHWh0dHBzOi8vaWRwMi0xL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTs
+FaVVn2xyoTYbOGdkDDdtFV8ErzANBgkqhkiG9w0BAQUFAAOCAQEAVETKawYhusol
+wIP2n2bnvKoTD8wJPZNUpxvxBeY72Ux9tzILAdnaDY3lPAwaslqGN7Q3MEVIPbA7
+ebTyR6KPprv3/ijN78HA2FpuIumCiMwgcKTntA1ti8TkCknc/p25yuSJm8kk1YYT
+EI/cBEjV7AeP1NQXVkxyj9zwY0dYzax/h6Wg+t7qvs8ORxOJdEhr1zdsxY1f+7Aa
+GH/yHRavwkRh3ICgDSty9dO7c8k5MXjnX/W+zZR1/IngJMmUKZXIoLmqwdaHPb+S
+lb1DOdXnNxi+WNQXbBjzonEZa0hFPT/ml32QpjCzh11edlGltCnQVzyLJGw/W5KT
+o04ltBnMhQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-1.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-1.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2-1.slu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-1.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-1.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-1.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIUIDSi2H8dePffTFkVUjtBaLv6ctUwDQYJKoZIhvcNAQEF
+BQAwETEPMA0GA1UEAxMGaWRwMi0xMB4XDTEzMDMxNDA3NTU0OVoXDTMzMDMxNDA3
+NTU0OVowETEPMA0GA1UEAxMGaWRwMi0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA1L9PRiIOUnTbMQoU0LwTtlSeQLwvXbu87PfFMTTpQgdUBrMCPDWL
+mrT6Wko9WmGoAGkYft7bMjFDEkA03Cj5qTbFtemN6Jp/ZqieDnh09wxBdfzOAkSv
+jSdHQK08ITpH91PYtubd9Id6sEI5M6oZ2gSqim/BitjEOh2X1pd5wlLRCtX+YKPE
+UhOdHOuxFfiZALpWoQDWSID0g+yOc9qPj9BvO4gE+YsHbVw+T4f+7IdMEQj+WX1e
+x6EDWSJ8yjRc8RyCXw3AtGWEaCU6NkL5ksTV7DfkozWDjfF6srFck6ksDKN+EEZ4
+wBC+ZCRevaqO/BRfQmsn3JxWRUU9ddTP8QIDAQABo1MwUTAwBgNVHREEKTAnggZp
+ZHAyLTGGHWh0dHBzOi8vaWRwMi0xL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTs
+FaVVn2xyoTYbOGdkDDdtFV8ErzANBgkqhkiG9w0BAQUFAAOCAQEAVETKawYhusol
+wIP2n2bnvKoTD8wJPZNUpxvxBeY72Ux9tzILAdnaDY3lPAwaslqGN7Q3MEVIPbA7
+ebTyR6KPprv3/ijN78HA2FpuIumCiMwgcKTntA1ti8TkCknc/p25yuSJm8kk1YYT
+EI/cBEjV7AeP1NQXVkxyj9zwY0dYzax/h6Wg+t7qvs8ORxOJdEhr1zdsxY1f+7Aa
+GH/yHRavwkRh3ICgDSty9dO7c8k5MXjnX/W+zZR1/IngJMmUKZXIoLmqwdaHPb+S
+lb1DOdXnNxi+WNQXbBjzonEZa0hFPT/ml32QpjCzh11edlGltCnQVzyLJGw/W5KT
+o04ltBnMhQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-1.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-1.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>SAML Admins</GivenName>
+    <EmailAddress>saml-admins@slu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <GivenName>SAML Admins</GivenName>
+    <EmailAddress>saml-admins@slu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <GivenName>Help Desk</GivenName>
+    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml b/swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml
deleted file mode 100644
index ae8cc492..00000000
--- a/swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.hs-furtwangen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-furtwangen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-furtwangen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEEQ2cbjANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
-Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDExMjUwODMxMjZaFw0xNTEx
-MjQwODMxMjZaMIGdMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
-ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
-IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxHjAcBgNV
-BAMTFWlkcDEuaHMtZnVydHdhbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAN/DtMWE2NZ28wx5D5a7VWQt93uqOLxGna3La/S6bRaH4Pb5mXp9
-KZ3zhOPgEDu6rJOTdozxf1QIqbbEza1/KTOlTGEYaQdWv+79T5mGdphWTeK4ZVwo
-OaGa2oW281S+308w8od3i1usLOKOta8CK4Nf6LOg0Fm9j6Ao8im5H57a2qWH39F0
-CTVI0C4CqSs3E6S7IL6Igw2ALqHNaNNMrG/qhBzuog8NxtP5fQ3HyqMkUOXp41vC
-I2fRsLdgmSK9TcicnHVwSTzl27M+vdJWa9I8UU3BmF7THFPf6s6xUAoUSct90i50
-+t3tC/jSxAP5Rz3K4MNF4O92Vfmxpe0Kb7cCAwEAAaOCAaowggGmMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRy
-xqH1eqbqPFzkq5yMNTcceRDqbTAfBgNVHSMEGDAWgBRocBANyS1zBvmIGD6fi4zt
-KQAWxzCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2hzLWZ1cnR3YW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdh
-bmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-ALfPtsm64YKIILAqIrXPIKHdH/ZtJbX9KACLfDd+QxFMl1v5uPmJezZAFF5pNdZB
-9zq0oLMYJxRKdCOieBeWOqxwGRKn9VcUI3xADWL/C8f4ixa4F55Ub2mmXkZsmHTj
-OCGXyOXBOAB2dWQrki760/v5hqn1gdwqfYg/Eg0ZvH2PXZ+iJdTWKWEsxDi9umVq
-DZqDtavE4cJ4iZxjwCwrXVk5ggRX3bGLH36z6bZomjimO517aTqdmb5x+dikUGN6
-6542rAsxL8h3HwCUM9IHGOfjr1o3t812E7E5lDTNE067YSdHJCdbQRM4efmnjSJW
-VcZhsLWUIB6RV8IBFSlHz50=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.hs-furtwangen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hs-furtwangen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hs-furtwangen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hs-furtwangen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-furtwangen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-furtwangen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEEQ2cbjANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
-Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDExMjUwODMxMjZaFw0xNTEx
-MjQwODMxMjZaMIGdMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
-ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
-IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxHjAcBgNV
-BAMTFWlkcDEuaHMtZnVydHdhbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAN/DtMWE2NZ28wx5D5a7VWQt93uqOLxGna3La/S6bRaH4Pb5mXp9
-KZ3zhOPgEDu6rJOTdozxf1QIqbbEza1/KTOlTGEYaQdWv+79T5mGdphWTeK4ZVwo
-OaGa2oW281S+308w8od3i1usLOKOta8CK4Nf6LOg0Fm9j6Ao8im5H57a2qWH39F0
-CTVI0C4CqSs3E6S7IL6Igw2ALqHNaNNMrG/qhBzuog8NxtP5fQ3HyqMkUOXp41vC
-I2fRsLdgmSK9TcicnHVwSTzl27M+vdJWa9I8UU3BmF7THFPf6s6xUAoUSct90i50
-+t3tC/jSxAP5Rz3K4MNF4O92Vfmxpe0Kb7cCAwEAAaOCAaowggGmMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRy
-xqH1eqbqPFzkq5yMNTcceRDqbTAfBgNVHSMEGDAWgBRocBANyS1zBvmIGD6fi4zt
-KQAWxzCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2hzLWZ1cnR3YW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdh
-bmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-ALfPtsm64YKIILAqIrXPIKHdH/ZtJbX9KACLfDd+QxFMl1v5uPmJezZAFF5pNdZB
-9zq0oLMYJxRKdCOieBeWOqxwGRKn9VcUI3xADWL/C8f4ixa4F55Ub2mmXkZsmHTj
-OCGXyOXBOAB2dWQrki760/v5hqn1gdwqfYg/Eg0ZvH2PXZ+iJdTWKWEsxDi9umVq
-DZqDtavE4cJ4iZxjwCwrXVk5ggRX3bGLH36z6bZomjimO517aTqdmb5x+dikUGN6
-6542rAsxL8h3HwCUM9IHGOfjr1o3t812E7E5lDTNE067YSdHJCdbQRM4efmnjSJW
-VcZhsLWUIB6RV8IBFSlHz50=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Furtwangen University -IdP 1</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Furtwangen University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-furtwangen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hendrik</GivenName>
-    <SurName>Kuijs</SurName>
-    <EmailAddress>kuijs@hs-furtwangen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Bernhard</GivenName>
-    <SurName>Czmiel</SurName>
-    <EmailAddress>czmiel@hs-furtwangen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.jacobs-university.de.xml b/swamid-interfederations-2.0/idp2.jacobs-university.de.xml
deleted file mode 100644
index 8dc0d9f9..00000000
--- a/swamid-interfederations-2.0/idp2.jacobs-university.de.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.jacobs-university.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">jacobs-university.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp2.jacobs-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp2.jacobs-university.de,O=Jacobs University Bremen gGmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFKzCCBBOgAwIBAgIEEgMQTjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeSmFjb2JzIFVuaXZlcnNpdHkgQnJlbWVuIGdHbWJIMQ8wDQYD
-VQQLEwZJUkMtSVQxIzAhBgNVBAMTGkphY29icyBVbml2ZXJzaXR5IENBIC0gRzAx
-MB4XDTExMDUzMDEyNTExMFoXDTE2MDUyODEyNTExMFowWjELMAkGA1UEBhMCREUx
-JzAlBgNVBAoTHkphY29icyBVbml2ZXJzaXR5IEJyZW1lbiBnR21iSDEiMCAGA1UE
-AxMZaWRwMi5qYWNvYnMtdW5pdmVyc2l0eS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALBn+nYoa8EkdT59Kn5iyaouvhAZTZsuAB2hqg2Ldo/8J4Pc
-SU6y0ck/a2xgK45CDK+bE12fGM1A828Z+Zkx615PyXRve3Z3uhKLwWh+aVh9Czsn
-O5a4GGPLY/fVeeJyAWk95Vgco2h7hGxOrCGynMCx+wa89SIA1q4DYo4stDPu5zaC
-kZn2+m2eH6Ht6UjIqA4GEhh9/lXNoLJruq/kFgUA0TC5KelRWO2M40zACljgUXjZ
-3ISZXtFqI+1kHTxUd6h/mlsKVk4iFjYLK5HZwl+8/pueO3spiNISLZ8KBewyehVv
-cGsYLGermgavGpNfuHXQn5eZ9nBveWd6zWkGZz0CAwEAAaOCAeUwggHhMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTismVGIRouSFz019/hsKvjP4k35TAfBgNVHSMEGDAWgBQcq0Ha1JXUnR6CzU19
-EyU37B+IpzApBgNVHREEIjAggR5pdHN1cHBvcnRAamFjb2JzLXVuaXZlcnNpdHku
-ZGUwgZUGA1UdHwSBjTCBijBDoEGgP4Y9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9q
-YWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3JsL2NhY3JsLmNybDBDoEGgP4Y9aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9qYWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBrgYIKwYBBQUHAQEEgaEwgZ4wTQYIKwYBBQUHMAKGQWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvamFjb2JzLXVuaXZlcnNpdHktY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME0GCCsGAQUFBzAChkFodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2phY29icy11bml2ZXJzaXR5LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAdpCxa/1qVbMWIpJaOkAvhMC6U329LELs5yQLETHvmlPN
-r3t1ULEQnssVDVtD7QfoKpUnRTmcSdOj13e+lTf2KEH46jVowVG9R4xZ4pf9huB6
-Iq8CkpOUYTdhzbf3XP/YQRzSWNRe4TJQXqVgvmuG810yKbDRiA2gMnHnE1vbz4u+
-+dL9AEycWmnXgWu5K9QlyAKQxs35VZU1J+2x8PRO8of/csD1C4EcoEwq986tpjRd
-IabwcBEXXxXY0P6/0zC5UrnPCkzyZmL67m/gGNmGhJ3tDnb9mxdrp6t+5JmtG4Qf
-UlOc3b1APPVI3weamhzR+rrUr45b/yLBbFTLwXsTWw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.jacobs-university.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.jacobs-university.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.jacobs-university.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.jacobs-university.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">jacobs-university.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp2.jacobs-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp2.jacobs-university.de,O=Jacobs University Bremen gGmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFKzCCBBOgAwIBAgIEEgMQTjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeSmFjb2JzIFVuaXZlcnNpdHkgQnJlbWVuIGdHbWJIMQ8wDQYD
-VQQLEwZJUkMtSVQxIzAhBgNVBAMTGkphY29icyBVbml2ZXJzaXR5IENBIC0gRzAx
-MB4XDTExMDUzMDEyNTExMFoXDTE2MDUyODEyNTExMFowWjELMAkGA1UEBhMCREUx
-JzAlBgNVBAoTHkphY29icyBVbml2ZXJzaXR5IEJyZW1lbiBnR21iSDEiMCAGA1UE
-AxMZaWRwMi5qYWNvYnMtdW5pdmVyc2l0eS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALBn+nYoa8EkdT59Kn5iyaouvhAZTZsuAB2hqg2Ldo/8J4Pc
-SU6y0ck/a2xgK45CDK+bE12fGM1A828Z+Zkx615PyXRve3Z3uhKLwWh+aVh9Czsn
-O5a4GGPLY/fVeeJyAWk95Vgco2h7hGxOrCGynMCx+wa89SIA1q4DYo4stDPu5zaC
-kZn2+m2eH6Ht6UjIqA4GEhh9/lXNoLJruq/kFgUA0TC5KelRWO2M40zACljgUXjZ
-3ISZXtFqI+1kHTxUd6h/mlsKVk4iFjYLK5HZwl+8/pueO3spiNISLZ8KBewyehVv
-cGsYLGermgavGpNfuHXQn5eZ9nBveWd6zWkGZz0CAwEAAaOCAeUwggHhMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTismVGIRouSFz019/hsKvjP4k35TAfBgNVHSMEGDAWgBQcq0Ha1JXUnR6CzU19
-EyU37B+IpzApBgNVHREEIjAggR5pdHN1cHBvcnRAamFjb2JzLXVuaXZlcnNpdHku
-ZGUwgZUGA1UdHwSBjTCBijBDoEGgP4Y9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9q
-YWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3JsL2NhY3JsLmNybDBDoEGgP4Y9aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9qYWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBrgYIKwYBBQUHAQEEgaEwgZ4wTQYIKwYBBQUHMAKGQWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvamFjb2JzLXVuaXZlcnNpdHktY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME0GCCsGAQUFBzAChkFodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2phY29icy11bml2ZXJzaXR5LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAdpCxa/1qVbMWIpJaOkAvhMC6U329LELs5yQLETHvmlPN
-r3t1ULEQnssVDVtD7QfoKpUnRTmcSdOj13e+lTf2KEH46jVowVG9R4xZ4pf9huB6
-Iq8CkpOUYTdhzbf3XP/YQRzSWNRe4TJQXqVgvmuG810yKbDRiA2gMnHnE1vbz4u+
-+dL9AEycWmnXgWu5K9QlyAKQxs35VZU1J+2x8PRO8of/csD1C4EcoEwq986tpjRd
-IabwcBEXXxXY0P6/0zC5UrnPCkzyZmL67m/gGNmGhJ3tDnb9mxdrp6t+5JmtG4Qf
-UlOc3b1APPVI3weamhzR+rrUr45b/yLBbFTLwXsTWw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Jacobs University Bremen gGmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Jacobs University Bremen gGmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.jacobs-university.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mario</GivenName>
-    <SurName>Kaiser</SurName>
-    <EmailAddress>itsupport@jacobs-university.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Torge</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>t.schmidt@jacobs-university.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.redclara.net.xml b/swamid-interfederations-2.0/idp2.redclara.net.xml
new file mode 100644
index 00000000..8f091bee
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.redclara.net.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.redclara.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">redclara.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA - Latin American Cooperation of Advanced Networks</mdui:Description>
+        <mdui:Description xml:lang="es">RedCLARA - Cooperación Latino Americana de Redes Avanzadas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.reuna.cl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.reuna.cl</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIGXDCCBUSgAwIBAgIDCjLvMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMTQxNDM4 WhcNMTQwNTAzMjAyNjE2WjBsMRkwFwYDVQQNExBlMUw2MVVERER5U1FPa2pYMQsw CQYDVQQGEwJDTDEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG 9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAyBy9jvKUyU80Fkm1XFt/pm2JQEZxpYaAXOkhEeDIyCOA o0zyy2Vj4DXRGCbPooe+TfLmqguCH6NTtqG8szK3CLNjHJQJFeaSpNF0/XXAshjW z5N7d5lkt/TV2w12fGpQSQZeCv+u3nGmizcK3v0vgEXFJfMefuf2qTaZ4NYkntQZ FSdo/r/1QtOmScSbF/xoBVf8R9gwGewmkr1QTSvUwkTxEftMdWUHyjdhifoG23oH j1qOitYbnvsJHAvHpk2YYfad3k661z1F+7tosMrryyIMeyn7zItxSenIdcEZbiA0 egOEP92Ecpniro0joPOEIjrU/A3TjNPWLr52SdO+owIDAQABo4IC5DCCAuAwCQYD VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O BBYEFLT7+R6Ewb6gOwjoCOUSj/KjCrKFMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQB6vtND9cr2D0K1sOUdrEhc kG084Mqqie6eZmfIahRBYx+R0x3tgobQ6p/VqQLrMer8Fb/p4nocka6NPdGZZ5Ru 0D7sZU6SWWHvtmCiKeytV9gwlg57Ye+kWEgSPezHxqgVeIiw3C/DYfD8gQHr2GLB svrjzrrXn/Lp3WcmxbS+02snN+FErnkmOxaa0AAb9+2ulufSfkfxkF/UfN0vSSxA FYDEHIJr1heg6+mrVI6rqcq3WY1hjhVO3131gqyx3oWoPqDoberPV4bv80eQpdaF qk9bxUKQYBX+LMaDftxRG0S7dlcRmJLgw8TZ52G+hcBxvPomiYU1y0iaX0mDybzB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.redclara.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.redclara.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://idp2.redclara.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.redclara.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.redclara.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.redclara.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">redclara.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIGXDCCBUSgAwIBAgIDCjLvMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMTQxNDM4 WhcNMTQwNTAzMjAyNjE2WjBsMRkwFwYDVQQNExBlMUw2MVVERER5U1FPa2pYMQsw CQYDVQQGEwJDTDEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG 9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAyBy9jvKUyU80Fkm1XFt/pm2JQEZxpYaAXOkhEeDIyCOA o0zyy2Vj4DXRGCbPooe+TfLmqguCH6NTtqG8szK3CLNjHJQJFeaSpNF0/XXAshjW z5N7d5lkt/TV2w12fGpQSQZeCv+u3nGmizcK3v0vgEXFJfMefuf2qTaZ4NYkntQZ FSdo/r/1QtOmScSbF/xoBVf8R9gwGewmkr1QTSvUwkTxEftMdWUHyjdhifoG23oH j1qOitYbnvsJHAvHpk2YYfad3k661z1F+7tosMrryyIMeyn7zItxSenIdcEZbiA0 egOEP92Ecpniro0joPOEIjrU/A3TjNPWLr52SdO+owIDAQABo4IC5DCCAuAwCQYD VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O BBYEFLT7+R6Ewb6gOwjoCOUSj/KjCrKFMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQB6vtND9cr2D0K1sOUdrEhc kG084Mqqie6eZmfIahRBYx+R0x3tgobQ6p/VqQLrMer8Fb/p4nocka6NPdGZZ5Ru 0D7sZU6SWWHvtmCiKeytV9gwlg57Ye+kWEgSPezHxqgVeIiw3C/DYfD8gQHr2GLB svrjzrrXn/Lp3WcmxbS+02snN+FErnkmOxaa0AAb9+2ulufSfkfxkF/UfN0vSSxA FYDEHIJr1heg6+mrVI6rqcq3WY1hjhVO3131gqyx3oWoPqDoberPV4bv80eQpdaF qk9bxUKQYBX+LMaDftxRG0S7dlcRmJLgw8TZ52G+hcBxvPomiYU1y0iaX0mDybzB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.redclara.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.redclara.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">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">
+RedCLARA - Cooperacion Latino Americana de Redes Avanzadas
+</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">www.redclara.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Carlos Gonzalez</md:SurName>
+    <md:EmailAddress>carlos.gonzalez@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpext.test.ek.sll.se.xml b/swamid-interfederations-2.0/idpext.test.ek.sll.se.xml
deleted file mode 100644
index 72ec8eee..00000000
--- a/swamid-interfederations-2.0/idpext.test.ek.sll.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://idpext.test.ek.sll.se/neas">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEZTCCA02gAwIBAgIJAJp4wLfm2XW/MA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlNFMRIw
-EAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMMTYyMzIxMDAw
-MDE2MRAwDgYDVQQLEwdTTEx0ZXN0MR4wHAYDVQQDExVpZHBleHQudGVzdC5lay5zbGwuc2UwHhcN
-MTIxMjA2MDk0MDU4WhcNMTQxMjA2MDk0MDU4WjB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3Rv
-Y2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UE
-CxMHU0xMdGVzdDEeMBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA4ibxWfMWcVv/5cdFNS5FZxTrZBJu61myC+SiW0Nkrws3J/2uve4b
-eRig27f7hhr2+tGQeWW2uifmco2ajkqcutXtSfxqtVWRvUuq7GIog1aeNH17Qtq4+QEIxVXfmRJm
-/jVT0ihz6JsN/S6St8Pt937oeDetryvpGvV4tJ54/vUYos0i1shcoDr6jUujQ/aHoN48MkymvDD6
-m4v5FJgAUCaeRVFzKwaXsd172ZoA2NFSLPxkCOrm2Nm1SvZfPtFdfLCmgsElwXWnbtfVD8LdUsTs
-DWGcOkEWA14qbeVcK81xUW/xsvT36p0Wdy8zd1CqIabSc5F3S4ney1+yDQPNiwIDAQABo4HlMIHi
-MB0GA1UdDgQWBBTBxmnEBJq8D6hVP9U6fhESjbtsPzCBsgYDVR0jBIGqMIGngBTBxmnEBJq8D6hV
-P9U6fhESjbtsP6GBg6SBgDB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYD
-VQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UECxMHU0xMdGVzdDEe
-MBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlggkAmnjAt+bZdb8wDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAjr8rhk0FxZwSxZAGh916cwVEp9SDUcQcoPbY9TYbQe2XVMXBImNo
-PTkkbgFlxILxdq6ZOeKwsjTV4ON/jLVX/TJ9OzolKBfMpfLNf5DiBvG7BfSlbuTA/jEwC7qLHDmk
-3vC3gLSkWbE++2E2aOmKjDD7Rp7CSpHSM11FkF9CWdqAYV0f3YcCHQMEadOGNDeXRWhJH9e/ejT1
-BKtI7OLnXC7ceugbqIjbZANpiNT9YHtZcCtKU9C4iV6G4OEK0+Y9Pr5RS2gULAyDDYR3BzUOcZTI
-yaELvrGIDisdW7WILf3THNVuigw03ZuLjxql/Wo59WtttVngV+LrAs+UeQq9JA==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>5abdb300f7ff38ef47e4966bd82dd209c7eef117</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpext.test.ek.sll.se/neas/SAMLConsumer" index="2"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpext.test.ek.sll.se/neas/SSOService"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpext.test.ek.sll.se/neas/SSOService"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SLL</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SLL</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sll.se/</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ieeexplore.ieee.org.xml b/swamid-interfederations-2.0/ieeexplore.ieee.org.xml
deleted file mode 100644
index b39c7c6d..00000000
--- a/swamid-interfederations-2.0/ieeexplore.ieee.org.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ieeexplore.ieee.org/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.ieeexplore.ieee.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.ieeexplore.ieee.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIICzjCCAbagAwIBAgIETGv6kTANBgkqhkiG9w0BAQUFADApMScwJQYDVQQDEx5z
-aGliYm9sZXRoLmllZWV4cGxvcmUuaWVlZS5vcmcwHhcNMTAwODE4MTUyMTUzWhcN
-MTMwODE3MTUyMTUzWjApMScwJQYDVQQDEx5zaGliYm9sZXRoLmllZWV4cGxvcmUu
-aWVlZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEZrWYL9uv
-82FE1/gdMiMAddL0u5QamV7JFESacdtR0djeNMeQp39ImWRWN+Asi35T2LQ6qNnV
-0qC8ITjl6LsxTKwhQdn00vpZI+QY6UCMyi6v/AzaU3pJ5SeKwEJUONAk/99n1eqq
-Ohqu+Xgu3a+gvEIKs7k9wDYdPdIqgx7X5d4HnOs5qMqX/o3ocHOL6wHxabETu6ud
-Drr0MBlLDJ3plqbTm/Kh0aWLg9OdRTMjCs4OhjjTe6VYCIZalDUQaHrQbYHANpBe
-YKk6oOf1sG9o+UGnGPzPYejjgpqgEKfQJqaZD+79Vbx3d8bgaLNQyiEGplnlBJeF
-/eHxmsIkTqHhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEaT5SZ8+5dBiaC5bwHW
-qZCySknJOJuZLGfwz7CvHI+WoVzoncsbbv5XFDFxBzWncqZSynpvRcpeFYJ3HFa9
-xXdlL3i1BGC5ujOMF9+adI8QBxQdeKHZ3crUt0GluwxWrzs5o7DlkQyo/Au+VP1r
-noXgNNEyZuEWOUYPa2k2wOHt68EVkjdNHD4SGZwioWZ7RQGgCKF/fH6Q1iSAjGbK
-FOFPwx2bdRXfj+vpOPg+EkAJuPArNxQU+b5T9Utxn4QGmsgcgfwwaJJghKs8vXXY
-a0cuv2eotR3FGr2Dlp2GuqI9GPF2ux/KHpTscEDCK+qidpOrFsW7PIE+ct3mDa76
-BIY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">IEEE</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">IEEEXplore SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://ieeexplore.ieee.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Bruno</SurName>
-    <EmailAddress>tbruno@atypon.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.bmj.com.xml b/swamid-interfederations-2.0/journals.bmj.com.xml
deleted file mode 100644
index 4c7ce4d9..00000000
--- a/swamid-interfederations-2.0/journals.bmj.com.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.bmj.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">BMJ Journals</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">BMJ Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://journals.bmj.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/katalog.svkos.cz.xml b/swamid-interfederations-2.0/katalog.svkos.cz.xml
new file mode 100644
index 00000000..227b2631
--- /dev/null
+++ b/swamid-interfederations-2.0/katalog.svkos.cz.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://katalog.svkos.cz/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <shibmd:Scope regexp="false">svkos.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Moravian-Silesian Research Library in Ostrava</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of Moravian-Silesian Research Library in Ostrava</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Moravskoslezské vědecké knihovny v Ostravě</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.svkos.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.svkos.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://katalog.svkos.cz/logo/logo_40.png</mdui:Logo>
+        <mdui:Logo height="90" width="91">https://katalog.svkos.cz/logo/logo_90.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUMysVZyotzMFN08smrMEjxr7cBg4wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQa2F0YWxvZy5zdmtvcy5jejAeFw0xMzExMTEyMDIxMjJa
+Fw0zMzExMTEyMDIxMjJaMBsxGTAXBgNVBAMTEGthdGFsb2cuc3Zrb3MuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMXDtGvbcdogNvhJbrKZmDxFqb
+9VJ33XYnH+mBPdndP5kMDcE70SZqBpJQlP4JP+0GvETydNlHnK/t7TUE8SyRV+5y
+dLMeuFnAvP4So2OGfJfcivVizSvNSKuiYWBO2c7z90E3e0qBET0/gBSZ/lMvNSu5
+GS7Xe3+j35NGUiwGIzRglMKOAPxiA+szn0wIBsG7JhMdHuZMUASeVJewAxlPVv1p
+C7BrtRYVPmHm8xfqoTFg9RJz8nWDfugKLOPeVfdB17UwQICMYLM6pCvCmDGZ3SFz
+k83oy1GqWnfsXasaEWAL9VpQI5keYO34kgjRadlrSCjaMCSwPEgII6Z7J88HAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGthdGFsb2cuc3Zrb3MuY3qGJ2h0dHBzOi8va2F0
+YWxvZy5zdmtvcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS5NR0hEzdvRO
+kCB+T+bV6A3WQG8wDQYJKoZIhvcNAQEFBQADggEBAHVlLp4Vdb1zrlGQVO0AZBoz
+pPpRx2+MW9nasMPsd8ybYW/mbvAQU1c1MaUCK+rRk3Tu+Jj08A6YJOY5x/yLXxjh
+Us6l6JqIDYn6M/44vMf0fH+DkA40zfnpI8fv07O5Oc8EV1MsBdQm6zBh19MmDxY8
+diuVwTi1E9kR6Q3RIzhH1TERBDOpIfsUGVv5IHywYlUYsxYfOy6A0FjEtenMpfsI
+4NMjUoYVfnC0z5aWU7Vdu5LJIfkNj4HCuxLZur7NBvX3UTEuegzZRewy5edw+/hp
+K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://katalog.svkos.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">svkos.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUMysVZyotzMFN08smrMEjxr7cBg4wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQa2F0YWxvZy5zdmtvcy5jejAeFw0xMzExMTEyMDIxMjJa
+Fw0zMzExMTEyMDIxMjJaMBsxGTAXBgNVBAMTEGthdGFsb2cuc3Zrb3MuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMXDtGvbcdogNvhJbrKZmDxFqb
+9VJ33XYnH+mBPdndP5kMDcE70SZqBpJQlP4JP+0GvETydNlHnK/t7TUE8SyRV+5y
+dLMeuFnAvP4So2OGfJfcivVizSvNSKuiYWBO2c7z90E3e0qBET0/gBSZ/lMvNSu5
+GS7Xe3+j35NGUiwGIzRglMKOAPxiA+szn0wIBsG7JhMdHuZMUASeVJewAxlPVv1p
+C7BrtRYVPmHm8xfqoTFg9RJz8nWDfugKLOPeVfdB17UwQICMYLM6pCvCmDGZ3SFz
+k83oy1GqWnfsXasaEWAL9VpQI5keYO34kgjRadlrSCjaMCSwPEgII6Z7J88HAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGthdGFsb2cuc3Zrb3MuY3qGJ2h0dHBzOi8va2F0
+YWxvZy5zdmtvcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS5NR0hEzdvRO
+kCB+T+bV6A3WQG8wDQYJKoZIhvcNAQEFBQADggEBAHVlLp4Vdb1zrlGQVO0AZBoz
+pPpRx2+MW9nasMPsd8ybYW/mbvAQU1c1MaUCK+rRk3Tu+Jj08A6YJOY5x/yLXxjh
+Us6l6JqIDYn6M/44vMf0fH+DkA40zfnpI8fv07O5Oc8EV1MsBdQm6zBh19MmDxY8
+diuVwTi1E9kR6Q3RIzhH1TERBDOpIfsUGVv5IHywYlUYsxYfOy6A0FjEtenMpfsI
+4NMjUoYVfnC0z5aWU7Vdu5LJIfkNj4HCuxLZur7NBvX3UTEuegzZRewy5edw+/hp
+K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</OrganizationName>
+    <OrganizationName xml:lang="en">Moravian-Silesian Research Library in Ostrava</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Moravian-Silesian Research Library in Ostrava</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.svkos.cz/en/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.svkos.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Magda</GivenName>
+    <SurName>Zavilová</SurName>
+    <EmailAddress>zavilova@svkos.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kurse.vhb.org.xml b/swamid-interfederations-2.0/kurse.vhb.org.xml
deleted file mode 100644
index 3d601be7..00000000
--- a/swamid-interfederations-2.0/kurse.vhb.org.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurse.vhb.org/sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kurse.vhb.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kurse.vhb.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kurse.vhb.org,OU=vhb,O=Otto-Friedrich-Universitaet Bamberg,L=Bamberg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFdjCCBF6gAwIBAgIED8lo5TANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
-REUxLDAqBgNVBAoTI090dG8tRnJpZWRyaWNoLVVuaXZlcnNpdGFldCBCYW1iZXJn
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbmkgQmFtYmVyZyBD
-QSAtIEcwMjElMCMGCSqGSIb3DQEJARYWcGtpQHVyei51bmktYmFtYmVyZy5kZTAe
-Fw0xMDAzMjQxMDM3MDlaFw0xNTAzMjMxMDM3MDlaMIGEMQswCQYDVQQGEwJERTEP
-MA0GA1UECBMGQmF5ZXJuMRAwDgYDVQQHEwdCYW1iZXJnMSwwKgYDVQQKEyNPdHRv
-LUZyaWVkcmljaC1Vbml2ZXJzaXRhZXQgQmFtYmVyZzEMMAoGA1UECxMDdmhiMRYw
-FAYDVQQDEw1rdXJzZS52aGIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAxcRMLSfk55dScy4NlMrjFrBZZAnc5jENsEwHVo5LixZfiSw74ltoyHRf
-XWcNnD5+VnnDuyVS8FKmZIO+qjAZmkQLkhfwnwVoUizmX7O57hVXiKACQ830bnze
-DtK57AoSmsHT4gWD+g7DcwV1n4KmcF7V4Rti6kRL63FyitEBDZcXWXeOoIJIHe1y
-aS4RbDkx7l3bZWpmPiUuc8jLyVdyXi2WGkSznEWJTVLEPcdDa4E2TlDl+e0U5T8i
-dusHJhRi/6NZI4aVqKn2bBBHBTMYXMkMME3ktQQBLsx41UsE8uMw+RNsAhBpFZv4
-3jqHVrjReD5AKW1JvEtqgkGnkDnZyQIDAQABo4IB1zCCAdMwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBTghKL8IOmYdHnOPcj/baM9PQeBLDAfBgNVHSMEGDAWgBQtzJgeSVse125h
-ByatU2VnmEOu5TAhBgNVHREEGjAYgRZzZXJ2ZXItbWVzc2FnZUB2aGIub3JnMIGN
-BgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJh
-bWJlcmctY2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGm
-BggrBgEFBQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9w
-dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAQZ3fTMG1
-GCMGfyVN9dhV6pJRF46hvMXImodMYKFhWj8RbaCgwAYK2T7Xz4YuwBQ4pj11QpbU
-qQXnU6GbQpulhZSfka/Kp6Q12gSRfHcbSSSaz6+lAa/NcVdpBuxtSDFr4ts6uGtO
-PjTNmgKZsG07gvtvyQYfWgDV3oGbuV1uSDGH+eiEjuZ/aEBqKyPESA3N1VrMQtpg
-Dj7nB336knc8QWt/7/cMBU01xmOcGoMiaz0EYjZggMxrB95NuKQCVQPn9UCAwh7b
-T3tX3XUhFdaAtIkDVtrff0MxpdfOwUVfWkrv0jgHzQtWdNtFTwcnNu1L+DHtvdLY
-FQPShrsE3e4cFw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kurse.vhb.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kurse.vhb.org,OU=vhb,O=Otto-Friedrich-Universitaet Bamberg,L=Bamberg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFdjCCBF6gAwIBAgIED8lo5TANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
-REUxLDAqBgNVBAoTI090dG8tRnJpZWRyaWNoLVVuaXZlcnNpdGFldCBCYW1iZXJn
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbmkgQmFtYmVyZyBD
-QSAtIEcwMjElMCMGCSqGSIb3DQEJARYWcGtpQHVyei51bmktYmFtYmVyZy5kZTAe
-Fw0xMDAzMjQxMDM3MDlaFw0xNTAzMjMxMDM3MDlaMIGEMQswCQYDVQQGEwJERTEP
-MA0GA1UECBMGQmF5ZXJuMRAwDgYDVQQHEwdCYW1iZXJnMSwwKgYDVQQKEyNPdHRv
-LUZyaWVkcmljaC1Vbml2ZXJzaXRhZXQgQmFtYmVyZzEMMAoGA1UECxMDdmhiMRYw
-FAYDVQQDEw1rdXJzZS52aGIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAxcRMLSfk55dScy4NlMrjFrBZZAnc5jENsEwHVo5LixZfiSw74ltoyHRf
-XWcNnD5+VnnDuyVS8FKmZIO+qjAZmkQLkhfwnwVoUizmX7O57hVXiKACQ830bnze
-DtK57AoSmsHT4gWD+g7DcwV1n4KmcF7V4Rti6kRL63FyitEBDZcXWXeOoIJIHe1y
-aS4RbDkx7l3bZWpmPiUuc8jLyVdyXi2WGkSznEWJTVLEPcdDa4E2TlDl+e0U5T8i
-dusHJhRi/6NZI4aVqKn2bBBHBTMYXMkMME3ktQQBLsx41UsE8uMw+RNsAhBpFZv4
-3jqHVrjReD5AKW1JvEtqgkGnkDnZyQIDAQABo4IB1zCCAdMwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBTghKL8IOmYdHnOPcj/baM9PQeBLDAfBgNVHSMEGDAWgBQtzJgeSVse125h
-ByatU2VnmEOu5TAhBgNVHREEGjAYgRZzZXJ2ZXItbWVzc2FnZUB2aGIub3JnMIGN
-BgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJh
-bWJlcmctY2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGm
-BggrBgEFBQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9w
-dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAQZ3fTMG1
-GCMGfyVN9dhV6pJRF46hvMXImodMYKFhWj8RbaCgwAYK2T7Xz4YuwBQ4pj11QpbU
-qQXnU6GbQpulhZSfka/Kp6Q12gSRfHcbSSSaz6+lAa/NcVdpBuxtSDFr4ts6uGtO
-PjTNmgKZsG07gvtvyQYfWgDV3oGbuV1uSDGH+eiEjuZ/aEBqKyPESA3N1VrMQtpg
-Dj7nB336knc8QWt/7/cMBU01xmOcGoMiaz0EYjZggMxrB95NuKQCVQPn9UCAwh7b
-T3tX3XUhFdaAtIkDVtrff0MxpdfOwUVfWkrv0jgHzQtWdNtFTwcnNu1L+DHtvdLY
-FQPShrsE3e4cFw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kurse.vhb.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kurse.vhb.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Virtuelle Hochschule Bayern</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Virtuelle Hochschule Bayern - Kursprogramm</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://kurse.vhb.org</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ingo</GivenName>
-    <SurName>Müller</SurName>
-    <EmailAddress>technik@vhb.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ingo</GivenName>
-    <SurName>Müller</SurName>
-    <EmailAddress>technik@vhb.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuidp.lrz.de.xml b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
index 2bf32200..e1fa1bed 100644
--- a/swamid-interfederations-2.0/lmuidp.lrz.de.xml
+++ b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
@@ -5,6 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
index d92188d7..ff8c42a7 100644
--- a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
+++ b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aai.pionier.net.pl/IdP/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-02-22T14:05:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-03-13T14:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/login.hfwu.de.xml b/swamid-interfederations-2.0/login.hfwu.de.xml
deleted file mode 100644
index 7498ee15..00000000
--- a/swamid-interfederations-2.0/login.hfwu.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.hfwu.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hfwu.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hfwu.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
-dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
-9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
-WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
-Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
-AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
-nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
-55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
-SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
-dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
-B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
-GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
-pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
-bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
-hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
-BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
-Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
-Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
-ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
-poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
-Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
-oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
-qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
-PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
-gpAuyo+UjGaG1AhdwVL3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hfwu.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
-dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
-9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
-WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
-Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
-AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
-nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
-55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
-SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
-dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
-B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
-GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
-pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
-bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
-hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
-BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
-Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
-Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
-ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
-poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
-Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
-oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
-qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
-PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
-gpAuyo+UjGaG1AhdwVL3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hfwu.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hfwu.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.hfwu.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hfwu.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.hfwu.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hfwu.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hfwu.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hfwu.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
-dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
-9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
-WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
-Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
-AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
-nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
-55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
-SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
-dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
-B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
-GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
-pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
-bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
-hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
-BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
-Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
-Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
-ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
-poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
-Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
-oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
-qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
-PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
-gpAuyo+UjGaG1AhdwVL3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hfwu.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
-dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
-9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
-WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
-Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
-AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
-nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
-55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
-SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
-dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
-B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
-GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
-pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
-bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
-hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
-BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
-Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
-Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
-ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
-poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
-Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
-oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
-qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
-PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
-gpAuyo+UjGaG1AhdwVL3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hfwu.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hfwu.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HfWU Nuertingen-Geislingen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hfwu.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Clemens</GivenName>
-    <SurName>Sanwald</SurName>
-    <EmailAddress>clemens.sanwald@hfwu.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.hs-ulm.de.xml b/swamid-interfederations-2.0/login.hs-ulm.de.xml
deleted file mode 100644
index c5c3b2f0..00000000
--- a/swamid-interfederations-2.0/login.hs-ulm.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.hs-ulm.de/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-ulm.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hs-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
-FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
-KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
-MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
-bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
-BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
-RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
-0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
-LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
-HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
-NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
-DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
-SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
-FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
-NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
-ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
-NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
-8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
-aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
-vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
-hGoTVw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hs-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
-FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
-KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
-MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
-bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
-BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
-RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
-0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
-LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
-HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
-NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
-DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
-SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
-FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
-NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
-ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
-NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
-8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
-aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
-vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
-hGoTVw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hs-ulm.de/shibboleth-idp/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hs-ulm.de:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.hs-ulm.de/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hs-ulm.de/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.hs-ulm.de/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hs-ulm.de/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-ulm.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hs-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
-FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
-KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
-MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
-bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
-BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
-RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
-0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
-LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
-HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
-NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
-DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
-SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
-FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
-NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
-ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
-NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
-8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
-aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
-vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
-hGoTVw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hs-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
-FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
-KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
-MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
-bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
-BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
-RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
-0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
-LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
-HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
-NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
-DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
-SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
-FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
-NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
-ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
-NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
-8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
-aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
-vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
-hGoTVw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hs-ulm.de:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hs-ulm.de:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Ulm (Hochschule für Technik)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Ulm</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-ulm.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Thomas</GivenName>
-    <SurName>Gloeckler</SurName>
-    <EmailAddress>gloeckler@hs-ulm.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Gloeckler</SurName>
-    <EmailAddress>gloeckler@hs-ulm.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.portal.uni-muenchen.de.xml b/swamid-interfederations-2.0/login.portal.uni-muenchen.de.xml
deleted file mode 100644
index 38f69193..00000000
--- a/swamid-interfederations-2.0/login.portal.uni-muenchen.de.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.portal.uni-muenchen.de/ea">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.portal.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.portal.uni-muenchen.de,OU=IIIA5,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFXTCCBEWgAwIBAgIED8MrKTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
-KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
-BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDAzMTkx
-NzAwMDlaFw0xMjAzMTgxNzAwMDlaMIGbMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
-aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEOMAwGA1UECxMFSUlJQTUxJTAj
-BgNVBAMTHGxvZ2luLnBvcnRhbC51bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6G/m8HckgWny3DypWJeX2mahdGk0tYcVmMnt+
-EfmTLFmRLALeUvwtcr0jW2jnmItBoQWSMAQyQ8HAMgmt/prtFzcQ6eUgHUd1QLnd
-iZjGAIw6UqC97Vldh0Zqjq5ZvBKSqQdFrxiTiuOitPbTe6LdrjWkvZv9WN25X+GK
-4bXjIjMzbqLNjPiDGsUAOhHDDXrgWhZ7VL1bKp8nGE+Am5EKohjaDx0yy7mjZy9d
-EKjoWyP0behrgiiHb0QK/Klq1jNNZGgC2iet7dGBH7VIs26A/yLJJVZOc94xeemR
-cVUVxOoyyKyApxCZaIv7Dg5EFaCIRAez+ToamAiT+k2esuy1AgMBAAGjggGwMIIB
-rDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFMO2d9EQ+vSi5e5BiNNQHkSJLsLFMB8GA1UdIwQY
-MBaAFHmHeGov+pu8I0+UpqN3HR4OlIAPMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD6gPKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hl
-bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYB
-BQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQC2wKD26urVVbOle8lVzOkK8EaOndAxW5oRMikA0532
-QnDopq3GQpm+cq+nA3sjXTkWoWZ5OrrRlwJViDYlHFY7VTqXleq3pHQOKAmMdONL
-UXR3OuZTm0IzSZuzRXPViaZO82DdlzSs+lCTswm9/zhwOOujL2UU1K3wFFr2QHwv
-Hy6a0t+jw26IRnK18/SNgaMtH+fNQOxWZ2z9V3Mp6pLPEYp0k2jnqXLl0+wy6oO5
-U8IoRGe8oSW9FnmxOeF8Oshalh452Q4+C9sgybjvPahg6A/c+7DLoSiVzua2xKyr
-YGuXw/BwbiMxt3pERpJZk9GYLdpH4skDKj/rNeW78GzI
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.portal.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.portal.uni-muenchen.de,OU=IIIA5,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFXTCCBEWgAwIBAgIED8MrKTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
-KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
-BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDAzMTkx
-NzAwMDlaFw0xMjAzMTgxNzAwMDlaMIGbMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
-aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEOMAwGA1UECxMFSUlJQTUxJTAj
-BgNVBAMTHGxvZ2luLnBvcnRhbC51bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6G/m8HckgWny3DypWJeX2mahdGk0tYcVmMnt+
-EfmTLFmRLALeUvwtcr0jW2jnmItBoQWSMAQyQ8HAMgmt/prtFzcQ6eUgHUd1QLnd
-iZjGAIw6UqC97Vldh0Zqjq5ZvBKSqQdFrxiTiuOitPbTe6LdrjWkvZv9WN25X+GK
-4bXjIjMzbqLNjPiDGsUAOhHDDXrgWhZ7VL1bKp8nGE+Am5EKohjaDx0yy7mjZy9d
-EKjoWyP0behrgiiHb0QK/Klq1jNNZGgC2iet7dGBH7VIs26A/yLJJVZOc94xeemR
-cVUVxOoyyKyApxCZaIv7Dg5EFaCIRAez+ToamAiT+k2esuy1AgMBAAGjggGwMIIB
-rDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFMO2d9EQ+vSi5e5BiNNQHkSJLsLFMB8GA1UdIwQY
-MBaAFHmHeGov+pu8I0+UpqN3HR4OlIAPMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD6gPKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hl
-bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYB
-BQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQC2wKD26urVVbOle8lVzOkK8EaOndAxW5oRMikA0532
-QnDopq3GQpm+cq+nA3sjXTkWoWZ5OrrRlwJViDYlHFY7VTqXleq3pHQOKAmMdONL
-UXR3OuZTm0IzSZuzRXPViaZO82DdlzSs+lCTswm9/zhwOOujL2UU1K3wFFr2QHwv
-Hy6a0t+jw26IRnK18/SNgaMtH+fNQOxWZ2z9V3Mp6pLPEYp0k2jnqXLl0+wy6oO5
-U8IoRGe8oSW9FnmxOeF8Oshalh452Q4+C9sgybjvPahg6A/c+7DLoSiVzua2xKyr
-YGuXw/BwbiMxt3pERpJZk9GYLdpH4skDKj/rNeW78GzI
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.portal.uni-muenchen.de/sp/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.portal.uni-muenchen.de/sp/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.portal.uni-muenchen.de/sp/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.portal.uni-muenchen.de/sp/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.portal.uni-muenchen.de/sp/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.portal.uni-muenchen.de/sp/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.portal.uni-muenchen.de/sp/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.portal.uni-muenchen.de/sp/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.portal.uni-muenchen.de/sp/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.portal.uni-muenchen.de/sp/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">LMU Erstanmeldung</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">LMU Erstanmeldung</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://login.portal.uni-muenchen.de/ea</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrej</GivenName>
-    <SurName>Kolontai</SurName>
-    <EmailAddress>edv.security@verwaltung.uni-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml b/swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml
deleted file mode 100644
index 2a19dd08..00000000
--- a/swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.rz.rwth-aachen.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rwth-aachen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
-MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
-SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
-CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
-R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
-mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
-jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
-AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
-GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
-oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
-fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
-jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
-3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
-T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
-sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
-MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
-SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
-CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
-R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
-mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
-jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
-AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
-GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
-oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
-fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
-jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
-3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
-T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
-sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.rz.rwth-aachen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.rz.rwth-aachen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.rz.rwth-aachen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rwth-aachen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
-MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
-SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
-CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
-R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
-mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
-jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
-AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
-GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
-oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
-fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
-jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
-3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
-T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
-sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
-MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
-SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
-CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
-R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
-mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
-jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
-AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
-GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
-oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
-fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
-jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
-3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
-T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
-sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">RWTH Aachen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">RWTH Aachen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rwth-aachen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Bischof</SurName>
-    <EmailAddress>bischof@rz.rwth-aachen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Wilfred</GivenName>
-    <SurName>Gasper</SurName>
-    <EmailAddress>sso@rz.rwth-aachen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.slub-dresden.de.xml b/swamid-interfederations-2.0/login.slub-dresden.de.xml
deleted file mode 100644
index db1735c7..00000000
--- a/swamid-interfederations-2.0/login.slub-dresden.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.slub-dresden.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">slub-dresden.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.slub-dresden.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
-MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
-fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
-4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
-fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
-RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
-BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
-MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
-kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
-ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
-/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
-csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
-7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
-tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
-RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
-+IJTcEjcKl3hPdIic+E=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.slub-dresden.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
-MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
-fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
-4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
-fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
-RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
-BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
-MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
-kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
-ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
-/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
-csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
-7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
-tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
-RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
-+IJTcEjcKl3hPdIic+E=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.slub-dresden.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.slub-dresden.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.slub-dresden.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.slub-dresden.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.slub-dresden.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.slub-dresden.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">slub-dresden.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.slub-dresden.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
-MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
-fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
-4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
-fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
-RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
-BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
-MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
-kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
-ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
-/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
-csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
-7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
-tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
-RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
-+IJTcEjcKl3hPdIic+E=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.slub-dresden.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
-MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
-fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
-4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
-fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
-RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
-BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
-MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
-kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
-ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
-/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
-csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
-7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
-tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
-RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
-+IJTcEjcKl3hPdIic+E=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.slub-dresden.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.slub-dresden.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">SLUB Dresden</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">SLUB Dresden</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.slub-dresden.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Falk</GivenName>
-    <SurName>Niederlein</SurName>
-    <EmailAddress>niederl@slub-dresden.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login2.hs-mittweida.de.xml b/swamid-interfederations-2.0/login2.hs-mittweida.de.xml
deleted file mode 100644
index 03d13ef9..00000000
--- a/swamid-interfederations-2.0/login2.hs-mittweida.de.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login2.hs-mittweida.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-mittweida.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
-ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
-bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
-cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
-MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
-YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
-dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
-ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
-Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
-/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
-Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
-Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
-56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
-nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
-rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
-VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
-cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
-AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
-YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
-qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
-7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
-PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
-+NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
-ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
-bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
-cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
-MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
-YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
-dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
-ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
-Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
-/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
-Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
-Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
-56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
-nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
-rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
-VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
-cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
-AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
-YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
-qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
-7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
-PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
-+NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login2.hs-mittweida.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.hs-mittweida.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.hs-mittweida.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-mittweida.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
-ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
-bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
-cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
-MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
-YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
-dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
-ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
-Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
-/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
-Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
-Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
-56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
-nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
-rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
-VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
-cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
-AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
-YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
-qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
-7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
-PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
-+NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
-ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
-bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
-cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
-MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
-YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
-dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
-ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
-Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
-/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
-Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
-Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
-56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
-nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
-rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
-VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
-cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
-AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
-YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
-qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
-7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
-PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
-+NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Mittweida - University of Applied Sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Mittweida</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-mittweida.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Matthias</GivenName>
-    <SurName>Lühr</SurName>
-    <EmailAddress>luehr@hs-mittweida.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jens</GivenName>
-    <SurName>Rabe</SurName>
-    <EmailAddress>rabe@hs-mittweida.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lu-idp1.lu.lv.xml b/swamid-interfederations-2.0/lu-idp1.lu.lv.xml
deleted file mode 100644
index e7fe6407..00000000
--- a/swamid-interfederations-2.0/lu-idp1.lu.lv.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lu-idp1.lu.lv">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwXjELMAkGA1UEBhMCTFYxDzANBgNV
-BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxCzAJBgNVBAsT
-AkxVMRUwEwYDVQQDEwxsdS1pZHAubHUubHYwHhcNMTMwMzA1MTI0NjEzWhcNMjMw
-MzAzMTI0NjEzWjBeMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0dmlhMQ0wCwYD
-VQQHEwRSaWdhMQswCQYDVQQKEwJMVTELMAkGA1UECxMCTFUxFTATBgNVBAMTDGx1
-LWlkcC5sdS5sdjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVP1+R8
-ESt5pHCtzIWOiF+yw+IQMzYSWe4LB/tbyNzAnZ0q/nRaJe0XQpasWpobIGVXvzvh
-cWmMf/sxiM2OW8jzrNsQcEk+E69brgq9eE4lEbhHGbmBjangJLXI3cEwVickWXqQ
-qhe0cUPBMD1FZARwGlL8YWZRQ5+dfB933EO8dR4LSdLbNXjglCEwGG2e6XHzbl4w
-7JS+SLaTjLjRB0ITCp9HtvxciFakPX/gzGOJM54UuF68siLGyokP7s/T7XgOxnFL
-Z54FRLckXOkDzcyfMn+6VB5r7MAIE1E25zcllZbfvqKDtb4JmeP5o3UOfY2TUCIg
-QbiA+GZGz8xTcbkCAwEAATANBgkqhkiG9w0BAQQFAAOCAQEABN89j8izhz6LrVsr
-pTj6u8ZE4mlUkDsvXJSxiuz7VNsf3M/y63QAdMNot/HSjEhl+a4utrcXiv63qtsC
-/GJNoI2uu6cBvMR6QXLf2rsuPG8bhIRciXu05PiY3gbHiiPJWOQuPEBSSFBMskiU
-U3dxJNFd+EmUjigNrpObWNOjGypQE7v+WlZ6261kkCUbSEKixQ28Py4tqS6CJehn
-pdgKs1TNu4MoBxUjg8yo3b+1UaA96NmMbA3XUSd2K9qOV9NzJ64E9e7d04u+VVBv
-D2TcA6zOrv9jXb96N0u0D9Bz2K6rDsdV7T1N+3L3LcLzP7qj/jNlRU8tagDbXrwz
-jo0gpQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwXjELMAkGA1UEBhMCTFYxDzANBgNV
-BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxCzAJBgNVBAsT
-AkxVMRUwEwYDVQQDEwxsdS1pZHAubHUubHYwHhcNMTMwMzA1MTI0NjEzWhcNMjMw
-MzAzMTI0NjEzWjBeMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0dmlhMQ0wCwYD
-VQQHEwRSaWdhMQswCQYDVQQKEwJMVTELMAkGA1UECxMCTFUxFTATBgNVBAMTDGx1
-LWlkcC5sdS5sdjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVP1+R8
-ESt5pHCtzIWOiF+yw+IQMzYSWe4LB/tbyNzAnZ0q/nRaJe0XQpasWpobIGVXvzvh
-cWmMf/sxiM2OW8jzrNsQcEk+E69brgq9eE4lEbhHGbmBjangJLXI3cEwVickWXqQ
-qhe0cUPBMD1FZARwGlL8YWZRQ5+dfB933EO8dR4LSdLbNXjglCEwGG2e6XHzbl4w
-7JS+SLaTjLjRB0ITCp9HtvxciFakPX/gzGOJM54UuF68siLGyokP7s/T7XgOxnFL
-Z54FRLckXOkDzcyfMn+6VB5r7MAIE1E25zcllZbfvqKDtb4JmeP5o3UOfY2TUCIg
-QbiA+GZGz8xTcbkCAwEAATANBgkqhkiG9w0BAQQFAAOCAQEABN89j8izhz6LrVsr
-pTj6u8ZE4mlUkDsvXJSxiuz7VNsf3M/y63QAdMNot/HSjEhl+a4utrcXiv63qtsC
-/GJNoI2uu6cBvMR6QXLf2rsuPG8bhIRciXu05PiY3gbHiiPJWOQuPEBSSFBMskiU
-U3dxJNFd+EmUjigNrpObWNOjGypQE7v+WlZ6261kkCUbSEKixQ28Py4tqS6CJehn
-pdgKs1TNu4MoBxUjg8yo3b+1UaA96NmMbA3XUSd2K9qOV9NzJ64E9e7d04u+VVBv
-D2TcA6zOrv9jXb96N0u0D9Bz2K6rDsdV7T1N+3L3LcLzP7qj/jNlRU8tagDbXrwz
-jo0gpQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp1.lu.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp1.lu.lv/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LAIFE - LU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Latvian Identity Federation LAIFE - LU IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.lu.lv/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>serviss@lanet.lv</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meta.cesnet.cz.xml b/swamid-interfederations-2.0/meta.cesnet.cz.xml
new file mode 100644
index 00000000..c2fe39a5
--- /dev/null
+++ b/swamid-interfederations-2.0/meta.cesnet.cz.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meta.cesnet.cz/sp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MetaCentrum, CESNET</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">MetaCentrum, CESNET</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for MetaCentrum, the grid department of CESNET</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro MetaCentrum, gridové oddělení CESNETu</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.metacentrum.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.metacentrum.cz/cs/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.metacentrum.cz/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.metacentrum.cz/Shibboleth.sso/WAYF/eduid" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Active</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.glite.eu</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEzjCCA7agAwIBAgIQUPcidFJvVTeMMovLOnvObTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDUyMjAwMDAwMFoXDTEzMDUyMTIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs9LDWzd7/lkHYbK1
+9HvIrdDr4eyAIlCPmYvU/8Yy2ezxg+GXCufe+CGF/AZsBcG7HC0L4rmMjlF0qCsB
+PwqmAEenMpIfb1BVkok+7p0QIja5ZLmmsbtnU8uPauTSxY1HFG33nBj5TKc9cXk9
+rCttWQ/JJeYMsMm1ioTiUFg2wzN88mluXvtahYx6PgUA9bRLwMhpj1pBfFN2Eakc
+vX+6AynyBWzohsXd3bDD/EMt2b2dUfDzbi37UFiMIYBpwLkfhgGeaVEC871iXT7u
+8H/Mi+ancJVboa/moye8nQkcrm2Ws/ZhAkcEaFgkj1z/ECxfeKICaSxCF70ODBO2
+X4KXDQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFAdQwzTToseEzmW6GK36RLF3diFCMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIGIBgNVHREEgYAwfoISd3d3Lm1ldGFjZW50cnVtLmN6gg5tZXRhLmNlc25l
+dC5jeoIObWV0YWNlbnRydW0uY3qCEG1ldGF2by5jZXNuZXQuY3qCFW1ldGF2by5t
+ZXRhY2VudHJ1bS5jeoIRdm8ubWV0YWNlbnRydW0uY3qCDHd3dy5nbGl0ZS5ldTAN
+BgkqhkiG9w0BAQUFAAOCAQEAm2zT+PCSJz/tGwcuNN9Zs2Wydkuio/X9DbI8aruP
+QKoLP0+vxu5T/ymEkmBfywcnDIdjCcBruloc6HzAr6TEiSnA0se6813hSp+DCV0p
+T2eceKnvOjVKjNpVRvosxyIlu7tupOTEQZiGsTNU1WtTu99PsGAlMHNpgPlrGe/P
+JXjUmvgdtt5PgkUdCaHkoNSUwRdB1DwDO+tKGyY/dvUPaYFCj/EfePgPIsOmWFEv
+zDnk+mod1McmMwPFW/fxlpFiUdtsoswkodIUgnynuRzUGSkGZgGqVWFjz7LJ/dwy
+bXdlZwBweUbE7uYAM6MFWGK1aNJ+a6xZbQlNr/cW8+XKDA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Standby</ds:KeyName>
+        <ds:KeyName>einfra.cesnet.cz</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>perun.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>wiki.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE/jCCA+agAwIBAgIQZJhKx6tjiIFmfpZnwmbegjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIwNzAwMDAwMFoXDTE1MTIwNzIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+Ob1/WykMJvEau5
+B4VkUv6mmjO+yjh7YFYPQKBUhdZS9AISjX8NRPH7y0SXasCOCdi3phwlzKnWoUQq
+UuRh/inUe/DVGu44F1oai33gxKQuRCLgbxD5Uxm7M0QDm5q6XjIqkSYJU7pZtFgR
+JvosB0AdYylrPY2paWk0+BGWhWjFHB8zZywmiEMmCawjD8cLcCRTwhTzBTHDSFKQ
+5JnqHJSKazWj/l55ECVsnx2ezUT9DqaXCBjM6R4r7l5vRA2328mHpwgfOqEONboF
+s1BOPwf6pbqAEeLSDSwLBwsUguohYan5adisAPIcN9A5aGdsLWxy1bi5TH5vET+c
+js6xcwIDAQABo4ICATCCAf0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFDQ/IQ/LVEu8GUWMKwhdu7L1XoWyMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIG4BgNVHREEgbAwga2CEnd3dy5tZXRhY2VudHJ1bS5jeoIQZWluZnJhLmNl
+c25ldC5jeoIObWV0YS5jZXNuZXQuY3qCDm1ldGFjZW50cnVtLmN6ghBtZXRhdm8u
+Y2VzbmV0LmN6ghVtZXRhdm8ubWV0YWNlbnRydW0uY3qCFHBlcnVuLm1ldGFjZW50
+cnVtLmN6ghF2by5tZXRhY2VudHJ1bS5jeoITd2lraS5tZXRhY2VudHJ1bS5jejAN
+BgkqhkiG9w0BAQUFAAOCAQEAHJ2gaM4WNXYhUWFb+KdRdw8kCSZsZF3AekhGd2XG
+mK6aUsbLfJcLMg0tuROkJnxMtZoeLLfPvHiCBtUPD7jvCJcNDCNlICkaEG3Grmd6
+swb1hC+ELuGTAC5om1b/1bIbbYQvCx1mk19kBugPSI47Yyb0G4RqBQLWNvAjH1gI
+WLSQJQxpF1h5oVM5OW/V0h+R3/RC7xnirr4Y5M476wwC24FdrtMeZ6F7nGsIGJdI
++SgNReiXBL/pow3YapcrTCoWJuUvq2mmpn3FQEA6ofbv6wMemIwB92cVuoo4/fU6
+XOx3BPUl5ZWVnWHxgCphyglT2/eB4+nvzj1cDTHkLHMsOQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Active</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.glite.eu</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEzjCCA7agAwIBAgIQUPcidFJvVTeMMovLOnvObTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDUyMjAwMDAwMFoXDTEzMDUyMTIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs9LDWzd7/lkHYbK1
+9HvIrdDr4eyAIlCPmYvU/8Yy2ezxg+GXCufe+CGF/AZsBcG7HC0L4rmMjlF0qCsB
+PwqmAEenMpIfb1BVkok+7p0QIja5ZLmmsbtnU8uPauTSxY1HFG33nBj5TKc9cXk9
+rCttWQ/JJeYMsMm1ioTiUFg2wzN88mluXvtahYx6PgUA9bRLwMhpj1pBfFN2Eakc
+vX+6AynyBWzohsXd3bDD/EMt2b2dUfDzbi37UFiMIYBpwLkfhgGeaVEC871iXT7u
+8H/Mi+ancJVboa/moye8nQkcrm2Ws/ZhAkcEaFgkj1z/ECxfeKICaSxCF70ODBO2
+X4KXDQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFAdQwzTToseEzmW6GK36RLF3diFCMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIGIBgNVHREEgYAwfoISd3d3Lm1ldGFjZW50cnVtLmN6gg5tZXRhLmNlc25l
+dC5jeoIObWV0YWNlbnRydW0uY3qCEG1ldGF2by5jZXNuZXQuY3qCFW1ldGF2by5t
+ZXRhY2VudHJ1bS5jeoIRdm8ubWV0YWNlbnRydW0uY3qCDHd3dy5nbGl0ZS5ldTAN
+BgkqhkiG9w0BAQUFAAOCAQEAm2zT+PCSJz/tGwcuNN9Zs2Wydkuio/X9DbI8aruP
+QKoLP0+vxu5T/ymEkmBfywcnDIdjCcBruloc6HzAr6TEiSnA0se6813hSp+DCV0p
+T2eceKnvOjVKjNpVRvosxyIlu7tupOTEQZiGsTNU1WtTu99PsGAlMHNpgPlrGe/P
+JXjUmvgdtt5PgkUdCaHkoNSUwRdB1DwDO+tKGyY/dvUPaYFCj/EfePgPIsOmWFEv
+zDnk+mod1McmMwPFW/fxlpFiUdtsoswkodIUgnynuRzUGSkGZgGqVWFjz7LJ/dwy
+bXdlZwBweUbE7uYAM6MFWGK1aNJ+a6xZbQlNr/cW8+XKDA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Standby</ds:KeyName>
+        <ds:KeyName>einfra.cesnet.cz</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>perun.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>wiki.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE/jCCA+agAwIBAgIQZJhKx6tjiIFmfpZnwmbegjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIwNzAwMDAwMFoXDTE1MTIwNzIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+Ob1/WykMJvEau5
+B4VkUv6mmjO+yjh7YFYPQKBUhdZS9AISjX8NRPH7y0SXasCOCdi3phwlzKnWoUQq
+UuRh/inUe/DVGu44F1oai33gxKQuRCLgbxD5Uxm7M0QDm5q6XjIqkSYJU7pZtFgR
+JvosB0AdYylrPY2paWk0+BGWhWjFHB8zZywmiEMmCawjD8cLcCRTwhTzBTHDSFKQ
+5JnqHJSKazWj/l55ECVsnx2ezUT9DqaXCBjM6R4r7l5vRA2328mHpwgfOqEONboF
+s1BOPwf6pbqAEeLSDSwLBwsUguohYan5adisAPIcN9A5aGdsLWxy1bi5TH5vET+c
+js6xcwIDAQABo4ICATCCAf0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFDQ/IQ/LVEu8GUWMKwhdu7L1XoWyMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIG4BgNVHREEgbAwga2CEnd3dy5tZXRhY2VudHJ1bS5jeoIQZWluZnJhLmNl
+c25ldC5jeoIObWV0YS5jZXNuZXQuY3qCDm1ldGFjZW50cnVtLmN6ghBtZXRhdm8u
+Y2VzbmV0LmN6ghVtZXRhdm8ubWV0YWNlbnRydW0uY3qCFHBlcnVuLm1ldGFjZW50
+cnVtLmN6ghF2by5tZXRhY2VudHJ1bS5jeoITd2lraS5tZXRhY2VudHJ1bS5jejAN
+BgkqhkiG9w0BAQUFAAOCAQEAHJ2gaM4WNXYhUWFb+KdRdw8kCSZsZF3AekhGd2XG
+mK6aUsbLfJcLMg0tuROkJnxMtZoeLLfPvHiCBtUPD7jvCJcNDCNlICkaEG3Grmd6
+swb1hC+ELuGTAC5om1b/1bIbbYQvCx1mk19kBugPSI47Yyb0G4RqBQLWNvAjH1gI
+WLSQJQxpF1h5oVM5OW/V0h+R3/RC7xnirr4Y5M476wwC24FdrtMeZ6F7nGsIGJdI
++SgNReiXBL/pow3YapcrTCoWJuUvq2mmpn3FQEA6ofbv6wMemIwB92cVuoo4/fU6
+XOx3BPUl5ZWVnWHxgCphyglT2/eB4+nvzj1cDTHkLHMsOQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metacentrum.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metavo.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.cesnet.cz/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://einfra.cesnet.cz/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun.cesnet.cz/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alcor.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/Artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/ECP" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML/Artifact" index="14"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">MetaCentrum e-Infrastructure</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">MetaCentrum user registration</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MetaCentrum, CESNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">MetaCentrum, CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MetaCentrum, CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">MetaCentrum, CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.metacentrum.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.metacentrum.cz/cs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Kuba</md:SurName>
+    <md:EmailAddress>makub@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml b/swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml
deleted file mode 100644
index 00396ead..00000000
--- a/swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mylogin.uni-freiburg.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
-MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
-HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
-bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
-C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
-PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
-YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
-JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
-vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
-rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
-MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
-QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
-i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
-tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
-w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
-2ERqngwPct4mRDp6O58BlZ4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
-MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
-HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
-bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
-C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
-PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
-YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
-JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
-vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
-rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
-MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
-QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
-i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
-tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
-w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
-2ERqngwPct4mRDp6O58BlZ4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.uni-freiburg.de:8443/idp/mylogin/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mylogin.uni-freiburg.de/idp/mylogin/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
-MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
-HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
-bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
-C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
-PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
-YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
-JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
-vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
-rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
-MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
-QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
-i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
-tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
-w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
-2ERqngwPct4mRDp6O58BlZ4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
-MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
-HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
-bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
-C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
-PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
-YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
-JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
-vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
-rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
-MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
-QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
-i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
-tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
-w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
-2ERqngwPct4mRDp6O58BlZ4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.uni-freiburg.de:8443/idp/mylogin/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Freiburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Hans-Adolf</GivenName>
-    <SurName>Ruppert</SurName>
-    <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>myLogin</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mylogin@uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nrenadmin.redclara.net.xml b/swamid-interfederations-2.0/nrenadmin.redclara.net.xml
new file mode 100644
index 00000000..1ae7c85a
--- /dev/null
+++ b/swamid-interfederations-2.0/nrenadmin.redclara.net.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nrenadmin.redclara.net/simplesaml/saml2/sp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NRENAdmin - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">NRENAdmin - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's NREN Administration Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio de Administración para RNEI de RedCLARA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGZjCCBU6gAwIBAgIDCjMMMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMjAxMjEzWhcNMTQwNTAzMjMzMjQyWjBxMRkwFwYDVQQNExAzdVlZSFNvMUxNWHAwek5tMQswCQYDVQQGEwJDTDEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjtWLKaJ09/KhJ+Fhp7OrF4Tc+hHVStZg2x/mg/qOvQN9936cs01q8MYpYapgzUFlQAffD3AGTURdUKOf9tBVOMdSJwhPWn0ESjBDZX1qmUnpyDhQM7thz1SNm16tHeFYUmp4CGXKhHy+46++Dh7enxfg2GIJ2a7uZsAsB0hIiSQrFq5HHXkG0Ufzy2AsCmue5q56eGcXQS/2zoxug8f73H050edcqwrxJyOV/SlndwHo8fH3Az5qJUk8BJuX8JwZby4FzeP9pVoxsixMsprJ4wWek6TZNdxzrqE4Yccvm8QUWn24EchUykb1JIjr+go27LCOyhwgGH0vbNw1F9HXAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUuV2BgTzQblfR0KTVC0BK0I8TwhQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAUi9eZCmR6ItJvG/EYreKWWOWrwghn4rykYztu3lYE7D8ld0QQhz7V/V3CE3ms6cXckeVGsI0X5UuhAOW+6KD1EjJgYuU1uShPPIqaPjlHNTXqBLIKzej8VvHLE5yC5o6OLZxpoVt06fpWdNF02TQClKyLT2sPQjgWWO0CP1Gw0/QBgIYazm6yfnFVY11D9EMqV6XKi2i/1ifBh+pyeuzTl9f+Utm/yUU/QUtjU3UMPQ1EkCuzEPLIkK2fzpskbxAXOFhmmkipNjSteEJsUQyYXYeYo4SlvIcjt/xUvMknfJVs0SIUB0mE3uT9MsZJoZtfSj+eR9/I3l9w6wGqUVISg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGZjCCBU6gAwIBAgIDCjMMMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMjAxMjEzWhcNMTQwNTAzMjMzMjQyWjBxMRkwFwYDVQQNExAzdVlZSFNvMUxNWHAwek5tMQswCQYDVQQGEwJDTDEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjtWLKaJ09/KhJ+Fhp7OrF4Tc+hHVStZg2x/mg/qOvQN9936cs01q8MYpYapgzUFlQAffD3AGTURdUKOf9tBVOMdSJwhPWn0ESjBDZX1qmUnpyDhQM7thz1SNm16tHeFYUmp4CGXKhHy+46++Dh7enxfg2GIJ2a7uZsAsB0hIiSQrFq5HHXkG0Ufzy2AsCmue5q56eGcXQS/2zoxug8f73H050edcqwrxJyOV/SlndwHo8fH3Az5qJUk8BJuX8JwZby4FzeP9pVoxsixMsprJ4wWek6TZNdxzrqE4Yccvm8QUWn24EchUykb1JIjr+go27LCOyhwgGH0vbNw1F9HXAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUuV2BgTzQblfR0KTVC0BK0I8TwhQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAUi9eZCmR6ItJvG/EYreKWWOWrwghn4rykYztu3lYE7D8ld0QQhz7V/V3CE3ms6cXckeVGsI0X5UuhAOW+6KD1EjJgYuU1uShPPIqaPjlHNTXqBLIKzej8VvHLE5yC5o6OLZxpoVt06fpWdNF02TQClKyLT2sPQjgWWO0CP1Gw0/QBgIYazm6yfnFVY11D9EMqV6XKi2i/1ifBh+pyeuzTl9f+Utm/yUU/QUtjU3UMPQ1EkCuzEPLIkK2fzpskbxAXOFhmmkipNjSteEJsUQyYXYeYo4SlvIcjt/xUvMknfJVs0SIUB0mE3uT9MsZJoZtfSj+eR9/I3l9w6wGqUVISg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nrenadmin.redclara.net/simplesaml/saml2/sp/SingleLogoutService.php"/>
+    <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://nrenadmin.redclara.net/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SEG</md:GivenName>
+    <md:SurName>RedCLARA</md:SurName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.sagepub.com.xml b/swamid-interfederations-2.0/online.sagepub.com.xml
deleted file mode 100644
index 4d2def1c..00000000
--- a/swamid-interfederations-2.0/online.sagepub.com.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://online.sagepub.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">SAGE Journals Online</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">SAGE Journals Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://online.sagepub.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml
new file mode 100644
index 00000000..b73be26b
--- /dev/null
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openskos.meertens.knaw.nl/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-05T08:47:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">OpenSKOS | Meertens</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">OpenSKOS | Meertens</mdui:DisplayName>
+        <mdui:Description xml:lang="de">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</mdui:Description>
+        <mdui:Description xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</mdui:Description>
+        <mdui:Logo height="44" width="64">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://openskos.meertens.knaw.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>twww11</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=twww11</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJAOJ/2Z9fcxVXMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+BAMTBnR3d3cxMTAeFw0xMzA0MTYxNTA3MzhaFw0yMzA0MTQxNTA3MzhaMBExDzAN
+BgNVBAMTBnR3d3cxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAP4a
+E7gfLARdAbSMy3ntWsCqI0M4uXkeN8vZe2aiBUGi0hN9TuN9DO8mr4P8EXjhT0qQ
+/tfff3FOJggFQwT8xXjSxevD3/fQfc31cc19W48xLzZ2299w0GlT6ABVeykixnT/
+2N4BUFwlGKKSYZ25VvF7HStpO8PoqoOU+vTxxOSHv+k8r/E+e8/Yqy1x+tYwjtCp
+mRTuej2AEg7EvCPez4+63GcSkSFJDTkAdUkIsQwBvBjceeeNjPrfDdcVriYq8zEq
+aHlAM88NOWqkzhFn7RDDQ9I40Km2sv+zEwHn+cYe8RQktx+7kTocNfttlc6Gj3cx
+wBo6gLCYlDtE9Bp4Hg0CAwEAAaM0MDIwEQYDVR0RBAowCIIGdHd3dzExMB0GA1Ud
+DgQWBBTEKetHu5XysV19YPdBXllRdGy+0jANBgkqhkiG9w0BAQUFAAOCAQEAIRi/
+IZLuNXS7kk8e6Hj4QW0eeqNBpHRHVPC/J2/2C9GpRVEPCmsYTRhIDc6y1XDEpJlW
+u6J75jXhfSisrzaVYvDTLymYV2qhob3hqlM39PGcyXWvnyT8HWQA6nhOGIIq2K2c
+M+dr9RBlPlv+0rJq07ZbkNJqfxu4tigKOP/+sJiMuORso9uk4Ak+0cX+yb/48zqE
+6qUUo3jx8o3Uv51YiYTaPeMacxDH4TcMEZOttUmY7SH7jkZCoRlpFnozCB6QwfA/
+5D7JsQ/vElBegBrNmdrIoZyI+ezREelVATJURfgJu+47mmhVWIK0St6S1y+pgPQ4
+1bxBV69YDJSB5BjVPA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">OpenSKOS | Meertens</ServiceName>
+      <ServiceName xml:lang="en">OpenSKOS | Meertens</ServiceName>
+      <ServiceDescription xml:lang="de">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</ServiceDescription>
+      <ServiceDescription xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</ServiceDescription>
+      <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"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>KNAW</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:servicedesk@knaw.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Marc</GivenName>
+    <SurName>Kemps-Snijders</SurName>
+    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Marc</GivenName>
+    <SurName>Kemps-Snijders</SurName>
+    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.feide.no.xml b/swamid-interfederations-2.0/openwiki.feide.no.xml
deleted file mode 100644
index a188bc9c..00000000
--- a/swamid-interfederations-2.0/openwiki.feide.no.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.feide.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <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://openwiki.feide.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">OpenWiki Administration</md:ServiceName>
-      <md:ServiceName xml:lang="no">OpenWiki Administrasjon</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">OpenWiki Administration is the administration interface where users create new openwikis.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" 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.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ow.feide.no.xml b/swamid-interfederations-2.0/ow.feide.no.xml
deleted file mode 100644
index 0ea833ba..00000000
--- a/swamid-interfederations-2.0/ow.feide.no.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ow.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICYTCCAcoCCQD7k9m8pOWTATANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxEjAQBgNVBAsTCUZlaWRlIFJuRDEYMBYGA1UEAxMPZm9vZGxlLmZlaWRlLm5vMB4XDTA4MDUyODE0MTMzMFoXDTA4MDcyNzE0MTMzMFowdTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRAwDgYDVQQKEwdVTklORVRUMRIwEAYDVQQLEwlGZWlkZSBSbkQxGDAWBgNVBAMTD2Zvb2RsZS5mZWlkZS5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAslppSJXg7lGMBf/dqbVb5uMpVpuNG3dyzzF23ed2S1eArCoBGzR4BOyM90sNoYDzXqX/DGp/NQg2gnR52bFksLBNypk6ScJIP+OGMlvaP1B5dWtZFcmpRcVnQnv/u94jQvMgrqwMuooivmzdPrAwiX1XqmlDLgUGtev1D8HmkyUCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBT+vbShOJxcoNQdpdPuojZmEa+4fR91yxkPR0laTnp+WPBUBjRV9BUxLYG7vYUSwns6Py113NNnCE6IfAHSgPz8vj9K9ea50VaycMo/LP+GGfWTU9vccppUK4yCwPC1vlC3yHP7a3v+dsmj2GkhbsfVbgs8CfzbfNrxNaA7HZP5A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICYTCCAcoCCQD7k9m8pOWTATANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxEjAQBgNVBAsTCUZlaWRlIFJuRDEYMBYGA1UEAxMPZm9vZGxlLmZlaWRlLm5vMB4XDTA4MDUyODE0MTMzMFoXDTA4MDcyNzE0MTMzMFowdTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRAwDgYDVQQKEwdVTklORVRUMRIwEAYDVQQLEwlGZWlkZSBSbkQxGDAWBgNVBAMTD2Zvb2RsZS5mZWlkZS5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAslppSJXg7lGMBf/dqbVb5uMpVpuNG3dyzzF23ed2S1eArCoBGzR4BOyM90sNoYDzXqX/DGp/NQg2gnR52bFksLBNypk6ScJIP+OGMlvaP1B5dWtZFcmpRcVnQnv/u94jQvMgrqwMuooivmzdPrAwiX1XqmlDLgUGtev1D8HmkyUCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBT+vbShOJxcoNQdpdPuojZmEa+4fR91yxkPR0laTnp+WPBUBjRV9BUxLYG7vYUSwns6Py113NNnCE6IfAHSgPz8vj9K9ea50VaycMo/LP+GGfWTU9vccppUK4yCwPC1vlC3yHP7a3v+dsmj2GkhbsfVbgs8CfzbfNrxNaA7HZP5A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ow.feide.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <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://ow.feide.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">OpenWiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">OpenWiki is a wiki farm solution where everyone can create their own wikis and setup access control.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" 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.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/payment.statista.com.xml b/swamid-interfederations-2.0/payment.statista.com.xml
deleted file mode 100644
index ecfa94dc..00000000
--- a/swamid-interfederations-2.0/payment.statista.com.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://payment.statista.com/simplesaml/">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>de.statista.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=de.statista.com,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIHEn65XsmOBDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0G
-A1UEAxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMTA5MDEwODAxMThaFw0x
-NjA4MzAwODAxMThaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWlu
-MRAwDgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9kZS5zdGF0aXN0YS5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIP8FskLI19g/XBvxY1ua4uEtg
-Q0vdL6f/wuKNP8wc/hCNh/HGJLYj9S0BRFmVlCxiXFhr5GRZAAZN+b6msehsgPs3
-V6yKsP0Ga4yt7ccJuAzUFVU8Qrva2TIvDLPZ7Qucj+2M4ekxpqBjp850JbTqdGO1
-oDmrKAzuxWXUS/9L88tFHiHvaxLEIBK3OYf6k8lK61BZuU2DXIFkd72iCF7LS/sE
-uHh1db+185ssxNiLICu2vqJ9ZpsrYN6qOxSNvxI3jQ7jHNOlVXwFGAeDsnjg4Qxa
-oqfgLekPagmmDWpAI9QHTyqUOAaN03UWigVeb01IiH8EwBKzi82mims7CHb1AgMB
-AAGjggG8MIIBuDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFOG/Ep6pb7z0/1gHX1D6Yx8DZsGx
-MB8GA1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMIGRBgNVHR8EgYkwgYYw
-QaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUH
-AQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xv
-YmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcw
-AoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCJFZsyyBpVIHAp
-preO/3S9+1Gw4OFWgS4Ajpfxz8H5pV5+6PK9bogtUWt7kSt41rbrWKWWbiZkjuTo
-Th4aHytOOeHpaUYH9qkFa7Cla5L4FEB52uarXlnXtrp3/2sTPvpZWtDk7KNZYvcN
-Psfu+IqZEGwHWuwh58Hl2v5xf137GhgcYuOm5Yabvi0+MdmtHihWuJ2sA7NEWzn8
-LW8dBcS4uGBLwmZ5Tq4zIAbppwwoqV81YwY+IaW9ObNpYJUMPhyxxW6ydTxF4yuT
-qZL8C8tvRqJtGUxFqPs4xImg3b9WLPThwMkFkuH/xzQqmN+xeoD3LvL/2DF88T3y
-l/xjGBYl
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Statista</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Statista</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://de.statista.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Leidinger</SurName>
-    <EmailAddress>technik@statista.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Tim</GivenName>
-    <SurName>Kröger</SurName>
-    <EmailAddress>tim.kroeger@statista.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml b/swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml
deleted file mode 100644
index d5261786..00000000
--- a/swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pqshibboleth.proquest.com:9443/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pqshibboleth.proquest.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pqshibboleth.proquest.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlwcXNo
-aWJib2xldGgucHJvcXVlc3QuY29tMB4XDTExMDIwMzE2MTg1MVoXDTE0MDIwMjE2
-MTg1MVowJDEiMCAGA1UEAxMZcHFzaGliYm9sZXRoLnByb3F1ZXN0LmNvbTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxrvtySvrav7TyDYaA3oWzEHImO
-8W4HDmP+xVOD2RNeYi4gDTYkEXryayLEut5rPMnZeqB5MDbEMfk8jrXHi1XdCZR1
-WTXNJHf4j9t7CDWS9rRhe+hVZxS29RLA/QBSs59zLpZQMuXxVTJo4hLRpXeyqoUb
-v672RLssm2CVGRActnih+M16xisjq2nHqXHOTTOeFNpEApeBdiDXPjauw3xp0pfw
-+mJuwgcJnKy1UNFI4uQUlkCvBBIVyuAM2krQcj0/UOFrUVX0Fa/PKJRybCA0TmYn
-6naOky9aUatENGLkmYH67RDDr6PwkWoSGr2hBQqe1Ncs4lZ9jF5lqOzDt2ECAwEA
-AaN9MHswHQYDVR0OBBYEFBNCMwuDe3qpreLgso/wDtNe/nJIMEwGA1UdIwRFMEOA
-FBNCMwuDe3qpreLgso/wDtNe/nJIoSikJjAkMSIwIAYDVQQDExlwcXNoaWJib2xl
-dGgucHJvcXVlc3QuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
-ggEBACgWCNvJq4cy1i0/mE8dXYsoyQ8QRG9QXpx5Av3TQewNv9/w8rkuKKnaVo+9
-CvwShXkigdxxdUYQRpvX/Vso/6UUM8p9VeRh9fk29zHUMh2tsIv6RdR2btlBXSGP
-8ooaXIrZBW4wuSYUFUGKxmsXuC7xJN+ciFuQYPIZ48ayfMwbIjUrvWmvKDt0EHwR
-JP49gfGziQEhv0W+1LtILDhDolE+QuwqDSXUaxhWaGvOE+m/eQKUmMrnQI6Xm7iz
-llRwbl8f8tMfJFfhdcNNJk7KB9uHEKAfGxY6TVDYuTujoEPq3KGkjreAwAuagM7a
-w3TEf0UNS0mkXt4kI5wSMt2ZJP0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pqshibboleth.proquest.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pqshibboleth.proquest.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlwcXNo
-aWJib2xldGgucHJvcXVlc3QuY29tMB4XDTExMDIwMzE2MTg1MVoXDTE0MDIwMjE2
-MTg1MVowJDEiMCAGA1UEAxMZcHFzaGliYm9sZXRoLnByb3F1ZXN0LmNvbTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxrvtySvrav7TyDYaA3oWzEHImO
-8W4HDmP+xVOD2RNeYi4gDTYkEXryayLEut5rPMnZeqB5MDbEMfk8jrXHi1XdCZR1
-WTXNJHf4j9t7CDWS9rRhe+hVZxS29RLA/QBSs59zLpZQMuXxVTJo4hLRpXeyqoUb
-v672RLssm2CVGRActnih+M16xisjq2nHqXHOTTOeFNpEApeBdiDXPjauw3xp0pfw
-+mJuwgcJnKy1UNFI4uQUlkCvBBIVyuAM2krQcj0/UOFrUVX0Fa/PKJRybCA0TmYn
-6naOky9aUatENGLkmYH67RDDr6PwkWoSGr2hBQqe1Ncs4lZ9jF5lqOzDt2ECAwEA
-AaN9MHswHQYDVR0OBBYEFBNCMwuDe3qpreLgso/wDtNe/nJIMEwGA1UdIwRFMEOA
-FBNCMwuDe3qpreLgso/wDtNe/nJIoSikJjAkMSIwIAYDVQQDExlwcXNoaWJib2xl
-dGgucHJvcXVlc3QuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
-ggEBACgWCNvJq4cy1i0/mE8dXYsoyQ8QRG9QXpx5Av3TQewNv9/w8rkuKKnaVo+9
-CvwShXkigdxxdUYQRpvX/Vso/6UUM8p9VeRh9fk29zHUMh2tsIv6RdR2btlBXSGP
-8ooaXIrZBW4wuSYUFUGKxmsXuC7xJN+ciFuQYPIZ48ayfMwbIjUrvWmvKDt0EHwR
-JP49gfGziQEhv0W+1LtILDhDolE+QuwqDSXUaxhWaGvOE+m/eQKUmMrnQI6Xm7iz
-llRwbl8f8tMfJFfhdcNNJk7KB9uHEKAfGxY6TVDYuTujoEPq3KGkjreAwAuagM7a
-w3TEf0UNS0mkXt4kI5wSMt2ZJP0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">ProQuest</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Host</GivenName>
-    <SurName>Master</SurName>
-    <EmailAddress>hostmaster@csa.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Host</GivenName>
-    <SurName>Master</SurName>
-    <EmailAddress>hostmaster@csa.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Anil</GivenName>
-    <SurName>Nair</SurName>
-    <EmailAddress>anil.nair@proquest.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/proxy.nationallizenzen.de.xml b/swamid-interfederations-2.0/proxy.nationallizenzen.de.xml
deleted file mode 100644
index 5ccf8925..00000000
--- a/swamid-interfederations-2.0/proxy.nationallizenzen.de.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://proxy.nationallizenzen.de/shibboleth-ezproxy">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>proxy.nationallizenzen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=proxy.nationallizenzen.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFczCCBFugAwIBAgIED/+i7TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA5
-WhcNMTUwNTAzMTM0NzA5WjCBjTELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEiMCAGA1UEAxMZcHJveHkubmF0
-aW9uYWxsaXplbnplbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALl7cjTk9U/X/5G1XPi18Kr/IdXZNLzoYq00d8WXEHyhMOL4qBgpudJBv3w8hKgD
-DYIeg9GJzRjw1Poo7ggQO3aN3F0VCvADCxcbRtlygt7vr0b9hac8KrVjGouAnrbO
-s3OlDbx/WOrNfxbxkEwV5ll0b+Zn6wpo/Yn5Do7WqYeGa+XGUNkcdMsdaL0KpsxK
-jE4fPU9kt2bYxQNrK/+jDxoGM8doz++V9rSd7We8RV9pSUOKJK2cT9SkP1ZGF/Cj
-3G3kG4BqfpoIqHAAukslh5R9eAYdDMioAkvhnJ6reY8Z5i1BC6vEh1s+Q6qgbtXl
-yccvt22QtEV12HPViiLr7DsCAwEAAaOCAakwggGlMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-utYST8Z5b86NsPpvJZarjPtlCaMwHwYDVR0jBBgwFoAUpuT/mP3lSTJ+XHXyFqJN
-jHQ13iIwGgYDVR0RBBMwEYEPa2luc3RsZXJAZ2J2LmRlMHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPUiBRbIOTiRK
-0w+HTSw/45iWajuAU4O4EW5BepK36X8pqkY93dyRwbd6SGeEEBlEfx280j5DRoC1
-2GeycwixiF6fApo6Ck7S8LdN1ElivbcSd6OMp+Fm3g17pmZobfEnDTQr4N4LRUP/
-EY7BTIUsP36dDSnn109deV1TonFMebrsQRYKFUazsLjkmkQjmCMRGAm/j9mWNW0L
-UWoMz/805COw0LBlNujSvI0cYgAJSlAPGBJci2Oyj1x7oK93eH+UKvWzojPABRdw
-L20ZBKGHY+oIYzioq9KI0UpuXMT9KkEFTlYzIQ3DH026Hg6wTruDUGotdtSadOBM
-qROSGpAVyQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>proxy.nationallizenzen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=proxy.nationallizenzen.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFczCCBFugAwIBAgIED/+i7TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA5
-WhcNMTUwNTAzMTM0NzA5WjCBjTELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEiMCAGA1UEAxMZcHJveHkubmF0
-aW9uYWxsaXplbnplbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALl7cjTk9U/X/5G1XPi18Kr/IdXZNLzoYq00d8WXEHyhMOL4qBgpudJBv3w8hKgD
-DYIeg9GJzRjw1Poo7ggQO3aN3F0VCvADCxcbRtlygt7vr0b9hac8KrVjGouAnrbO
-s3OlDbx/WOrNfxbxkEwV5ll0b+Zn6wpo/Yn5Do7WqYeGa+XGUNkcdMsdaL0KpsxK
-jE4fPU9kt2bYxQNrK/+jDxoGM8doz++V9rSd7We8RV9pSUOKJK2cT9SkP1ZGF/Cj
-3G3kG4BqfpoIqHAAukslh5R9eAYdDMioAkvhnJ6reY8Z5i1BC6vEh1s+Q6qgbtXl
-yccvt22QtEV12HPViiLr7DsCAwEAAaOCAakwggGlMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-utYST8Z5b86NsPpvJZarjPtlCaMwHwYDVR0jBBgwFoAUpuT/mP3lSTJ+XHXyFqJN
-jHQ13iIwGgYDVR0RBBMwEYEPa2luc3RsZXJAZ2J2LmRlMHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPUiBRbIOTiRK
-0w+HTSw/45iWajuAU4O4EW5BepK36X8pqkY93dyRwbd6SGeEEBlEfx280j5DRoC1
-2GeycwixiF6fApo6Ck7S8LdN1ElivbcSd6OMp+Fm3g17pmZobfEnDTQr4N4LRUP/
-EY7BTIUsP36dDSnn109deV1TonFMebrsQRYKFUazsLjkmkQjmCMRGAm/j9mWNW0L
-UWoMz/805COw0LBlNujSvI0cYgAJSlAPGBJci2Oyj1x7oK93eH+UKvWzojPABRdw
-L20ZBKGHY+oIYzioq9KI0UpuXMT9KkEFTlYzIQ3DH026Hg6wTruDUGotdtSadOBM
-qROSGpAVyQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://proxy.nationallizenzen.de/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://proxy.nationallizenzen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Verbundzentrale des Gemeinsamen Bibliotheksverbundes</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Nationallizenzen Privatnutzer Zugangsproxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gbv.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerald</GivenName>
-    <SurName>Steilen</SurName>
-    <EmailAddress>steilen@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Till</GivenName>
-    <SurName>Kinstler</SurName>
-    <EmailAddress>kinstler@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>borel@gbv.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.ama-assn.org.xml b/swamid-interfederations-2.0/pubs.ama-assn.org.xml
deleted file mode 100644
index 02a3768b..00000000
--- a/swamid-interfederations-2.0/pubs.ama-assn.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.ama-assn.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">JAMA</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">JAMA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://pubs.ama-assn.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rnd.feide.no.xml b/swamid-interfederations-2.0/rnd.feide.no.xml
deleted file mode 100644
index 62f5a657..00000000
--- a/swamid-interfederations-2.0/rnd.feide.no.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rnd.feide.no/simplesaml/module.php/saml/sp/metadata.php/saml">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rnd.feide.no/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
-    <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://rnd.feide.no/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Feide RnD Blog</md:ServiceName>
-      <md:ServiceName xml:lang="no">Feide RnD Blogg</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The blog of Feide RnD</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">Bloggen til Feide RnD</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/royalsocietypublishing.org.xml b/swamid-interfederations-2.0/royalsocietypublishing.org.xml
deleted file mode 100644
index 58f4aca9..00000000
--- a/swamid-interfederations-2.0/royalsocietypublishing.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://royalsocietypublishing.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Royal Society Publishing</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Royal Society Publishing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://royalsocietypublishing.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rt.niif.hu.xml b/swamid-interfederations-2.0/rt.niif.hu.xml
deleted file mode 100644
index d8e44a66..00000000
--- a/swamid-interfederations-2.0/rt.niif.hu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rt.niif.hu/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:InformationURL xml:lang="en">https://rt.niif.hu/rt</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>rt.niif.hu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEJzCCAw+gAwIBAgIJAP2iWF409QGrMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNVBAYTAkhVMREwDwYDVQQIEwhCdWRhcGVzdDEXMBUGA1UEChMOTklJRiBJbnN0aXR1dGUxEzARBgNVBAMTCnJ0Lm5paWYuaHUxGjAYBgkqhkiG9w0BCQEWC2FhaUBuaWlmLmh1MB4XDTEwMDYyNTExNTExNVoXDTIwMDYyMjExNTExNVowajELMAkGA1UEBhMCSFUxETAPBgNVBAgTCEJ1ZGFwZXN0MRcwFQYDVQQKEw5OSUlGIEluc3RpdHV0ZTETMBEGA1UEAxMKcnQubmlpZi5odTEaMBgGCSqGSIb3DQEJARYLYWFpQG5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDKdKDluI/sl4J57IcX+ZJPkIFfoAQnxS6fR7aQp8Lg5S/fg1ymgD+NZIT+2GHhDz65rEgMfre0yVVvsi3v7FAh973pCxS6iN0MWsWMNUyTD7nKCHkJr/LtDlcvGhdnUN/wo0iX0sIrPEWs31awmSELdi59bbsRKrir85sDXMjInfluJ6O7Gy+xzXv3YB04CYaUcIH5rg+iVBpNsEx9YHD1QyGsenbHaFooAf3UADrg5q+1R0lvGVCnKfnQ+JryxJIy+a+51pa3NDONYzksB89EeAMhLcuHHrI5FovQlCdIZbZepHjP8YeoNAXw4K3WFaZO+RiMmyy1KF96UxC6jpDAgMBAAGjgc8wgcwwHQYDVR0OBBYEFIwTzhmyE9GLngS1l4TiVhV1MFjMMIGcBgNVHSMEgZQwgZGAFIwTzhmyE9GLngS1l4TiVhV1MFjMoW6kbDBqMQswCQYDVQQGEwJIVTERMA8GA1UECBMIQnVkYXBlc3QxFzAVBgNVBAoTDk5JSUYgSW5zdGl0dXRlMRMwEQYDVQQDEwpydC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odYIJAP2iWF409QGrMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAG/xND0pKdWrymjqVof1b/05BiSeJEXyPf7E5zank5GY6PouCIvTKPAPXsAD3VISompmp/x5YlZaannaey+WvFEErh0buVbHGVV1g3gLtRpn++J4jR+Vklh0U4wp27AHEwFAG9lkgvKLtzN+b6tt85LW1lwkmkXEjJYOVO5t+etYdvsblMKUEX6CruwDPxgsP1aXqTZdi/Ps0ZglELw0Oqv7KrhTJ7hp4tQFh5cjLunRZRyQQesFG7pDCeQ9XN1w4Jl1tr+zjM9vG0yjD7fPtSHNSH3R46Gk0bHUcQ551JXoIiQV22cgxeCXsOGr4c5elFitmic1+7F6+MiHt7A/YkQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="hu">Request Tracker (GN3-SA2-T4)</ServiceName>
-      <ServiceName xml:lang="en">Request Tracker (GN3-SA4-T4)</ServiceName>
-      <ServiceDescription xml:lang="hu">Request Tracker alkalmazás a Geant3 SA2-T4 taszkhoz </ServiceDescription>
-      <ServiceDescription xml:lang="en">Request tracker instance for Geant3 SA2-T4 task</ServiceDescription>
-      <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"/>
-      <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
-    <OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.niif.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rxauth.reaxys.com.xml b/swamid-interfederations-2.0/rxauth.reaxys.com.xml
deleted file mode 100644
index 66ee937c..00000000
--- a/swamid-interfederations-2.0/rxauth.reaxys.com.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rxauth.reaxys.com/">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rxauth.reaxys.com/SHIRE/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-rxauth.reaxys.com/SHIRE/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Elsevier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Elsevier Reaxys</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.reaxys.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml b/swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml
deleted file mode 100644
index c1358185..00000000
--- a/swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.dhbw-stuttgart.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>saml.dhbw-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=saml.dhbw-stuttgart.de,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)10,OU=GT02047221,O=saml.dhbw-stuttgart.de,C=DE,serialNumber=8DlruJ2IF/mhFpqYLylpPD997PWR-8v4</ds:X509SubjectName>
-          <ds:X509Certificate>MIID7TCCA1agAwIBAgIDD0d2MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwMjA5MTc1NzA2WhcNMTMwNDEyMDkxNTI0
-WjCB8zEpMCcGA1UEBRMgOERscnVKMklGL21oRnBxWUx5bHBQRDk5N1BXUi04djQx
-CzAJBgNVBAYTAkRFMR8wHQYDVQQKExZzYW1sLmRoYnctc3R1dHRnYXJ0LmRlMRMw
-EQYDVQQLEwpHVDAyMDQ3MjIxMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-bS9yZXNvdXJjZXMvY3BzIChjKTEwMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEfMB0GA1UEAxMWc2FtbC5kaGJ3LXN0dXR0
-Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/Cb4X+HgoA
-JoQTolxkVgYbENIo1RmroBO/VpTdCfpJ1r11e7f3Lp6v1SSQxvp/fLN1JWJn4OVk
-J8J2xrH3W4PuGf65Y0uiIPOoZEBNQrzHrLQLXRi9SD0LKXNuK2T2MEywMrQbeKRh
-sgrOjfHXzwNfnRl9rhxcimOQX7ha1BzRATSjvzHIf4Kxqgjgv7ZvGsutFaZGjbhn
-RPPsa+F9IPuqyuiM11yhu6aXd3CKmkVrJUd515DRUbzBrHeL5HRr5pkb+ykzIOER
-CfVtQt5PdXxLChw2hkEy/LEyiuJBQ06GI4vPtTs9Q2pHMfGCZGIMTsH+udQZ7Bs7
-GHhTshbtUDkCAwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFL65
-7xtAhIIVIC95jJGECLyofdLCMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-Z2VvdHJ1c3QuY29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr
-0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAN
-BgkqhkiG9w0BAQUFAAOBgQAGmUarTBwrlr6zHF9p4GoORIaTUOw+mpGbMkn7KEE4
-1MqY2Ag0nJ9wml7iqjdgijImFdbaIGYTOLHN6/Q6g8HwUGlcsi9+JlSiQm2JNSn+
-XMVxhv0bLNnq9nI+vgT1nYgT9jDFUB+AoXHCz3BaIqa4psFtclA65BHPjcxBn0d5
-cA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml.dhbw-stuttgart.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.dhbw-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml.dhbw-stuttgart.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.dhbw-stuttgart.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>saml.dhbw-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=saml.dhbw-stuttgart.de,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)10,OU=GT02047221,O=saml.dhbw-stuttgart.de,C=DE,serialNumber=8DlruJ2IF/mhFpqYLylpPD997PWR-8v4</ds:X509SubjectName>
-          <ds:X509Certificate>MIID7TCCA1agAwIBAgIDD0d2MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwMjA5MTc1NzA2WhcNMTMwNDEyMDkxNTI0
-WjCB8zEpMCcGA1UEBRMgOERscnVKMklGL21oRnBxWUx5bHBQRDk5N1BXUi04djQx
-CzAJBgNVBAYTAkRFMR8wHQYDVQQKExZzYW1sLmRoYnctc3R1dHRnYXJ0LmRlMRMw
-EQYDVQQLEwpHVDAyMDQ3MjIxMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-bS9yZXNvdXJjZXMvY3BzIChjKTEwMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEfMB0GA1UEAxMWc2FtbC5kaGJ3LXN0dXR0
-Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/Cb4X+HgoA
-JoQTolxkVgYbENIo1RmroBO/VpTdCfpJ1r11e7f3Lp6v1SSQxvp/fLN1JWJn4OVk
-J8J2xrH3W4PuGf65Y0uiIPOoZEBNQrzHrLQLXRi9SD0LKXNuK2T2MEywMrQbeKRh
-sgrOjfHXzwNfnRl9rhxcimOQX7ha1BzRATSjvzHIf4Kxqgjgv7ZvGsutFaZGjbhn
-RPPsa+F9IPuqyuiM11yhu6aXd3CKmkVrJUd515DRUbzBrHeL5HRr5pkb+ykzIOER
-CfVtQt5PdXxLChw2hkEy/LEyiuJBQ06GI4vPtTs9Q2pHMfGCZGIMTsH+udQZ7Bs7
-GHhTshbtUDkCAwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFL65
-7xtAhIIVIC95jJGECLyofdLCMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-Z2VvdHJ1c3QuY29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr
-0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAN
-BgkqhkiG9w0BAQUFAAOBgQAGmUarTBwrlr6zHF9p4GoORIaTUOw+mpGbMkn7KEE4
-1MqY2Ag0nJ9wml7iqjdgijImFdbaIGYTOLHN6/Q6g8HwUGlcsi9+JlSiQm2JNSn+
-XMVxhv0bLNnq9nI+vgT1nYgT9jDFUB+AoXHCz3BaIqa4psFtclA65BHPjcxBn0d5
-cA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Duale Hochschule Baden Württemberg Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-stuttgart.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Bernd</GivenName>
-    <SurName>Ziller</SurName>
-    <EmailAddress>root@dhbw-stuttgart.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Markus</GivenName>
-    <SurName>Bundschuh</SurName>
-    <EmailAddress>bundschuh@dhbw-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.xi.dante.org.uk.xml b/swamid-interfederations-2.0/saml.xi.dante.org.uk.xml
deleted file mode 100644
index 35d834fb..00000000
--- a/swamid-interfederations-2.0/saml.xi.dante.org.uk.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.xi.dante.org.uk">
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICIjCCAYugAwIBAgIGASxQBrXyMA0GCSqGSIb3DQEBBQUAMCoxEzARBgNVBAoMCmtleW1hbmFn
-ZXIxEzARBgNVBAsMCm9pb3NhbWwtc3AwHhcNMTAxMTE1MTQ1MzI1WhcNMjAxMTEyMTQ1MzI1WjA7
-MSQwIgYDVQQDDBtodHRwOi8vc2FtbC54aS5kYW50ZS5vcmcudWsxEzARBgNVBAsMCm9pb3NhbWwt
-c3AwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJinj+SozzKBNhSg40xbOnMk9VLKKma/5jXY
-6yNSFFeBnCEMDCnWuIc/BL3g8KtJX01aKluaMdyNQoP1hia5r78ZcG0Vcp1jOTnJXY/XGaE/kxeP
-qfIbbzzA+nZWreBu9w423/DFIzLbCK3JeGuddWOaWOcX1keei0fv1HRmZSB9AgMBAAGjQjBAMB0G
-A1UdDgQWBBQhcMfYZwDSCe65OGFUGE3JeAEgBDAfBgNVHSMEGDAWgBQhcMfYZwDSCe65OGFUGE3J
-eAEgBDANBgkqhkiG9w0BAQUFAAOBgQAzhIMRgmMw77Cchf0vmNK1MFotbPgMMLZKclc+ymUiELM2
-VmkNFA7cgoshLkEZzz7m0NuBLo5huNvGicSZvVhho+/hH334eerUWQP6htIqELZcd4/+ANwEnS+w
-yipEWt8Iv9QjHhFCC3A/RUxjica16KQmOfTmJnHRdcq2kmzqiA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICIjCCAYugAwIBAgIGASxQBrXyMA0GCSqGSIb3DQEBBQUAMCoxEzARBgNVBAoMCmtleW1hbmFn
-ZXIxEzARBgNVBAsMCm9pb3NhbWwtc3AwHhcNMTAxMTE1MTQ1MzI1WhcNMjAxMTEyMTQ1MzI1WjA7
-MSQwIgYDVQQDDBtodHRwOi8vc2FtbC54aS5kYW50ZS5vcmcudWsxEzARBgNVBAsMCm9pb3NhbWwt
-c3AwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJinj+SozzKBNhSg40xbOnMk9VLKKma/5jXY
-6yNSFFeBnCEMDCnWuIc/BL3g8KtJX01aKluaMdyNQoP1hia5r78ZcG0Vcp1jOTnJXY/XGaE/kxeP
-qfIbbzzA+nZWreBu9w423/DFIzLbCK3JeGuddWOaWOcX1keei0fv1HRmZSB9AgMBAAGjQjBAMB0G
-A1UdDgQWBBQhcMfYZwDSCe65OGFUGE3JeAEgBDAfBgNVHSMEGDAWgBQhcMfYZwDSCe65OGFUGE3J
-eAEgBDANBgkqhkiG9w0BAQUFAAOBgQAzhIMRgmMw77Cchf0vmNK1MFotbPgMMLZKclc+ymUiELM2
-VmkNFA7cgoshLkEZzz7m0NuBLo5huNvGicSZvVhho+/hH334eerUWQP6htIqELZcd4/+ANwEnS+w
-yipEWt8Iv9QjHhFCC3A/RUxjica16KQmOfTmJnHRdcq2kmzqiA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://xi.dante.org.uk:9080/oiosaml-demo/saml/LogoutServiceHTTPRedirect" ResponseLocation="http://xi.dante.org.uk:9080/oiosaml-demo/saml/LogoutServiceHTTPRedirectResponse"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://xi.dante.org.uk:9080/oiosaml-demo/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">DANTE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">DANTE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://dante.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>DANTE</md:Company>
-    <md:EmailAddress>mandeep@dante.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml b/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml
deleted file mode 100644
index 5dacfd08..00000000
--- a/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sandbox.aai.niif.hu/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-test</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:InformationURL xml:lang="hu">https://sandbox.aai.niif.hu/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sandbox.aai.niif.hu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDvjCCAqagAwIBAgIJAKmyDJ5RK7VnMA0GCSqGSIb3DQEBBQUAMEgxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxHDAaBgNVBAMTE3NhbmRib3guYWFpLm5paWYuaHUwHhcNMTAwMTA2MDkzNzM1WhcNMzcwNTI0MDkzNzM1WjBIMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRwwGgYDVQQDExNzYW5kYm94LmFhaS5uaWlmLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAss8blriJkeVc28dczjS3P7u4Hp+mDYqx9MecEzdGqnRPtE+1yJ3M6LkjmcbMSVvF+9i/qxkZxpn0BpIJhD/6WpC7e4TbAIMls6+eBSd82MJE2siANba+g7KIIc73LhEnnMBv5fmbyaAfCGZ6yG45/hsQ7j5f0ufcJuIINfrSIG+Qo3fMggIbgxZot3kzdJFUkPTNY201yQUhNmb2mNSOX1zOQn7+cRbrQ3ZBUj8E7rasqzZc20VhLF/Jv+yNr5zvkoETucJr4G8OyudKCPQT9xegJ9s5GBQ48DEQot6LFJSZ3zwDVeIoedWju2dLe6YIpC9pamhz9y2IP/9VlUhSTwIDAQABo4GqMIGnMB0GA1UdDgQWBBSmKZt1dBQ80ZzNIcEy0Nihu/nZYzB4BgNVHSMEcTBvgBSmKZt1dBQ80ZzNIcEy0Nihu/nZY6FMpEowSDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEcMBoGA1UEAxMTc2FuZGJveC5hYWkubmlpZi5odYIJAKmyDJ5RK7VnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAH8CkAleuCDK2S3qHSTdveyeXeIMT0JQ1sMwaNUgDpT7dItMc00Xl7kmcHyLq9ERu066ViSQYbJpFncrC+WrNbu5taArSs8I/iYXdBipRo6QRdy3DmjQEp/UgqKBWt+KZXNYm8UbaXJ0M0HNd9OvMznfDgUiBz0Bjy2e0ILhC15Bv33/zXpFJP+jaNv4C6Ql9Y8DbU/PujNBcBMWfN33gLedFHoHNSKJJcDryIxSDnDy7+TOwWcv3daztZEJ6h3rzGqkaN/+NBUynn1LebvvbWTNGarebjqDcT4D2l4d+QIYvXnECWD3ARf/rdP/KbfoNxD2EBrKdxcvDPq0uQii8nE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="hu">sandbox.aai.niif.hu</ServiceName>
-      <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"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="affiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
-    <OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.niif.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scauth.scopus.com.xml b/swamid-interfederations-2.0/scauth.scopus.com.xml
deleted file mode 100644
index 335b23e9..00000000
--- a/swamid-interfederations-2.0/scauth.scopus.com.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://scauth.scopus.com/">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scauth.scopus.com/SHIRE/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-scauth.scopus.com/SHIRE/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Elsevier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Elsevier Scopus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.elsevier.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml b/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml
deleted file mode 100644
index e52f4cb6..00000000
--- a/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sdauth.sciencedirect.com/">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Elsevier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Elsevier ScienceDirect</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.elsevier.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.nature.com.xml b/swamid-interfederations-2.0/secure.nature.com.xml
deleted file mode 100644
index 8b81e55d..00000000
--- a/swamid-interfederations-2.0/secure.nature.com.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.nature.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>secure.nature.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.nature.com,OU=NPG,O=Macmillan,L=London,C=UK</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIESpaZbzANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJV
-SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-A05QRzEaMBgGA1UEAxMRc2VjdXJlLm5hdHVyZS5jb20wHhcNMDkwODI3MTQzNDIz
-WhcNMTIwODI2MTQzNDIzWjBcMQswCQYDVQQGEwJVSzEPMA0GA1UEBxMGTG9uZG9u
-MRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEaMBgGA1UEAxMRc2Vj
-dXJlLm5hdHVyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv
-3qPD8StbD+IIgRZC0HxMghUOP5B+Q4CfDg7pIkxrLU2SUfb8aepSl5p3e//sRctS
-+niHwVMi2We7NkXJLZ+BgcMf7+YxDWFv7tZzG63geyK404uxzuKmlHmmeEzaFW99
-2tNI6f9O/cvL9LIJOv5LjsfOIwBvrjY2+iECsuRNXLpgnuvrU78/D82OjR1XK7IM
-0npoZSYRiidMe/QNRBdHfY/8h8V4Wu2eozKUITZO5ggGjizkR7+eSI+1PIOydnAm
-0kKylBYhwmm+sh1SkMpcmCScWaVJmlcdw9YpGYjDcJk60r+CZIQd4TY9cWSI2J1H
-CIgsO27TSpG/Opw5+RMZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAI8tPWDsEX3M
-CUO/aEdnb6nqnRzPmbtUHvxVFhcvNk/1M819Gt2oG5rTc2v86S/wbcrnCoYmwyHV
-W50vrRqEmEeEgZ2K7dRgrrdIfzfkInbf9Cjf/c3gX1IRNYqo3/Sw2+ShsV4tdzFA
-Y4ngrDm2pMYm0TKGXLE1jrh24BhEjCfso/yh6NT7JEA6YXdazEW3MlCHkGVhtE1Y
-SDT+VtaMa4rqCjCOEQknU/vN60oBhyoKbZPAUfknfRf5XBkPE5Vy4QsRZ/D15tx0
-yTmkAyxSSBlN79xSJ2IciALnoXg+CLFvDYrCeDKi0qs165v/NzGt59r+VNc1yefX
-UcROare0YUA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.nature.com/Shibboleth.sso/SAML/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.nature.com/Shibboleth.sso/SAML/Artifact" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Nature Publishing Group</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Nature Publishing Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.nature.com/npg_/company_info/index.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Amanda</GivenName>
-    <SurName>Ward</SurName>
-    <EmailAddress>a.ward@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>jollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/securemail.feide.no.xml b/swamid-interfederations-2.0/securemail.feide.no.xml
deleted file mode 100644
index 4117fd4b..00000000
--- a/swamid-interfederations-2.0/securemail.feide.no.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://securemail.feide.no/simplesaml/saml2/sp/metadata.php">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://securemail.feide.no/simplesaml/saml2/sp/SingleLogoutService.php"/>
-    <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://securemail.feide.no/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Feide SecureMail</md:ServiceName>
-      <md:ServiceName xml:lang="no">Feide SecureMail</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Allows user to in a secure way send messages to others. A better alternative to unencrypted email messages.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">En tjeneste for å sende sikre meldinger til andre. Et godt alternativ til ukryptert e-post.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services-federation.renater.fr.xml b/swamid-interfederations-2.0/services-federation.renater.fr.xml
deleted file mode 100644
index 08ebb56f..00000000
--- a/swamid-interfederations-2.0/services-federation.renater.fr.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services-federation.renater.fr/validation/ressource">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-06T14:09:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RENATER - validation resource</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">RENATER - ressource de validation de la fédération Education-Recherche (Shibboleth v2)</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">La ressource de validation permet à un organisme membre de tester son fournisseur d'identités au sein de la fédération Éducation-Recherche.
-
-Cette ressource permet de visualiser tous les attributs utilisateur transmis dans le contexte de la session d'authentification.
-
-RENATER propose également une ressource de test, proposant l'équivalent dans la fédération de Test.
-
-Cette ressource ne requiert aucun attribut, elle se contente d'afficher les attributs transmis par l'IdP.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIC5TCCAc2gAwIBAgIJAOLQPcMRyfO5MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCmZlZC5jcnUuZnIwHhcNMTAwMjE3MDkwODE0WhcNMjAwMjE1MDkwODE0WjAV
-MRMwEQYDVQQDEwpmZWQuY3J1LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAuqwRDaahljnpxquFaZczqamfSD6oR/4HXnDr/ejA6CoiLs1Csrc4p/Im
-8SjbubbyVmuAmYeT8YW30xtxzoLYMlX/k9LfdnQQMNS0BT20fWKMudHWtKOL+gDo
-ruqK4Ivmv8XJAjzawYvOocxkOZVtsTJ0cP2N+EJTemR4SlEZD2yFGbKdzjfvaocm
-2f1EU4uUanpprf/tne2jwInaK4a3VscZ/AYxtaKTubHtcGrGSrxhvapV6CKMbt+A
-qTW5iWdF4KGdCXUTSzxGjb4mkk1dD5Y4X6zRFSimtE291E2AWL5ricAIPXo6tUax
-mZJVTj3Z0zI4Xo8yefPbFy/V/mCHUwIDAQABozgwNjAVBgNVHREEDjAMggpmZWQu
-Y3J1LmZyMB0GA1UdDgQWBBSKhhBVN/91d6MSPBXStg/lgDHU6jANBgkqhkiG9w0B
-AQUFAAOCAQEAnt8hmxNUOCXMDkJDfM07U/A+Lm+Xc6uXrCJxjr1Nk2zoQDcup4Cp
-90QqxmS483yIa9gAOIswctaDKR2ZPdN+70zBwWjMzQTJcuwRaZhYt2z8qTiDUG9z
-UenrbATCLtWu3PDuGEv4xfgwwSWrdmp/QDbCjs06l3V5WOqZ8/PHY6xbcOQTYpqY
-rrjYGlE1h9R6cGy+SwUuy+Tg8Npf6YM+jBxeSQy6i0jbb8fzF59ZLsP2Oty18qwR
-Z1MmB2gTGIGSzBpLi5rxtWJ0uL67+468ZKcspiUlF+TYr9nfUGb6+wk3wWRGKPoD
-G3v2db1TkOg7SaejzNk+Z0KP8i/gunw49A==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIC5TCCAc2gAwIBAgIJAOLQPcMRyfO5MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCmZlZC5jcnUuZnIwHhcNMTAwMjE3MDkwODE0WhcNMjAwMjE1MDkwODE0WjAV
-MRMwEQYDVQQDEwpmZWQuY3J1LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAuqwRDaahljnpxquFaZczqamfSD6oR/4HXnDr/ejA6CoiLs1Csrc4p/Im
-8SjbubbyVmuAmYeT8YW30xtxzoLYMlX/k9LfdnQQMNS0BT20fWKMudHWtKOL+gDo
-ruqK4Ivmv8XJAjzawYvOocxkOZVtsTJ0cP2N+EJTemR4SlEZD2yFGbKdzjfvaocm
-2f1EU4uUanpprf/tne2jwInaK4a3VscZ/AYxtaKTubHtcGrGSrxhvapV6CKMbt+A
-qTW5iWdF4KGdCXUTSzxGjb4mkk1dD5Y4X6zRFSimtE291E2AWL5ricAIPXo6tUax
-mZJVTj3Z0zI4Xo8yefPbFy/V/mCHUwIDAQABozgwNjAVBgNVHREEDjAMggpmZWQu
-Y3J1LmZyMB0GA1UdDgQWBBSKhhBVN/91d6MSPBXStg/lgDHU6jANBgkqhkiG9w0B
-AQUFAAOCAQEAnt8hmxNUOCXMDkJDfM07U/A+Lm+Xc6uXrCJxjr1Nk2zoQDcup4Cp
-90QqxmS483yIa9gAOIswctaDKR2ZPdN+70zBwWjMzQTJcuwRaZhYt2z8qTiDUG9z
-UenrbATCLtWu3PDuGEv4xfgwwSWrdmp/QDbCjs06l3V5WOqZ8/PHY6xbcOQTYpqY
-rrjYGlE1h9R6cGy+SwUuy+Tg8Npf6YM+jBxeSQy6i0jbb8fzF59ZLsP2Oty18qwR
-Z1MmB2gTGIGSzBpLi5rxtWJ0uL67+468ZKcspiUlF+TYr9nfUGb6+wk3wWRGKPoD
-G3v2db1TkOg7SaejzNk+Z0KP8i/gunw49A==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://services-federation.renater.fr/validation/ressource/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services-federation.renater.fr/validation/ressource/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">RENATER - ressource de validation de la fédération Education-Recherche (Shibboleth v2)</ServiceName>
-      <ServiceName xml:lang="en">RENATER - validation resource</ServiceName>
-      <ServiceDescription xml:lang="fr">La ressource de validation permet à un organisme membre de tester son fournisseur d'identités au sein de la fédération Éducation-Recherche.
-
-Cette ressource permet de visualiser tous les attributs utilisateur transmis dans le contexte de la session d'authentification.
-
-RENATER propose également une ressource de test, proposant l'équivalent dans la fédération de Test.
-
-Cette ressource ne requiert aucun attribut, elle se contente d'afficher les attributs transmis par l'IdP.</ServiceDescription>
-      <ServiceDescription xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</ServiceDescription>
-      <RequestedAttribute FriendlyName="supannAutreMail" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" 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"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>equipe-federation@listes.renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.aai.mpg.de.xml b/swamid-interfederations-2.0/services.aai.mpg.de.xml
deleted file mode 100644
index df186e1d..00000000
--- a/swamid-interfederations-2.0/services.aai.mpg.de.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.aai.mpg.de/idp/proxy/idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>services.aai.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
-MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
-aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
-lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
-T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
-kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
-fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
-5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
-zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
-Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
-Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
-d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
-gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
-om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
-HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
-ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
-DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
-guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>services.aai.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
-MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
-aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
-lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
-T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
-kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
-fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
-5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
-zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
-Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
-Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
-d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
-gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
-om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
-HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
-ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
-DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
-guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://services.aai.mpg.de/idp/proxy/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://services.aai.mpg.de/idp/proxy/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.aai.mpg.de/idp/proxy/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://services.aai.mpg.de/idp/proxy/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>services.aai.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
-MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
-aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
-lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
-T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
-kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
-fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
-5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
-zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
-Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
-Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
-d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
-gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
-om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
-HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
-ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
-DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
-guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>services.aai.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
-MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
-aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
-lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
-T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
-kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
-fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
-5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
-zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
-Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
-Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
-d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
-gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
-om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
-HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
-ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
-DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
-guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Max-Planck-Gesellschaft</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.mpg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Sebastian</GivenName>
-    <SurName>Rieger</SurName>
-    <EmailAddress>sebastian.rieger@gwdg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthias</GivenName>
-    <SurName>Egger</SurName>
-    <EmailAddress>matthias.egger@rzg.mpg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thorsten</GivenName>
-    <SurName>Hindermann</SurName>
-    <EmailAddress>thorsten.hindermann@gwdg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.oxfordjournals.org.xml b/swamid-interfederations-2.0/services.oxfordjournals.org.xml
deleted file mode 100644
index b8790056..00000000
--- a/swamid-interfederations-2.0/services.oxfordjournals.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.oxfordjournals.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Oxford Journals</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Oxford Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.oxfordjournals.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sh2testsp1.iay.org.uk.xml b/swamid-interfederations-2.0/sh2testsp1.iay.org.uk.xml
deleted file mode 100644
index 6fdeb90e..00000000
--- a/swamid-interfederations-2.0/sh2testsp1.iay.org.uk.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sh2testsp1.iay.org.uk/shibboleth">
-  <!--
-		This is an SDSS project test SP running outside the University environment.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </Extensions>
-  <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SDSS SAML 1.1/2.0 Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This test service provider allows you to see the attributes your identity provider is releasing.</mdui:Description>
-        <mdui:Logo height="218" width="500">https://sh2testsp1.iay.org.uk/images/leaves_500x218.jpg</mdui:Logo>
-        <mdui:Logo height="104" width="240">https://sh2testsp1.iay.org.uk/images/leaves_240x104.jpg</mdui:Logo>
-        <mdui:Logo height="44" width="100">https://sh2testsp1.iay.org.uk/images/leaves_100x44.jpg</mdui:Logo>
-        <mdui:Logo height="75" width="75">https://sh2testsp1.iay.org.uk/images/leaves_75x75.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/Login1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/DS" index="2"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKfedWAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKfedDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKfedDS" index="3"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKfedWAYFall"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKtestWAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKtestDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKtestDS" index="4"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTfedWAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTfedDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTfedDS" index="5"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTfedWAYFall"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTtestWAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTtestDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTtestDS" index="6"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/EDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/EDS" index="7"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8DCCAtigAwIBAgIJAOw5pWQpuZYtMA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNV
-						BAYTAkdCMRIwEAYDVQQHEwlFZGluYnVyZ2gxFTATBgNVBAoTDElhbiBBLiBZb3Vu
-						ZzEeMBwGA1UEAxMVc2gydGVzdHNwMS5pYXkub3JnLnVrMB4XDTA4MTExMjE2MzIx
-						MVoXDTI4MDExMjE2MzIxMVowWDELMAkGA1UEBhMCR0IxEjAQBgNVBAcTCUVkaW5i
-						dXJnaDEVMBMGA1UEChMMSWFuIEEuIFlvdW5nMR4wHAYDVQQDExVzaDJ0ZXN0c3Ax
-						LmlheS5vcmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjn5vE
-						tcuRZwsqQdwlHKGE8YeWkLvvoPRcvp88xQjuOrZU3fVXbn1JY2oArq5y9hujPJJQ
-						MNOy9ESN7KFeH3I9qvZFZcl1gjw/arVzkNETsnXHU/Gc7Oj+lPCCWwUxIefSn5wt
-						tXoSVGqJBvctZquHXbTj62Vei1/VhlTixFYqbLHXfDgK4RYOD6QZlgHobr0Hye8y
-						Ps6sKdDbu+DhmnbtoG5y7Y5/b24SyV9p1eCbOdhYEdc+NijccDPN/Ms/Ub7zI/Rj
-						9F6JRfxcFlyMjGiYfMLeyiMTUbIC4R7AkoWiAs7ptddZ2XeuGCBjZOLQ5Xgj7sDr
-						MaXVnlFnzZQovlIRAgMBAAGjgbwwgbkwHQYDVR0OBBYEFLYTfNB3+zufAcpluCuJ
-						tXMKzEOTMIGJBgNVHSMEgYEwf4AUthN80Hf7O58BymW4K4m1cwrMQ5OhXKRaMFgx
-						CzAJBgNVBAYTAkdCMRIwEAYDVQQHEwlFZGluYnVyZ2gxFTATBgNVBAoTDElhbiBB
-						LiBZb3VuZzEeMBwGA1UEAxMVc2gydGVzdHNwMS5pYXkub3JnLnVrggkA7DmlZCm5
-						li0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAZuWG7yLuMziQbEVT
-						u7+GfL9z/5UXF1yYDUMyEkcFfKUSbyKV0aDdIaRJI/jj/7wu031Bsg3MjpA5Nxr2
-						1aSqsr3Vson3CCMISPRlj6v0B+lwB/3tK5UvPcOe7jWgmhOtcvXPpimXLChZOiHv
-						WQwkoN+WNF+TyY+9/2hKUnWyy75nRA0RTe2l2TWWrGHzECQZUbjfjR20oDVwaQbK
-						kVOI2+PkOSitsmTSFwf/9hPkqXgbIVXxzDiHIYevERxgehH910dTbhrgTnNFvV9E
-						WMK87CuoEcI9D9PHfeFTDkRp2pigVMQQwQCw+5ms72q8f1TgUCwuvoKVQ+V7joEA
-						Ei/BJQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">SDSS SAML 1.1/2.0 Test SP</ServiceName>
-      <ServiceDescription xml:lang="en">
-				This test service provider allows you to see the attributes
-				your identity provider is releasing.
-			</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:mace:dir:attribute-def:eduPersonNickname" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:mace:dir:attribute-def:eduPersonOrgDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" 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"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="description" Name="urn:mace:dir:attribute-def:description" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:mace:dir:attribute-def:facsimileTelephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="initials" Name="urn:mace:dir:attribute-def:initials" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:mace:dir:attribute-def:l" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="manager" Name="urn:mace:dir:attribute-def:manager" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="manager" Name="urn:oid:0.9.2342.19200300.100.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:mace:dir:attribute-def:ou" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postalCode" Name="urn:mace:dir:attribute-def:postalCode" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postofficeBox" Name="urn:mace:dir:attribute-def:postOfficeBox" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:mace:dir:attribute-def:preferredLanguage" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="seeAlso" Name="urn:mace:dir:attribute-def:seeAlso" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="st" Name="urn:mace:dir:attribute-def:st" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="st" Name="urn:oid:2.5.4.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="street" Name="urn:mace:dir:attribute-def:street" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:mace:dir:attribute-def:telephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:mace:dir:attribute-def:title" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="carLicense" Name="urn:mace:dir:attribute-def:carLicense" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="carLicense" Name="urn:oid:2.16.840.1.113730.3.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="departmentNumber" Name="urn:mace:dir:attribute-def:departmentNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="departmentNumber" Name="urn:oid:2.16.840.1.113730.3.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:mace:dir:attribute-def:employeeNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="employeeType" Name="urn:mace:dir:attribute-def:employeeType" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="employeeType" Name="urn:oid:1.2.840.113556.1.2.613" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="businessCategory" Name="urn:mace:dir:attribute-def:businessCategory" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:oid:2.5.4.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ian A. Young</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SDSS Fountainhall Shibboleth 2.X test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://iay.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml b/swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml
deleted file mode 100644
index 8aa71bf4..00000000
--- a/swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shi-idp2.rz.fh-muenchen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hm.edu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shi-idp2.rz.fh-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shi-idp2.rz.fh-muenchen.de,O=Hochschule Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIEDcsqjDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHDAaBgNVBAoT
-E0hvY2hzY2h1bGUgTXVlbmNoZW4xHzAdBgNVBAMTFkhvY2hzY2h1bGUgTXVlbmNo
-ZW4gQ0ExHDAaBgkqhkiG9w0BCQEWDWRmbi1jYUBobS5lZHUwHhcNMDkwMzAyMDk1
-NTA5WhcNMTQwMzAxMDk1NTA5WjB0MQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5
-ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEcMBoGA1UEChMTSG9jaHNjaHVsZSBNdWVu
-Y2hlbjEjMCEGA1UEAxMac2hpLWlkcDIucnouZmgtbXVlbmNoZW4uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuGrk1+axrm8xQ6G9pXH0XixnLgBoe
-N6QjjppfBtJbBNgrC/VhJ2iVgxfQUh6tWi39+VTOsoqS9CC5Ek33KKucwIWvPq0Q
-C+8pWVD4xyhmfS2JZ5dcW5iJPVJuYYVNec+pkmq9v2yVS+pRPSmspHo9Nbj65QTV
-hP1S1O7lpX3hz7GeX6M47gTJPGdi6wJ7h8RCE3xSUcVZBL3tVs6jwT7tfemA4Gzs
-GZGTpY9BrqDkMqsExopYTx7JFnu1q17Ap43Xr+G3GI39TBvV+s4Hll1EoIzpdJJV
-WPMiaANdAVCA3S1jP8U5JxqP2emtYoIDNM4RLwNiqVIxjwpUCHrwUvg9AgMBAAGj
-ggGrMIIBpzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFP5RufvU6s2e5rtHIuF+rabSmIFWMB8G
-A1UdIwQYMBaAFO1rZU9acV4J2cVHw+6gHagJU86uMIGIBgNVHR8EgYAwfjA9oDug
-OYY3aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tdWVuY2hlbi1jYS9wdWIvY3Js
-L2NhY3JsLmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1tdWVu
-Y2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYI
-KwYBBQUHMAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtbXVlbmNoZW4tY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAD5j658J5TWHdEhE0go+39s9+yoG6QI/L6NBFu8qF
-QYvPmvUVOwyElELO+4U4m51eKWGLQVeiTvnYFzzI56bJ713wP2MnzUyjOidfRzZg
-TvTsPm8rVqSiKzLKKQajogToGbA8/dijvtP589If1rQ2yT9aGLcFq65RFc6kx0Xj
-dTsOnf/czWeuJTCHHNmL3SXoghoyqRQ91rjEqcsfZCR91CeWCe+uOviKbJ3452xz
-jTxgsSw3FdG9cUfVitvLTrqyBx9PIqxlcOl29G0COkAF4W7kKXpT8EjolBM2fRYH
-ENfPXpnICsFQ5SjpYA/67L+SWLFherT+YrordFYXmATDeg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hm.edu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shi-idp2.rz.fh-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shi-idp2.rz.fh-muenchen.de,O=Hochschule Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIEDcsqjDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHDAaBgNVBAoT
-E0hvY2hzY2h1bGUgTXVlbmNoZW4xHzAdBgNVBAMTFkhvY2hzY2h1bGUgTXVlbmNo
-ZW4gQ0ExHDAaBgkqhkiG9w0BCQEWDWRmbi1jYUBobS5lZHUwHhcNMDkwMzAyMDk1
-NTA5WhcNMTQwMzAxMDk1NTA5WjB0MQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5
-ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEcMBoGA1UEChMTSG9jaHNjaHVsZSBNdWVu
-Y2hlbjEjMCEGA1UEAxMac2hpLWlkcDIucnouZmgtbXVlbmNoZW4uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuGrk1+axrm8xQ6G9pXH0XixnLgBoe
-N6QjjppfBtJbBNgrC/VhJ2iVgxfQUh6tWi39+VTOsoqS9CC5Ek33KKucwIWvPq0Q
-C+8pWVD4xyhmfS2JZ5dcW5iJPVJuYYVNec+pkmq9v2yVS+pRPSmspHo9Nbj65QTV
-hP1S1O7lpX3hz7GeX6M47gTJPGdi6wJ7h8RCE3xSUcVZBL3tVs6jwT7tfemA4Gzs
-GZGTpY9BrqDkMqsExopYTx7JFnu1q17Ap43Xr+G3GI39TBvV+s4Hll1EoIzpdJJV
-WPMiaANdAVCA3S1jP8U5JxqP2emtYoIDNM4RLwNiqVIxjwpUCHrwUvg9AgMBAAGj
-ggGrMIIBpzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFP5RufvU6s2e5rtHIuF+rabSmIFWMB8G
-A1UdIwQYMBaAFO1rZU9acV4J2cVHw+6gHagJU86uMIGIBgNVHR8EgYAwfjA9oDug
-OYY3aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tdWVuY2hlbi1jYS9wdWIvY3Js
-L2NhY3JsLmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1tdWVu
-Y2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYI
-KwYBBQUHMAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtbXVlbmNoZW4tY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAD5j658J5TWHdEhE0go+39s9+yoG6QI/L6NBFu8qF
-QYvPmvUVOwyElELO+4U4m51eKWGLQVeiTvnYFzzI56bJ713wP2MnzUyjOidfRzZg
-TvTsPm8rVqSiKzLKKQajogToGbA8/dijvtP589If1rQ2yT9aGLcFq65RFc6kx0Xj
-dTsOnf/czWeuJTCHHNmL3SXoghoyqRQ91rjEqcsfZCR91CeWCe+uOviKbJ3452xz
-jTxgsSw3FdG9cUfVitvLTrqyBx9PIqxlcOl29G0COkAF4W7kKXpT8EjolBM2fRYH
-ENfPXpnICsFQ5SjpYA/67L+SWLFherT+YrordFYXmATDeg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule München IdP 2.5</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule München IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hm.edu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Harald</GivenName>
-    <SurName>Strack</SurName>
-    <EmailAddress>dfn-aai@hm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Andreas</GivenName>
-    <SurName>Boeck</SurName>
-    <EmailAddress>dfn-aai@hm.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.awi.de.xml b/swamid-interfederations-2.0/shib-idp.awi.de.xml
deleted file mode 100644
index 89d08364..00000000
--- a/swamid-interfederations-2.0/shib-idp.awi.de.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.awi.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">awi.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.awi.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
-ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
-a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
-A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
-VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
-Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
-1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
-r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
-HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
-ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
-UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
-HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
-Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
-L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
-42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
-wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
-jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
-UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
-R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.awi.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
-ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
-a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
-A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
-VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
-Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
-1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
-r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
-HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
-ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
-UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
-HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
-Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
-L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
-42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
-wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
-jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
-UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
-R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.awi.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.awi.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.awi.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.awi.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.awi.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.awi.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">awi.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.awi.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
-ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
-a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
-A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
-VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
-Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
-1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
-r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
-HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
-ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
-UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
-HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
-Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
-L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
-42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
-wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
-jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
-UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
-R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.awi.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
-ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
-a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
-A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
-VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
-Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
-1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
-r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
-HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
-ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
-UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
-HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
-Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
-L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
-42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
-wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
-jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
-UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
-R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.awi.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.awi.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Stiftung Alfred-Wegener-Institut für Polar- und Meeresforschung</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Alfred-Wegener-Institut für Polar- und Meeresforschung</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.awi.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Joerg</GivenName>
-    <SurName>Matthes</SurName>
-    <EmailAddress>joerg.matthes@awi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stefan</GivenName>
-    <SurName>Pinkernell</SurName>
-    <EmailAddress>stefan.pinkernell@awi.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml b/swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml
deleted file mode 100644
index 47c2d08f..00000000
--- a/swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.uni-hildesheim.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hildesheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-hildesheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-hildesheim.de,OU=Rechenzentrum,O=Universitaet Hildesheim,L=Hildesheim,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIEEeczVzANBgkqhkiG9w0BAQUFADCBjTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBIaWxkZXNoZWltMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMRowGAYDVQQDExFVbmkgSGlsZGVzaGVpbSBDQTEoMCYGCSqG
-SIb3DQEJARYZdW5paGljYUB1bmktaGlsZGVzaGVpbS5kZTAeFw0xMTA1MDkwOTM3
-MTFaFw0xNjA1MDcwOTM3MTFaMIGZMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmll
-ZGVyc2FjaHNlbjETMBEGA1UEBxMKSGlsZGVzaGVpbTEgMB4GA1UEChMXVW5pdmVy
-c2l0YWV0IEhpbGRlc2hlaW0xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xIzAhBgNV
-BAMTGnNoaWItaWRwLnVuaS1oaWxkZXNoZWltLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA4XxqNrbIPfFyEuyj+7WI+YcI8ram9P+mQBqdQNJwqATu
-V8w2ohTje6uhz/sSB6YMJZ870+/EC/cNM9Xys8iZP3N9ylxaf9R6C0kPzxC2jFW5
-BQXTUVdkGuTkHNvtLifaWjlNssXWKF6kfDt+VsOl8BO8YL5khFTmco7g1UCPAHY9
-uOWEkYvnl0mB1PEPfYb2urkpQmhYryfQx+xTBw/wDCWmEvYhYSy4gReBO9BqgLIA
-4PTks/jo9Hfd9J+Pc4u7dAoMDAY52vTtrP6S+5yNE/Sm1FkOwRXADKW/oHfpbfd5
-DTEE1CgtJ5BGDhXMhiALkOPqbOM7PDCthohTBaukhwIDAQABo4IBuDCCAbQwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQmigDF++XdQQw36lAGjYzo25G4HjAfBgNVHSMEGDAWgBSe
-BYR8FKG8O9BK7/dLD4EjE0cyXzCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWltLWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWlt
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEF
-BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktaGlsZGVzaGVpbS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLWhpbGRlc2hlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQBZUJMZplWyCVFPR0mWmNF9DXduUMpuSDp6sN4N
-9qcwHd7dnnxbrVIGikPJxZaCfhxuPpilDD85D1dkqk3GIbKIj524QcFAFiRV+A5u
-y4Yr7RtI1hnAYWJewytU570xK1RZqvcPLGsAi4Zze9Pq7S8jyb8qC07cnW4H2b3L
-bP+082peNGtkf4J9HbF9qG+sfDYseo4SwI+HnJcPCwcGwkPM7zTYK0hZLd1qg4jy
-P4G2HfAZD7IbijCgoAqTr8ubPaKXkYjrm4MRZoHq2dvASaD5tnIMh9GpThsTiFme
-MkAtRia4EjYFODSPkD/k98t4OT5pTuQxW97iAXtGhIQrv6Zn
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.uni-hildesheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-hildesheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.uni-hildesheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-hildesheim.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hildesheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-hildesheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-hildesheim.de,OU=Rechenzentrum,O=Universitaet Hildesheim,L=Hildesheim,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIEEeczVzANBgkqhkiG9w0BAQUFADCBjTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBIaWxkZXNoZWltMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMRowGAYDVQQDExFVbmkgSGlsZGVzaGVpbSBDQTEoMCYGCSqG
-SIb3DQEJARYZdW5paGljYUB1bmktaGlsZGVzaGVpbS5kZTAeFw0xMTA1MDkwOTM3
-MTFaFw0xNjA1MDcwOTM3MTFaMIGZMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmll
-ZGVyc2FjaHNlbjETMBEGA1UEBxMKSGlsZGVzaGVpbTEgMB4GA1UEChMXVW5pdmVy
-c2l0YWV0IEhpbGRlc2hlaW0xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xIzAhBgNV
-BAMTGnNoaWItaWRwLnVuaS1oaWxkZXNoZWltLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA4XxqNrbIPfFyEuyj+7WI+YcI8ram9P+mQBqdQNJwqATu
-V8w2ohTje6uhz/sSB6YMJZ870+/EC/cNM9Xys8iZP3N9ylxaf9R6C0kPzxC2jFW5
-BQXTUVdkGuTkHNvtLifaWjlNssXWKF6kfDt+VsOl8BO8YL5khFTmco7g1UCPAHY9
-uOWEkYvnl0mB1PEPfYb2urkpQmhYryfQx+xTBw/wDCWmEvYhYSy4gReBO9BqgLIA
-4PTks/jo9Hfd9J+Pc4u7dAoMDAY52vTtrP6S+5yNE/Sm1FkOwRXADKW/oHfpbfd5
-DTEE1CgtJ5BGDhXMhiALkOPqbOM7PDCthohTBaukhwIDAQABo4IBuDCCAbQwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQmigDF++XdQQw36lAGjYzo25G4HjAfBgNVHSMEGDAWgBSe
-BYR8FKG8O9BK7/dLD4EjE0cyXzCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWltLWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWlt
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEF
-BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktaGlsZGVzaGVpbS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLWhpbGRlc2hlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQBZUJMZplWyCVFPR0mWmNF9DXduUMpuSDp6sN4N
-9qcwHd7dnnxbrVIGikPJxZaCfhxuPpilDD85D1dkqk3GIbKIj524QcFAFiRV+A5u
-y4Yr7RtI1hnAYWJewytU570xK1RZqvcPLGsAi4Zze9Pq7S8jyb8qC07cnW4H2b3L
-bP+082peNGtkf4J9HbF9qG+sfDYseo4SwI+HnJcPCwcGwkPM7zTYK0hZLd1qg4jy
-P4G2HfAZD7IbijCgoAqTr8ubPaKXkYjrm4MRZoHq2dvASaD5tnIMh9GpThsTiFme
-MkAtRia4EjYFODSPkD/k98t4OT5pTuQxW97iAXtGhIQrv6Zn
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Hildesheim</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Hildesheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-hildesheim.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>Werner</SurName>
-    <EmailAddress>wernert@uni-hildesheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml
deleted file mode 100644
index f23e3754..00000000
--- a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.uni-osnabrueck.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-osnabrueck.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
-MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
-MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
-DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
-aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
-IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
-fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
-pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
-NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
-9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
-m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
-FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
-VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
-aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
-dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
-cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
-ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
-y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
-+B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
-a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
-u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
-N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
-nT7WnMt5n4CA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-osnabrueck.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
-MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
-MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
-DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
-aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
-IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
-fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
-pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
-NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
-9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
-m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
-FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
-VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
-aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
-dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
-cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
-ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
-y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
-+B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
-a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
-u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
-N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
-nT7WnMt5n4CA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universitaet Osnabrueck</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Osnabrück</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-osnabrueck.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Werner</GivenName>
-    <SurName>Nienhüser</SurName>
-    <EmailAddress>Werner.Nienhueser@Uni-Osnabrueck.DE</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.alexanderstreet.com.xml b/swamid-interfederations-2.0/shib.alexanderstreet.com.xml
deleted file mode 100644
index 8736e529..00000000
--- a/swamid-interfederations-2.0/shib.alexanderstreet.com.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.alexanderstreet.com/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.alexanderstreet.com/Shibboleth.sso/WAYF" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.alexanderstreet.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.alexanderstreet.com,O=Alexander Street Press,L=Alexandria,ST=Virginia,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDbjCCAlYCCQDBNjJ+wWhziDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
-UzERMA8GA1UECBMIVmlyZ2luaWExEzARBgNVBAcTCkFsZXhhbmRyaWExHzAdBgNV
-BAoTFkFsZXhhbmRlciBTdHJlZXQgUHJlc3MxITAfBgNVBAMTGHNoaWIuYWxleGFu
-ZGVyc3RyZWV0LmNvbTAeFw0xMTEwMjcxMzQ5NDNaFw0xNDEwMjExMzQ5NDNaMHkx
-CzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTETMBEGA1UEBxMKQWxleGFu
-ZHJpYTEfMB0GA1UEChMWQWxleGFuZGVyIFN0cmVldCBQcmVzczEhMB8GA1UEAxMY
-c2hpYi5hbGV4YW5kZXJzdHJlZXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAm7HquS72lySd0gXBNERWazSe97ShgPJwSldxjqBuQ1BvBRp9kdlC
-oAZcHmlmsleyIFPOvbc+zaZcYprMj8vmwq3aUE8U5bmpo3WFk8DlrFgzPEIFXuHF
-3/On24Id+WSpajoTOMoopw4uDG2FHbpEKnbMB9MAHK0eVVXfnj/PfwjIEZfw5kBg
-3jpJri3fZME7VQFP6pGS1TlEWslw2PcGlhkQjyiHHzZpHMmfwUKm0QzBMY49HecX
-weB8PmIS5Pnrydx3x09/De8GTJn6rGuYhu7aF0GTw9kC0oToJAF8A2xN9vyXcMtx
-baMAro05qxlTIOWC1yNeGk9dfcdcTsFeBQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBziIy25B83PAlHfpZroG4o6kVdyHKtr26IIb7+8l/5xOg+DZZAqP9KMbScBN1T
-XnKZf7nWfg0CPgrkZFx/M4jCrJgY5eQVlKcxhHGA3b7dXT36DK6gpcxWyB0Hkm1c
-9F++liEzSYao5HItr9epelUvzoQjY/aLT+rGzj0TmufvNxIULojZcWP/CZ1VWVVK
-k4/vgLZs88Ow9eY0GVRAO0g47xPsI4Ozu7HFVZeUsrhouwJKUOdBdHx75mxfoQDP
-68FuNHZ4/rGoVHSJlPjW9zgnNHa3yfGfPN4axlzscowZV/7yGJxeoeBLmicXr+mW
-IeRCblzZC+JMvA/j4d6Mi/s8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.alexanderstreet.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.alexanderstreet.com,O=Alexander Street Press,L=Alexandria,ST=Virginia,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDbjCCAlYCCQDBNjJ+wWhziDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
-UzERMA8GA1UECBMIVmlyZ2luaWExEzARBgNVBAcTCkFsZXhhbmRyaWExHzAdBgNV
-BAoTFkFsZXhhbmRlciBTdHJlZXQgUHJlc3MxITAfBgNVBAMTGHNoaWIuYWxleGFu
-ZGVyc3RyZWV0LmNvbTAeFw0xMTEwMjcxMzQ5NDNaFw0xNDEwMjExMzQ5NDNaMHkx
-CzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTETMBEGA1UEBxMKQWxleGFu
-ZHJpYTEfMB0GA1UEChMWQWxleGFuZGVyIFN0cmVldCBQcmVzczEhMB8GA1UEAxMY
-c2hpYi5hbGV4YW5kZXJzdHJlZXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAm7HquS72lySd0gXBNERWazSe97ShgPJwSldxjqBuQ1BvBRp9kdlC
-oAZcHmlmsleyIFPOvbc+zaZcYprMj8vmwq3aUE8U5bmpo3WFk8DlrFgzPEIFXuHF
-3/On24Id+WSpajoTOMoopw4uDG2FHbpEKnbMB9MAHK0eVVXfnj/PfwjIEZfw5kBg
-3jpJri3fZME7VQFP6pGS1TlEWslw2PcGlhkQjyiHHzZpHMmfwUKm0QzBMY49HecX
-weB8PmIS5Pnrydx3x09/De8GTJn6rGuYhu7aF0GTw9kC0oToJAF8A2xN9vyXcMtx
-baMAro05qxlTIOWC1yNeGk9dfcdcTsFeBQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBziIy25B83PAlHfpZroG4o6kVdyHKtr26IIb7+8l/5xOg+DZZAqP9KMbScBN1T
-XnKZf7nWfg0CPgrkZFx/M4jCrJgY5eQVlKcxhHGA3b7dXT36DK6gpcxWyB0Hkm1c
-9F++liEzSYao5HItr9epelUvzoQjY/aLT+rGzj0TmufvNxIULojZcWP/CZ1VWVVK
-k4/vgLZs88Ow9eY0GVRAO0g47xPsI4Ozu7HFVZeUsrhouwJKUOdBdHx75mxfoQDP
-68FuNHZ4/rGoVHSJlPjW9zgnNHa3yfGfPN4axlzscowZV/7yGJxeoeBLmicXr+mW
-IeRCblzZC+JMvA/j4d6Mi/s8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Alexander Street Press LLC.</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Alexander Street Press LLC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://alexanderstreet.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Nathanel</GivenName>
-    <SurName>Sulimanov</SurName>
-    <EmailAddress>nathanels@astreetpress.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Field</SurName>
-    <EmailAddress>jfield@astreetpress.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ph-heidelberg.de.xml b/swamid-interfederations-2.0/shib.ph-heidelberg.de.xml
deleted file mode 100644
index 5824e0fb..00000000
--- a/swamid-interfederations-2.0/shib.ph-heidelberg.de.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ph-heidelberg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-heidelberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.ph-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.ph-heidelberg.de,O=Paedagogische Hochschule Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFljCCBH6gAwIBAgIED7SAPTANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEsMCoGA1UEChMjUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEhlaWRlbGJl
-cmcxDTALBgNVBAsTBElmREkxGTAXBgNVBAMTEFBIIEhlaWRlbGJlcmcgQ0ExIzAh
-BgkqhkiG9w0BCQEWFHBraUBwaC1oZWlkZWxiZXJnLmRlMB4XDTEwMDMwODEzNTkx
-MFoXDTE1MDMwNzEzNTkxMFowgY0xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEzARBgNVBAcTCkhlaWRlbGJlcmcxLDAqBgNVBAoTI1Bh
-ZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBIZWlkZWxiZXJnMR4wHAYDVQQDExVzaGli
-LnBoLWhlaWRlbGJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCaNSXvrmvT19AvsCFE9PniESkF7r6EI+r6OACiNvHGfvFw0ZIKLmGH6GTY7WhV
-tJo7AU6/Ycr7fjjvKDyEjVtmf+0OmRkDOdZ2+zkUboJd1LAgstrsAAkYFbrav30G
-Vs3DyK168EyCq5doKaPc6Fb+hFgxL/DmZeD8lfdXX7R8zQ9K9id4n5ZeobiLVdQ7
-2hAVfGxyqH1cjEk9x9NEbCAHbKI+l4TnhL5LGRR31dM8PZ1dY0gJrbF8kWDlJhPe
-oFuGcuByIVXPtXugvSH0ViKFL9baa6kWlaCeQ0s0YUiiW65w0td3usHmB3Ae+ao5
-lw4Vyz7fhj8sy5l+3i1H1GovAgMBAAGjggHLMIIBxzAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUowniR9xGIDxW
-roxo8n8LUOvO6EowHwYDVR0jBBgwFoAU1hg11RbbDdTZj96rLpNG4jHhQU4wHwYD
-VR0RBBgwFoEUcGtpQHBoLWhlaWRlbGJlcmcuZGUwgY0GA1UdHwSBhTCBgjA/oD2g
-O4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1oZWlkZWxiZXJnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWhl
-aWRlbGJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGW
-MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWhlaWRlbGJl
-cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3BoLWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCFS0SuZkqs/s1gpuUSRQxLtRdv+s4g
-9iosFSGuT1H8BZoksUzZS4TkUXuHlTgJorh0V5st4XjWRRropDalG2RgbhjKTxAq
-PpCiy/BNLsr/Ou5fU3rsz7nw2oE96cMSe0MmgE5HGoH0BLcFiiNt4X22FRTLWA3P
-IEPPQeEoZD02DMNBW9y0jD/oVjv6icHP7WCcqVlYf6W1fZHAI3c/tEFreyxLAAGQ
-7IqmzPINmXHe1JAUT8hpv9LlM/t+gni/HGkoSrwckcg7sRFKRQzYCvjpoDxGRjO+
-/K3IBPE7aytW8scxty+/v2kGI+wG0sQME6BoP5Q6jAM0GbRGIujIxrKc
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ph-heidelberg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ph-heidelberg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ph-heidelberg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ph-heidelberg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-heidelberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.ph-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.ph-heidelberg.de,O=Paedagogische Hochschule Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFljCCBH6gAwIBAgIED7SAPTANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEsMCoGA1UEChMjUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEhlaWRlbGJl
-cmcxDTALBgNVBAsTBElmREkxGTAXBgNVBAMTEFBIIEhlaWRlbGJlcmcgQ0ExIzAh
-BgkqhkiG9w0BCQEWFHBraUBwaC1oZWlkZWxiZXJnLmRlMB4XDTEwMDMwODEzNTkx
-MFoXDTE1MDMwNzEzNTkxMFowgY0xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEzARBgNVBAcTCkhlaWRlbGJlcmcxLDAqBgNVBAoTI1Bh
-ZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBIZWlkZWxiZXJnMR4wHAYDVQQDExVzaGli
-LnBoLWhlaWRlbGJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCaNSXvrmvT19AvsCFE9PniESkF7r6EI+r6OACiNvHGfvFw0ZIKLmGH6GTY7WhV
-tJo7AU6/Ycr7fjjvKDyEjVtmf+0OmRkDOdZ2+zkUboJd1LAgstrsAAkYFbrav30G
-Vs3DyK168EyCq5doKaPc6Fb+hFgxL/DmZeD8lfdXX7R8zQ9K9id4n5ZeobiLVdQ7
-2hAVfGxyqH1cjEk9x9NEbCAHbKI+l4TnhL5LGRR31dM8PZ1dY0gJrbF8kWDlJhPe
-oFuGcuByIVXPtXugvSH0ViKFL9baa6kWlaCeQ0s0YUiiW65w0td3usHmB3Ae+ao5
-lw4Vyz7fhj8sy5l+3i1H1GovAgMBAAGjggHLMIIBxzAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUowniR9xGIDxW
-roxo8n8LUOvO6EowHwYDVR0jBBgwFoAU1hg11RbbDdTZj96rLpNG4jHhQU4wHwYD
-VR0RBBgwFoEUcGtpQHBoLWhlaWRlbGJlcmcuZGUwgY0GA1UdHwSBhTCBgjA/oD2g
-O4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1oZWlkZWxiZXJnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWhl
-aWRlbGJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGW
-MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWhlaWRlbGJl
-cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3BoLWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCFS0SuZkqs/s1gpuUSRQxLtRdv+s4g
-9iosFSGuT1H8BZoksUzZS4TkUXuHlTgJorh0V5st4XjWRRropDalG2RgbhjKTxAq
-PpCiy/BNLsr/Ou5fU3rsz7nw2oE96cMSe0MmgE5HGoH0BLcFiiNt4X22FRTLWA3P
-IEPPQeEoZD02DMNBW9y0jD/oVjv6icHP7WCcqVlYf6W1fZHAI3c/tEFreyxLAAGQ
-7IqmzPINmXHe1JAUT8hpv9LlM/t+gni/HGkoSrwckcg7sRFKRQzYCvjpoDxGRjO+
-/K3IBPE7aytW8scxty+/v2kGI+wG0sQME6BoP5Q6jAM0GbRGIujIxrKc
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH-Heidelberg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Pädagogische Hochschule Heidelberg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-heidelberg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Dieter</GivenName>
-    <SurName>Schlaier</SurName>
-    <EmailAddress>schlaier@ph-heidelberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Peter</GivenName>
-    <SurName>Moos</SurName>
-    <EmailAddress>moos@ph-heidelberg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uni-mainz.de.xml b/swamid-interfederations-2.0/shib.uni-mainz.de.xml
deleted file mode 100644
index f9257156..00000000
--- a/swamid-interfederations-2.0/shib.uni-mainz.de.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.uni-mainz.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=hostmaster@uni-mainz.de,CN=shib.uni-mainz.de,OU=StartCom Verified Certificate Member,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE,description=371190-Ew4GnZ0vEX42MdIg</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHDjCCBfagAwIBAgICV0wwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAklM
-MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRh
-bCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAy
-IFByaW1hcnkgSW50ZXJtZWRpYXRlIFNlcnZlciBDQTAeFw0xMTAzMDMwNTMzMTJa
-Fw0xMzAzMDMwNDI1MzZaMIH8MSAwHgYDVQQNExczNzExOTAtRXc0R25aMHZFWDQy
-TWRJZzELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwG
-A1UEBxMFTWFpbnoxLjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJz
-aXRhZXQgTWFpbnoxLTArBgNVBAsTJFN0YXJ0Q29tIFZlcmlmaWVkIENlcnRpZmlj
-YXRlIE1lbWJlcjEaMBgGA1UEAxMRc2hpYi51bmktbWFpbnouZGUxJjAkBgkqhkiG
-9w0BCQEWF2hvc3RtYXN0ZXJAdW5pLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwT6NQ2xVNwXxTBD5fEZi7uABESzHPpP6tPNN6qQugmAE
-O/3PvRBlvkbicadY8vBaYG8GAjYtJseraGCanqeOF/jilZ2TgUk9OeQWVu7iufAg
-TfqSKzo4CF9myFqpPDL5DYYKHZVEf1BoIACb5LZGohOOPLxw7P6KJY5K0HOQhzPu
-TXgnc7F1pMk+H13jTCwp+rfIbDGKjevt7OQL2DUXgZbsw/BGDXhOPNhzchEZl7ce
-nTuICyx6B4z9ePHySWSnYAFHQ99n2n3n1RGvfMeQcko0lRw60ycHqKSY0Z7nysaP
-Ou9pV6oXwIeRDv0kiEBZN4OwzL9Q3Caz74NTyaUdzwIDAQABo4IDBjCCAwIwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQ11hAN/JzswSGhR2joEoU4cKAEGjAfBgNVHSMEGDAWgBQR
-2yNF/VTManFvhIoD1773AS8mhjAqBgNVHREEIzAhghFzaGliLnVuaS1tYWluei5k
-ZYIMdW5pLW1haW56LmRlMIIBQgYDVR0gBIIBOTCCATUwggExBgsrBgEEAYG1NwEC
-AjCCASAwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVy
-bWVkaWF0ZS5wZGYwgbcGCCsGAQUFBwICMIGqMBQWDVN0YXJ0Q29tIEx0ZC4wAwIB
-ARqBkUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgc2VjdGlvbiAqTGVnYWwgTGltaXRh
-dGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBQ
-b2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwYQYDVR0fBFowWDAqoCigJoYkaHR0cDovL3d3dy5zdGFydHNzbC5jb20v
-Y3J0Mi1jcmwuY3JsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQy
-LWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9v
-Y3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL3NlcnZlci9jYTBCBggrBgEFBQcw
-AoY2aHR0cDovL3d3dy5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMi5zZXJ2
-ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN
-BgkqhkiG9w0BAQUFAAOCAQEAvROhgKCSARf5XxMlFrgqM2L8z+6vpxcyBbk2VP0b
-l6fyoweBJ3hVMEHjsnLvc13xdjl4UybWHBgJrF6QGonJUSzR01Zrnae5j00zAy7j
-SKv2IgmRNoLWdLk6/lwB8J0Ai7kHSlHcsrTWyTdlppwEF3yfBNQ4rsR0yPXp/oMw
-Um0W47uYkn4rKhRCDyc7YLF11u/uIN3+QZ7cjWWGJFtt4Mv9yVRLsIuQCoJn8Kgq
-YbXDotXT6u9xaXNvmcNBQxG11AO5Bg1E29EUgLPoRVe6QODiXHRm7m10xsnXJB2J
-qId+gUq0/6Lm0AWZGW+NOUQvMbxX9CMLbiTcBe3s6xGqhQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uni-mainz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uni-mainz.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=hostmaster@uni-mainz.de,CN=shib.uni-mainz.de,OU=StartCom Verified Certificate Member,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE,description=371190-Ew4GnZ0vEX42MdIg</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHDjCCBfagAwIBAgICV0wwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAklM
-MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRh
-bCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAy
-IFByaW1hcnkgSW50ZXJtZWRpYXRlIFNlcnZlciBDQTAeFw0xMTAzMDMwNTMzMTJa
-Fw0xMzAzMDMwNDI1MzZaMIH8MSAwHgYDVQQNExczNzExOTAtRXc0R25aMHZFWDQy
-TWRJZzELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwG
-A1UEBxMFTWFpbnoxLjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJz
-aXRhZXQgTWFpbnoxLTArBgNVBAsTJFN0YXJ0Q29tIFZlcmlmaWVkIENlcnRpZmlj
-YXRlIE1lbWJlcjEaMBgGA1UEAxMRc2hpYi51bmktbWFpbnouZGUxJjAkBgkqhkiG
-9w0BCQEWF2hvc3RtYXN0ZXJAdW5pLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwT6NQ2xVNwXxTBD5fEZi7uABESzHPpP6tPNN6qQugmAE
-O/3PvRBlvkbicadY8vBaYG8GAjYtJseraGCanqeOF/jilZ2TgUk9OeQWVu7iufAg
-TfqSKzo4CF9myFqpPDL5DYYKHZVEf1BoIACb5LZGohOOPLxw7P6KJY5K0HOQhzPu
-TXgnc7F1pMk+H13jTCwp+rfIbDGKjevt7OQL2DUXgZbsw/BGDXhOPNhzchEZl7ce
-nTuICyx6B4z9ePHySWSnYAFHQ99n2n3n1RGvfMeQcko0lRw60ycHqKSY0Z7nysaP
-Ou9pV6oXwIeRDv0kiEBZN4OwzL9Q3Caz74NTyaUdzwIDAQABo4IDBjCCAwIwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQ11hAN/JzswSGhR2joEoU4cKAEGjAfBgNVHSMEGDAWgBQR
-2yNF/VTManFvhIoD1773AS8mhjAqBgNVHREEIzAhghFzaGliLnVuaS1tYWluei5k
-ZYIMdW5pLW1haW56LmRlMIIBQgYDVR0gBIIBOTCCATUwggExBgsrBgEEAYG1NwEC
-AjCCASAwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVy
-bWVkaWF0ZS5wZGYwgbcGCCsGAQUFBwICMIGqMBQWDVN0YXJ0Q29tIEx0ZC4wAwIB
-ARqBkUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgc2VjdGlvbiAqTGVnYWwgTGltaXRh
-dGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBQ
-b2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwYQYDVR0fBFowWDAqoCigJoYkaHR0cDovL3d3dy5zdGFydHNzbC5jb20v
-Y3J0Mi1jcmwuY3JsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQy
-LWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9v
-Y3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL3NlcnZlci9jYTBCBggrBgEFBQcw
-AoY2aHR0cDovL3d3dy5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMi5zZXJ2
-ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN
-BgkqhkiG9w0BAQUFAAOCAQEAvROhgKCSARf5XxMlFrgqM2L8z+6vpxcyBbk2VP0b
-l6fyoweBJ3hVMEHjsnLvc13xdjl4UybWHBgJrF6QGonJUSzR01Zrnae5j00zAy7j
-SKv2IgmRNoLWdLk6/lwB8J0Ai7kHSlHcsrTWyTdlppwEF3yfBNQ4rsR0yPXp/oMw
-Um0W47uYkn4rKhRCDyc7YLF11u/uIN3+QZ7cjWWGJFtt4Mv9yVRLsIuQCoJn8Kgq
-YbXDotXT6u9xaXNvmcNBQxG11AO5Bg1E29EUgLPoRVe6QODiXHRm7m10xsnXJB2J
-qId+gUq0/6Lm0AWZGW+NOUQvMbxX9CMLbiTcBe3s6xGqhQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Johannes Gutenberg Universität Mainz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Mainz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-mainz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Glatzer</SurName>
-    <EmailAddress>glatzert@uni-mainz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.urz.uni-halle.de.xml b/swamid-interfederations-2.0/shib.urz.uni-halle.de.xml
deleted file mode 100644
index 6179ace6..00000000
--- a/swamid-interfederations-2.0/shib.urz.uni-halle.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.urz.uni-halle.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-halle.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
-A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
-HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
-WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
-ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
-ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
-cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
-LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
-xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
-nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
-GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
-Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
-UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
-HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
-MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
-ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
-iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
-w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
-N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
-6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
-F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
-A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
-HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
-WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
-ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
-ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
-cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
-LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
-xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
-nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
-GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
-Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
-UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
-HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
-MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
-ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
-iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
-w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
-N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
-6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
-F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.urz.uni-halle.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.urz.uni-halle.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.urz.uni-halle.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.urz.uni-halle.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-halle.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
-A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
-HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
-WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
-ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
-ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
-cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
-LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
-xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
-nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
-GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
-Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
-UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
-HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
-MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
-ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
-iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
-w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
-N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
-6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
-F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
-A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
-HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
-WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
-ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
-ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
-cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
-LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
-xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
-nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
-GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
-Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
-UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
-HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
-MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
-ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
-iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
-w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
-N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
-6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
-F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universitäts- und Landesbibliothek Sachsen-Anhalt</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universitäts- und Landesbibliothek Sachsen-Anhalt</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://bibliothek.uni-halle.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Schaarschmidt</SurName>
-    <EmailAddress>michael.schaarschmidt@urz.uni-halle.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Armin</GivenName>
-    <SurName>Angelus</SurName>
-    <EmailAddress>armin.angelus@bibliothek.uni-halle.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml b/swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml
deleted file mode 100644
index 2ab839d2..00000000
--- a/swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb-idp.hs-weingarten.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-weingarten.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
-BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
-cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
-gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
-BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
-Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
-iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
-p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
-5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
-lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
-Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
-2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
-8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
-GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
-Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
-CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
-I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
-GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
-IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
-H3lgjwLUApbZq/qieYKqmBs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
-BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
-cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
-gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
-BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
-Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
-iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
-p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
-5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
-lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
-Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
-2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
-8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
-GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
-Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
-CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
-I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
-GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
-IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
-H3lgjwLUApbZq/qieYKqmBs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-idp.hs-weingarten.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.hs-weingarten.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb-idp.hs-weingarten.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.hs-weingarten.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-weingarten.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
-BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
-cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
-gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
-BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
-Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
-iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
-p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
-5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
-lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
-Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
-2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
-8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
-GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
-Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
-CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
-I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
-GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
-IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
-H3lgjwLUApbZq/qieYKqmBs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
-BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
-cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
-gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
-BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
-Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
-iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
-p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
-5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
-lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
-Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
-2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
-8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
-GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
-Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
-CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
-I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
-GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
-IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
-H3lgjwLUApbZq/qieYKqmBs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Ravensburg-Weingarten</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Ravensburg-Weingarten</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-weingarten.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michaiela</GivenName>
-    <SurName>Erdoes</SurName>
-    <EmailAddress>erdoes@hs-weingarten.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Michaiela</GivenName>
-    <SurName>Erdoes</SurName>
-    <EmailAddress>erdoes@hs-weingarten.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.zalf.de.xml b/swamid-interfederations-2.0/shibb.zalf.de.xml
deleted file mode 100644
index 5d23668b..00000000
--- a/swamid-interfederations-2.0/shibb.zalf.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.zalf.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">zalf.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb.zalf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
-MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
-cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
-9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
-NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
-BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
-cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
-aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
-y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
-ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
-GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
-KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
-pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
-TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
-Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
-ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
-Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
-Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
-FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
-y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
-hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb.zalf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
-MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
-cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
-9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
-NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
-BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
-cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
-aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
-y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
-ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
-GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
-KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
-pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
-TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
-Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
-ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
-Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
-Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
-FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
-y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
-hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.zalf.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.zalf.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.zalf.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.zalf.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.zalf.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">zalf.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb.zalf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
-MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
-cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
-9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
-NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
-BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
-cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
-aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
-y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
-ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
-GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
-KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
-pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
-TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
-Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
-ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
-Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
-Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
-FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
-y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
-hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb.zalf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
-MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
-cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
-9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
-NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
-BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
-cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
-aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
-y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
-ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
-GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
-KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
-pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
-TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
-Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
-ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
-Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
-Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
-FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
-y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
-hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.zalf.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.zalf.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Leibniz-Zentrum für Agrarlandschaftsforschung (ZALF) e. V. Müncheberg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ZALF Müncheberg IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.zalf.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gunar</GivenName>
-    <SurName>Maiwald</SurName>
-    <EmailAddress>maiwald@zib.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gunar</GivenName>
-    <SurName>Maiwald</SurName>
-    <EmailAddress>maiwald@zib.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.tul.cz.xml b/swamid-interfederations-2.0/shibbo.tul.cz.xml
new file mode 100644
index 00000000..34d5e7d5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbo.tul.cz.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibbo.tul.cz/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">tul.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Technical University of Liberec</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Technická univerzita v Liberci</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Technical University of Liberec.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Technickou univerzitu v Liberci.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.tul.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.tul.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://liane.tul.cz/img/znak-tul.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                        MIIEcjCCA1qgAwIBAgIRAPfZ5zaSWEpw8Vc1xSSxyNgwDQYJKoZIhvcNAQEFBQAw
+                        NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                        IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaME8xCzAJBgNV
+                        BAYTAkNaMSgwJgYDVQQKEx9UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBMaWJlcmVj
+                        MRYwFAYDVQQDEw1zaGliYm8udHVsLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+                        MIIBCgKCAQEArstKIJXSamcd4N0fzyZ0ViFYVCJBZZU3QKmQ25NZq6Cfrw8kH75E
+                        SioySW1H4kSzTKLze7qTOLmVYpZyq68emuK+d2vf2wm9TPLYbjC+LVJKrPiRtRHF
+                        7cCi2k5ONwENq7jnIvpq0Z+V30sC0/WfXESnjsB51/PklOa04YMwpUQDqQHsWl/8
+                        pG9fQ5G9OtzWUiYYHPbyNe3zZa1O9uUKpATKNuwtx49+b/VdNKW2voHieVG0beyE
+                        b59FR/Io4gVRevLxo2B/tkBaa8SmuTfCwyqSkkv59sywUObnN3KYmVUb8Fpmbx4X
+                        c1BJHi2wC6IqbTxWKS+e4FkqW3Snc0xNNwIDAQABo4IBYDCCAVwwHwYDVR0jBBgw
+                        FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNxZp6dM+6sOb4hhs74b
+                        sMtnL5OTMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+                        CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
+                        A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+                        U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+                        dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+                        dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXNoaWJiby50dWwu
+                        Y3owDQYJKoZIhvcNAQEFBQADggEBAKfiwyXiInmGSgBMFTEGwFsaE0opLkvDEiSp
+                        +C4namIgpNTRIb7rsp1R+C8NgQaykoQTNdMgUJO94lF8VESOdfoYjkEYZi9KWs1U
+                        9+wtdJxx0FY2NKhx2mgvF/FgTbNdUEEqW+5byWxTLXycTYe5ZIgbHgRcOupU9NKs
+                        dfl8zJKwqtOjOIm2fKE3Z8xULMvw8D6rV7dWuVFios3P4sBfkt0S5uK15mlX5lDI
+                        vZBzEWQ1L9C1GELPPMS56JYfObgJxGzcNZu+s6lXOINBoROYT/5p2mhI5xWeZWJZ
+                        zOSaicB9fW0hVsTwGJDw4hwESk9eLj3tlpyvWSYXvbf1Y06t8rw=
+                   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.tul.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.tul.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.tul.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">tul.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+			MIIEcjCCA1qgAwIBAgIRAPfZ5zaSWEpw8Vc1xSSxyNgwDQYJKoZIhvcNAQEFBQAw
+			NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+			IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaME8xCzAJBgNV
+			BAYTAkNaMSgwJgYDVQQKEx9UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBMaWJlcmVj
+			MRYwFAYDVQQDEw1zaGliYm8udHVsLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+			MIIBCgKCAQEArstKIJXSamcd4N0fzyZ0ViFYVCJBZZU3QKmQ25NZq6Cfrw8kH75E
+			SioySW1H4kSzTKLze7qTOLmVYpZyq68emuK+d2vf2wm9TPLYbjC+LVJKrPiRtRHF
+			7cCi2k5ONwENq7jnIvpq0Z+V30sC0/WfXESnjsB51/PklOa04YMwpUQDqQHsWl/8
+			pG9fQ5G9OtzWUiYYHPbyNe3zZa1O9uUKpATKNuwtx49+b/VdNKW2voHieVG0beyE
+			b59FR/Io4gVRevLxo2B/tkBaa8SmuTfCwyqSkkv59sywUObnN3KYmVUb8Fpmbx4X
+			c1BJHi2wC6IqbTxWKS+e4FkqW3Snc0xNNwIDAQABo4IBYDCCAVwwHwYDVR0jBBgw
+			FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNxZp6dM+6sOb4hhs74b
+			sMtnL5OTMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+			CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
+			A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+			U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+			dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+			dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXNoaWJiby50dWwu
+			Y3owDQYJKoZIhvcNAQEFBQADggEBAKfiwyXiInmGSgBMFTEGwFsaE0opLkvDEiSp
+			+C4namIgpNTRIb7rsp1R+C8NgQaykoQTNdMgUJO94lF8VESOdfoYjkEYZi9KWs1U
+			9+wtdJxx0FY2NKhx2mgvF/FgTbNdUEEqW+5byWxTLXycTYe5ZIgbHgRcOupU9NKs
+			dfl8zJKwqtOjOIm2fKE3Z8xULMvw8D6rV7dWuVFios3P4sBfkt0S5uK15mlX5lDI
+			vZBzEWQ1L9C1GELPPMS56JYfObgJxGzcNZu+s6lXOINBoROYT/5p2mhI5xWeZWJZ
+			zOSaicB9fW0hVsTwGJDw4hwESk9eLj3tlpyvWSYXvbf1Y06t8rw=
+		   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.tul.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Technical University of Liberec</OrganizationName>
+    <OrganizationName xml:lang="cs">Technická univerzita v Liberci</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Technical University of Liberec</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Technická univerzita v Liberci</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.tul.cz/en</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.tul.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Adamec</SurName>
+    <EmailAddress>Petr.Adamec@tul.cz</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>David</GivenName>
+    <SurName>Kmoch</SurName>
+    <EmailAddress>David.Kmoch@tul.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml
new file mode 100644
index 00000000..0d11db03
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-goettingen.de/uni/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-14T07:54:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-goettingen.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Georg-August Universität Göttingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Georg-August University Göttingen</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Georg-August Universität Göttingen</mdui:Description>
+        <mdui:Description xml:lang="en">Georg-August University Göttingen</mdui:Description>
+        <mdui:Logo height="16" width="19">https://www.uni-goettingen.de/favicon.ico</mdui:Logo>
+        <mdui:Logo height="98" width="126">https://www.uni-goettingen.de/img/logo_druck.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-goettingen.de/de/1.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-goettingen.de/en/1.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.uni-goettingen.de/de/439479.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-goettingen.de/en/439479.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIHFsFJ1dRdXDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMzEyMDYxMzA4MjJaFw0xODEyMDUx
+MzA4MjJaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
+Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBZ
+1OPMNEPXK3m+Fo/FSCLwFY3yO0z270+cVVBR5fUKo1ILjp8ld4nlE9BT0TMBfhTw
+7nROt+pAwQXLe9ZRqbh47buHIocQg9PgyJJG1yonKA6Ky5k0KdLVZCE35VIBMpQS
+gylMz+tpilb+NwhZyQTyWvZpRmOu6u7EDRjitGIH13RED5EBhHoG6LKFFmERO0Lg
+MgyaRHg47tVqTgSUiWBgkWdwtqVH6j4Gup1AGchqpBgUyQHuh+g523JzhLm4cSa2
+7X30lp78F9sNe/5Gb5GVf0on5JVT2YP7PrZzNY8RvADa6O4bb9MtTe74DLZc+rJ9
+1HE4a7eSW/2NWgK35PcCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
+rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
+A1UdDgQWBBTt87wJCJ0tW5+z5pFNPtvUYBI9VDAfBgNVHSMEGDAWgBQdvXPMbe5u
+HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
+dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEABsYOw/YjA5Qjy9q/hQKd7PH2
+rBUOOm8nXgYQtpiaT/7TNh7BlzTdsOB0JG7PDDbCNRXF86wQbAxOIeOMyXqftshe
+DqIRf+Xb60hvaIaYqAMxh8kdxu/8gE+/TF9H6CkE0LfYSu4+kL6Dyhnd7w+VOrER
+qY8OEpZ4JVvTqpHlOru3Tdfv9pz4KSRYTYZGwbWNV1iWVq9BKFAkSP/Q/iLW/i/k
+WFJTijAznidb48+PMeD8Tv5/du0BxZ3Uj6R7U1kPYWCedfe8oCSKDleEdl8sZOiD
+ZqKg90b07Xm5lz6+K4FLbuFWY4y2/J74aWn+e9ZcMs7K3fKl80fS4db7wOldgQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-goettingen.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIHFsFJ1dRdXDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMzEyMDYxMzA4MjJaFw0xODEyMDUx
+MzA4MjJaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
+Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBZ
+1OPMNEPXK3m+Fo/FSCLwFY3yO0z270+cVVBR5fUKo1ILjp8ld4nlE9BT0TMBfhTw
+7nROt+pAwQXLe9ZRqbh47buHIocQg9PgyJJG1yonKA6Ky5k0KdLVZCE35VIBMpQS
+gylMz+tpilb+NwhZyQTyWvZpRmOu6u7EDRjitGIH13RED5EBhHoG6LKFFmERO0Lg
+MgyaRHg47tVqTgSUiWBgkWdwtqVH6j4Gup1AGchqpBgUyQHuh+g523JzhLm4cSa2
+7X30lp78F9sNe/5Gb5GVf0on5JVT2YP7PrZzNY8RvADa6O4bb9MtTe74DLZc+rJ9
+1HE4a7eSW/2NWgK35PcCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
+rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
+A1UdDgQWBBTt87wJCJ0tW5+z5pFNPtvUYBI9VDAfBgNVHSMEGDAWgBQdvXPMbe5u
+HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
+dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEABsYOw/YjA5Qjy9q/hQKd7PH2
+rBUOOm8nXgYQtpiaT/7TNh7BlzTdsOB0JG7PDDbCNRXF86wQbAxOIeOMyXqftshe
+DqIRf+Xb60hvaIaYqAMxh8kdxu/8gE+/TF9H6CkE0LfYSu4+kL6Dyhnd7w+VOrER
+qY8OEpZ4JVvTqpHlOru3Tdfv9pz4KSRYTYZGwbWNV1iWVq9BKFAkSP/Q/iLW/i/k
+WFJTijAznidb48+PMeD8Tv5/du0BxZ3Uj6R7U1kPYWCedfe8oCSKDleEdl8sZOiD
+ZqKg90b07Xm5lz6+K4FLbuFWY4y2/J74aWn+e9ZcMs7K3fKl80fS4db7wOldgQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e281</OrganizationName>
+    <OrganizationName xml:lang="en">e281</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Georg-August-Universität Göttingen</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Georg-August-Universität Göttingen</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-goettingen.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-goettingen.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Daniel</GivenName>
+    <SurName>Adler</SurName>
+    <EmailAddress>mailto:dadler1@gwdg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Christof</GivenName>
+    <SurName>Pohl</SurName>
+    <EmailAddress>mailto:cpohl@gwdg.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml
deleted file mode 100644
index 96161de5..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-wuerzburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuerzburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">klinik.uni-wuerzburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hfm-wuerzburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
-IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
-BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
-LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
-jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
-4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
-0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
-FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
-MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
-NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
-BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
-qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
-VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
-2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
-Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
-O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
-fiTDOOsi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
-IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
-BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
-LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
-jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
-4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
-0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
-FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
-MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
-NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
-BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
-qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
-VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
-2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
-Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
-O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
-fiTDOOsi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.uni-wuerzburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-wuerzburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-wuerzburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuerzburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">klinik.uni-wuerzburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hfm-wuerzburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
-IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
-BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
-LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
-jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
-4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
-0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
-FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
-MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
-NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
-BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
-qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
-VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
-2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
-Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
-O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
-fiTDOOsi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
-IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
-BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
-LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
-jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
-4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
-0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
-FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
-MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
-NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
-BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
-qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
-VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
-2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
-Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
-O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
-fiTDOOsi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Würzburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Würzburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-wuerzburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Matthias</GivenName>
-    <SurName>Funken</SurName>
-    <EmailAddress>matthias.funken@uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Maria</GivenName>
-    <SurName>Warren</SurName>
-    <EmailAddress>maria.warren@uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml b/swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml
deleted file mode 100644
index e5e6cc27..00000000
--- a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.amdigital.co.uk/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.amdigital.co.uk</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.amdigital.co.uk</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFTCCAf2gAwIBAgIJAPe6QSEcGRk8MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGnNoaWJib2xldGguYW1kaWdpdGFsLmNvLnVrMB4XDTExMDMwMzEyMDIxMloX
-DTE2MDMwMTEyMDIxMlowJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5hbWRpZ2l0YWwu
-Y28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4pvlbjpzFVWoX
-CwMEQs/lKAB5fRNdIbeCLqumBjdVeh/rNVWHsLdOltDuaLlfRT+OXYI3962tezKO
-gPJb0WhuUEoT5My92nyceHU1tUtZTtRxrXh7NbNxNasmBpXxhWxdxPkQpvt7tza8
-bcoXX7Y1V8AFdoOoOA+CE05mimoqPf+76JuW6PTpF083fPMyf34EyYwWiVcGNfTJ
-IaNdAd23Q3hxpm2P3WhFI3y/jWK74jziP0a9r6Wp/HRIvcyFfLlaqlFaOvr7v0SR
-Gk6kuMF2sXrfj9OMd7m6+5v9CRdiX56nYYHdD1jhf/5zsNXMDvMTY1fNtosEIomm
-BaGnnwIHAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJib2xldGguYW1kaWdpdGFs
-LmNvLnVrMB0GA1UdDgQWBBRSfPmrYGKQQdVWbnmrysdcv1KtpzANBgkqhkiG9w0B
-AQUFAAOCAQEAYalolZpZEQk9zTCR503YHoxf901rRBqF39GBt59Gw/pDKhop+ktm
-i0aYmIJP60NATkKYluvUtQBKSb11FaSil6QZuzcz5q1aVPfyW1jMgK2C3R0f43mD
-pl8gfZGBXF6Sm96KGuXrT89+bWuzndflDLCaHltTmwg7UFM0uGYhfO49TVENLU9O
-9O3zn5BmDgPO6E7zlnLLkLd3HYV5mf8JmQmupCsuHeL8Ip1twZbbuixEVrXSOEV/
-iw65O0mJIhVzUnl2rQ+/7GiB0A3wZpvGu8EVEgjJGT6wye3l8D8lN11NNGCs76CC
-lM5VbBovDN5R8HI4KUo2eMInLDUUf5p0oQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Adam Matthew Digital</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Adam Matthew Digital</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.amdigital.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Mills</SurName>
-    <EmailAddress>dave.mills@trueclarity.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rhys</GivenName>
-    <SurName>Godfrey</SurName>
-    <EmailAddress>rhys.godfrey@trueclarity.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cancom.de.xml b/swamid-interfederations-2.0/shibboleth.cancom.de.xml
deleted file mode 100644
index b987ba71..00000000
--- a/swamid-interfederations-2.0/shibboleth.cancom.de.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cancom.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.cancom.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.cancom.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.cancom.de,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)11,OU=GT43331679,O=shibboleth.cancom.de,C=DE,serialNumber=F4dXwt5ugAu7e7Ltux5s8bM/j7lNMezn</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgICSoEwDQYJKoZIhvcNAQEFBQAwPDELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDkdlb1RydXN0LCBJbmMuMRQwEgYDVQQDEwtSYXBpZFNTTCBDQTAe
-Fw0xMTAxMDkxNDQ0NDhaFw0xMzAxMTEyMzI1MDZaMIHvMSkwJwYDVQQFEyBGNGRY
-d3Q1dWdBdTdlN0x0dXg1czhiTS9qN2xOTWV6bjELMAkGA1UEBhMCREUxHTAbBgNV
-BAoTFHNoaWJib2xldGguY2FuY29tLmRlMRMwEQYDVQQLEwpHVDQzMzMxNjc5MTEw
-LwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNvbS9yZXNvdXJjZXMvY3BzIChjKTEx
-MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQgLSBSYXBpZFNTTChS
-KTEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jYW5jb20uZGUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDVmUFYIEL9UJy4KuViBxD0czaGIe0/NPBHBslPike2
-kEnkayjIDKq9VKM2qmTVWud2Zz7lDicCbZe7CQ8bcPYSV0I8temTV2qZRXKIfYa7
-JXSdwLPlN8hgBRAXlrKnlvyeVLfohPq5/dW5sXmK5DJsAU5vIG7y2uT24MRJfN3U
-39iP2B2zy7uo/q5aCutrIphnhHGjFv3ZiIS4UNHUA+rj4mjPVWxc7p7wko0XteQg
-9qmH/Ec+hIBdRWNaMwgjkvlsrHwaMpXm0d4WZZ9Alo0OeEN9LgGGSZzkrLJlEXgz
-CGOVxgWuZV/w1CD7QkxB0Mb2yFzdyYP1slEGDLbJhvopAgMBAAGjggEyMIIBLjAf
-BgNVHSMEGDAWgBRraT1qGEJK3Y8CZTn9NSSGeJEWMDAOBgNVHQ8BAf8EBAMCBaAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdEQQYMBaCFHNoaWJi
-b2xldGguY2FuY29tLmRlMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNz
-bC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBQq
-xzB+sSIJfDxj6RHC/lXqvkg/fDAMBgNVHRMBAf8EAjAAMEkGCCsGAQUFBwEBBD0w
-OzA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5nZW90cnVzdC5jb20v
-cmFwaWRzc2wuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAGgTC+pETyFmjT3Kt/wx7q
-QGUGWbqaWCmzYgStsEnDxWyZbUc6rMq7W6TVFSkahKYtBMTo3FWRRwp2htzOGeET
-1oUft7RiLAA3wVoT9u+rqICDerohrptv1eL9hcgzfxb61b71KfRqmWjgFHijQSY8
-1NAzSDDSCHpGtc3ezlDSKDOkNEob6gyKqCIcl07/FSvJ5RdYg//Eot6KgHHL/bNZ
-eJur9jqTlpTnC3jbRKS5CFQyW1A7nuO5qS7754LYipej85P3/KBgK8/YkOotHxyY
-vWiel2Ikzc/M5wNfxh5dHOxvy/vi09ktSrrgoS10Z/x8Q+ulyBYGJpcmPO0FkSHZ
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Cancom Deutschland GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Cancom Deutschland GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.cancom.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Florian</GivenName>
-    <SurName>Schneider</SurName>
-    <EmailAddress>florian.schneider@cancom.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Felicia</GivenName>
-    <SurName>Henkel</SurName>
-    <EmailAddress>felicia.henkel@cancom.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml b/swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml
deleted file mode 100644
index 23dfa436..00000000
--- a/swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.chadwyck.co.uk/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.chadwyck.co.uk</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.chadwyck.co.uk,O=ProQuest Information and Learning Limited,L=Cambridge,ST=Cambridgeshire,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEnDCCA4SgAwIBAgILAQAAAAABI/DCPAcwDQYJKoZIhvcNAQEFBQAwajEjMCEG
-A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-b24gQ0EwHhcNMDkwOTI1MDk1MzE5WhcNMTIxMTAxMTYwOTE4WjCBkjELMAkGA1UE
-BhMCR0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHEwlDYW1icmlk
-Z2UxMjAwBgNVBAoTKVByb1F1ZXN0IEluZm9ybWF0aW9uIGFuZCBMZWFybmluZyBM
-aW1pdGVkMSIwIAYDVQQDExlzaGliYm9sZXRoLmNoYWR3eWNrLmNvLnVrMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtW217damatpxJwqauGW5Kqa1WDMDOA0KA
-34xyHCTvdM2+0aAVUcS4ZZMKhLPvthg1P//KKf4dtx1vGEzooP8+hWuXzI9UuWKI
-4Dl/D1f1u5/VAEED3bxUwRz/8AzoaBq8oY0tNNL0c6zgoXN39J6PhWlttj+x6zW5
-6xh+/H4S/QIDAQABo4IBnDCCAZgwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCP
-xFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJl
-Lmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKg
-MIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNy
-bDAdBgNVHQ4EFgQUbat6c5ScZ0QrN02tC56CBvLjMbQwCQYDVR0TBAIwADAOBgNV
-HQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEE
-AYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0
-dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEB
-BAQDAgbAMCQGA1UdEQQdMBuCGXNoaWJib2xldGguY2hhZHd5Y2suY28udWswDQYJ
-KoZIhvcNAQEFBQADggEBAABjzNx5LCTEC4PYuXKnKZQvNE7uujnj2Sm1VOVGm9eW
-hEYcsrr9vtShzV6CsgJmmJkKgLHsjlpnEWbW6SqOcrcaqESaoyQhlPO3CfhpE6RG
-aJ2SKVCnwlMbSkFcBU1BbsONU2Ts8FATa/6gHoE4l7Z4mrBW+9Ix2W3jUdaRx/fS
-4lkh5B3buICF0471+lSgz3v6cca7pSlKlA1B9daQ23E+BraI0Z8gQvfT/S+b3/rA
-5K5Piut1UOW9DuIOjBakK2CUlogDfkVmz5kU3neUise6ZyG8wcqedXMN5sS39KDw
-YiDXJy2+KavxQS92ILmKrMPa97JkJOw5tLLqojVxJbM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.chadwyck.co.uk</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.chadwyck.co.uk,O=ProQuest Information and Learning Limited,L=Cambridge,ST=Cambridgeshire,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEnDCCA4SgAwIBAgILAQAAAAABI/DCPAcwDQYJKoZIhvcNAQEFBQAwajEjMCEG
-A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-b24gQ0EwHhcNMDkwOTI1MDk1MzE5WhcNMTIxMTAxMTYwOTE4WjCBkjELMAkGA1UE
-BhMCR0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHEwlDYW1icmlk
-Z2UxMjAwBgNVBAoTKVByb1F1ZXN0IEluZm9ybWF0aW9uIGFuZCBMZWFybmluZyBM
-aW1pdGVkMSIwIAYDVQQDExlzaGliYm9sZXRoLmNoYWR3eWNrLmNvLnVrMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtW217damatpxJwqauGW5Kqa1WDMDOA0KA
-34xyHCTvdM2+0aAVUcS4ZZMKhLPvthg1P//KKf4dtx1vGEzooP8+hWuXzI9UuWKI
-4Dl/D1f1u5/VAEED3bxUwRz/8AzoaBq8oY0tNNL0c6zgoXN39J6PhWlttj+x6zW5
-6xh+/H4S/QIDAQABo4IBnDCCAZgwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCP
-xFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJl
-Lmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKg
-MIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNy
-bDAdBgNVHQ4EFgQUbat6c5ScZ0QrN02tC56CBvLjMbQwCQYDVR0TBAIwADAOBgNV
-HQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEE
-AYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0
-dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEB
-BAQDAgbAMCQGA1UdEQQdMBuCGXNoaWJib2xldGguY2hhZHd5Y2suY28udWswDQYJ
-KoZIhvcNAQEFBQADggEBAABjzNx5LCTEC4PYuXKnKZQvNE7uujnj2Sm1VOVGm9eW
-hEYcsrr9vtShzV6CsgJmmJkKgLHsjlpnEWbW6SqOcrcaqESaoyQhlPO3CfhpE6RG
-aJ2SKVCnwlMbSkFcBU1BbsONU2Ts8FATa/6gHoE4l7Z4mrBW+9Ix2W3jUdaRx/fS
-4lkh5B3buICF0471+lSgz3v6cca7pSlKlA1B9daQ23E+BraI0Z8gQvfT/S+b3/rA
-5K5Piut1UOW9DuIOjBakK2CUlogDfkVmz5kU3neUise6ZyG8wcqedXMN5sS39KDw
-YiDXJy2+KavxQS92ILmKrMPa97JkJOw5tLLqojVxJbM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.chadwyck.co.uk/Shibboleth.sso/SAML/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">ProQuest (Chadwyck-Healey products)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest-Chadwyck-Healey</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.proquest.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Geoff</GivenName>
-    <SurName>Leach</SurName>
-    <EmailAddress>Geoff.Leach@proquest.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml b/swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml
deleted file mode 100644
index 09261975..00000000
--- a/swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.dhbw-karlsruhe.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.dhbw-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.dhbw-karlsruhe.de,OU=Karlsruhe,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE9TCCA92gAwIBAgIEEQNdOzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTEwMTExNzEzNTkwN1oXDTE1MTExNjEzNTkwN1owdjELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMRIwEAYDVQQLEwlLYXJsc3J1aGUxJTAjBgNVBAMTHHNoaWJib2xldGguZGhi
-dy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDi
-bF3wklsaOy0bg22LMdxn5qsZ2ykDtZqE0JF1Koi4w42VG1tjQDfHpA9FFwo/EVuS
-qeCe09b0f2Daqkjz1UcFSufMrcHEHZZN2xBG+88UMW7MMmCZeD3GuL7wNJvoFnM9
-mp0xPe3x4POopLdGBiWZXhTe789BCSTChcUmTuTyFiV90b14CA0wI8A32JhiM3Hh
-/eRzRRL4z6tP19+WwJ2Le0nJkokz3Gp4TxbYmPiDHdXQIMlZ1f0D8YKoVNjh5bSw
-y9Cst6Zyzm61sR/HMFUZzsAO70ymJumM2/uMPGfwybJyGy6J6MwIWwL8uN7Pdxin
-+l+W7S8ozHzpRrroqi1zAgMBAAGjggGNMIIBiTAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFATy
-Qy4DajG8sx8vyoNHrIskLklzMB8GA1UdIwQYMBaAFIzpcHFguFOfRMaXXkIf7Shy
-vQ5+MHkGA1UdHwRyMHAwNqA0oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhi
-dy1jYS9wdWIvY3JsL2NhY3JsLmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9kaGJ3LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCB
-hDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQUFAAOCAQEAb6Y5E9ZGeli/tZBJHc1HRWNbQWpx8DBNJ9tOJ2CIpHW2Fci29twp
-G+4b6V0FxDTIBHAamNuKUAjdDIov05YhaXXfU8NidA5M+/xVioaaY/ADTw7aRaJr
-8UHCLmQSaQFel6vpi82f+R7Fdoel+zxnbwCan31UZHz2XGFDCFlvLDs3/uk3fl1L
-GkKHPe3CKWcwuRJsv+6Jymhro91stI74bGpG5AcITFUevHNdueicbV+JndJ/IHjh
-MvpGWuUj2tdg9zVz+YS34mANNt4zIg5lh+VHgwzprbNutQhEwiq56rhKz+mRd8jO
-AmXQxl/y0E3UsR/P+8lLMune9mRyoKhKCw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.dhbw-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.dhbw-karlsruhe.de,OU=Karlsruhe,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE9TCCA92gAwIBAgIEEQNdOzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTEwMTExNzEzNTkwN1oXDTE1MTExNjEzNTkwN1owdjELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMRIwEAYDVQQLEwlLYXJsc3J1aGUxJTAjBgNVBAMTHHNoaWJib2xldGguZGhi
-dy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDi
-bF3wklsaOy0bg22LMdxn5qsZ2ykDtZqE0JF1Koi4w42VG1tjQDfHpA9FFwo/EVuS
-qeCe09b0f2Daqkjz1UcFSufMrcHEHZZN2xBG+88UMW7MMmCZeD3GuL7wNJvoFnM9
-mp0xPe3x4POopLdGBiWZXhTe789BCSTChcUmTuTyFiV90b14CA0wI8A32JhiM3Hh
-/eRzRRL4z6tP19+WwJ2Le0nJkokz3Gp4TxbYmPiDHdXQIMlZ1f0D8YKoVNjh5bSw
-y9Cst6Zyzm61sR/HMFUZzsAO70ymJumM2/uMPGfwybJyGy6J6MwIWwL8uN7Pdxin
-+l+W7S8ozHzpRrroqi1zAgMBAAGjggGNMIIBiTAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFATy
-Qy4DajG8sx8vyoNHrIskLklzMB8GA1UdIwQYMBaAFIzpcHFguFOfRMaXXkIf7Shy
-vQ5+MHkGA1UdHwRyMHAwNqA0oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhi
-dy1jYS9wdWIvY3JsL2NhY3JsLmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9kaGJ3LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCB
-hDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQUFAAOCAQEAb6Y5E9ZGeli/tZBJHc1HRWNbQWpx8DBNJ9tOJ2CIpHW2Fci29twp
-G+4b6V0FxDTIBHAamNuKUAjdDIov05YhaXXfU8NidA5M+/xVioaaY/ADTw7aRaJr
-8UHCLmQSaQFel6vpi82f+R7Fdoel+zxnbwCan31UZHz2XGFDCFlvLDs3/uk3fl1L
-GkKHPe3CKWcwuRJsv+6Jymhro91stI74bGpG5AcITFUevHNdueicbV+JndJ/IHjh
-MvpGWuUj2tdg9zVz+YS34mANNt4zIg5lh+VHgwzprbNutQhEwiq56rhKz+mRd8jO
-AmXQxl/y0E3UsR/P+8lLMune9mRyoKhKCw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DHBW Karlsruhe</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW Karlsruhe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-karlsruhe.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Johannes</GivenName>
-    <SurName>Mickel</SurName>
-    <EmailAddress>mickel@dhbw-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
deleted file mode 100644
index ad755d60..00000000
--- a/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.ebscohost.com">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.ebscohost.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.ebscohost.com,OU=shibboleth1.epnet.com,O=EBSCO Industries\, Inc.,L=Ipswich,ST=Massachusetts,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFIDCCBAigAwIBAgIQRKwcchAJVesvRaoyM06LijANBgkqhkiG9w0BAQUFADCB
-vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-DTExMDQwMTAwMDAwMFoXDTEzMDQwMzIzNTk1OVowgZsxCzAJBgNVBAYTAlVTMRYw
-FAYDVQQIEw1NYXNzYWNodXNldHRzMRAwDgYDVQQHFAdJcHN3aWNoMR8wHQYDVQQK
-FBZFQlNDTyBJbmR1c3RyaWVzLCBJbmMuMR4wHAYDVQQLFBVzaGliYm9sZXRoMS5l
-cG5ldC5jb20xITAfBgNVBAMUGHNoaWJib2xldGguZWJzY29ob3N0LmNvbTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApyJV+9wzY6I+kklwGc4bazyFGsxaAMbe
-n7lPDbCJ/5z3vjmB+gKJUSxovSvIunEc/8EwQ1XgC90Kwqcaxp+0bd3E3krXSgYk
-TxoXRk64ZALF6L0g7SpwikCDWjJ3Y31L83mxjAKHgemkGrjNKXptCaU2ONa6+52M
-KBoceXisJLsCAwEAAaOCAb8wggG7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEEG
-A1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9TVlJJbnRsLUczLWNybC52ZXJpc2lnbi5j
-b20vU1ZSSW50bEczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
-KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwNAYDVR0lBC0w
-KwYJYIZIAYb4QgQBBgorBgEEAYI3CgMDBggrBgEFBQcDAQYIKwYBBQUHAwIwcgYI
-KwYBBQUHAQEEZjBkMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5j
-b20wPAYIKwYBBQUHMAKGMGh0dHA6Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5j
-b20vU1ZSSW50bEczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFn
-ZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRw
-Oi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQAD
-ggEBAHBZHUV04SvJMdlt3Md5jc9X633k6wg9RULrZeai6odViYrmfmol8lh7I/Dd
-accxn2szmnhp0lKXaFNU33MOT/nnXGpe2dP4KD2dg7xW/ONf7/8UX5oKMcy9oxhu
-Iu+gIVKBbG6VnAO5ctHTE1w/wE7gw8Wvxkl+4Fysfd59fKzlhiaU9TGcTeroEUVd
-FKbURinepOdF2m0WyzcVLXFTLkyf9hu2Xv4A7zSC/vkWnpOT8K2+8dvh15S8n0mH
-fSXsKNn8tLSR10gYyD0sXGUYr03Upnjnkg69p4O//GRwf04NEV/NehxL2tvgjbO/
-WFUQmFDppVjUgYkCed/yDImwZoE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.ebscohost.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.ebscohost.com,OU=shibboleth1.epnet.com,O=EBSCO Industries\, Inc.,L=Ipswich,ST=Massachusetts,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFIDCCBAigAwIBAgIQRKwcchAJVesvRaoyM06LijANBgkqhkiG9w0BAQUFADCB
-vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-DTExMDQwMTAwMDAwMFoXDTEzMDQwMzIzNTk1OVowgZsxCzAJBgNVBAYTAlVTMRYw
-FAYDVQQIEw1NYXNzYWNodXNldHRzMRAwDgYDVQQHFAdJcHN3aWNoMR8wHQYDVQQK
-FBZFQlNDTyBJbmR1c3RyaWVzLCBJbmMuMR4wHAYDVQQLFBVzaGliYm9sZXRoMS5l
-cG5ldC5jb20xITAfBgNVBAMUGHNoaWJib2xldGguZWJzY29ob3N0LmNvbTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApyJV+9wzY6I+kklwGc4bazyFGsxaAMbe
-n7lPDbCJ/5z3vjmB+gKJUSxovSvIunEc/8EwQ1XgC90Kwqcaxp+0bd3E3krXSgYk
-TxoXRk64ZALF6L0g7SpwikCDWjJ3Y31L83mxjAKHgemkGrjNKXptCaU2ONa6+52M
-KBoceXisJLsCAwEAAaOCAb8wggG7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEEG
-A1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9TVlJJbnRsLUczLWNybC52ZXJpc2lnbi5j
-b20vU1ZSSW50bEczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
-KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwNAYDVR0lBC0w
-KwYJYIZIAYb4QgQBBgorBgEEAYI3CgMDBggrBgEFBQcDAQYIKwYBBQUHAwIwcgYI
-KwYBBQUHAQEEZjBkMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5j
-b20wPAYIKwYBBQUHMAKGMGh0dHA6Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5j
-b20vU1ZSSW50bEczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFn
-ZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRw
-Oi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQAD
-ggEBAHBZHUV04SvJMdlt3Md5jc9X633k6wg9RULrZeai6odViYrmfmol8lh7I/Dd
-accxn2szmnhp0lKXaFNU33MOT/nnXGpe2dP4KD2dg7xW/ONf7/8UX5oKMcy9oxhu
-Iu+gIVKBbG6VnAO5ctHTE1w/wE7gw8Wvxkl+4Fysfd59fKzlhiaU9TGcTeroEUVd
-FKbURinepOdF2m0WyzcVLXFTLkyf9hu2Xv4A7zSC/vkWnpOT8K2+8dvh15S8n0mH
-fSXsKNn8tLSR10gYyD0sXGUYr03Upnjnkg69p4O//GRwf04NEV/NehxL2tvgjbO/
-WFUQmFDppVjUgYkCed/yDImwZoE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/ECP" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">EBSCO Publishing</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">EBSCO Information Services/EBSCO Publishing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ebscohost.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>EBSCO</GivenName>
-    <SurName>Shiboleth Admin</SurName>
-    <EmailAddress>shib-admin@ebscohost.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>EBSCO</GivenName>
-    <SurName>Shibboleth Tech</SurName>
-    <EmailAddress>shib-tech@ebscohost.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
new file mode 100644
index 00000000..acc8dee3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ens-lyon.fr/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-04-16T15:12:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENS de Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ENS de Lyon</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ENS de Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">ENS de Lyon</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
+f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
+tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
+I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
+p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
+WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
+3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
+Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
+oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
+bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
+y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
+3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIErTCCA5WgAwIBAgIQAc1kf8uRsFb9YRhj0YQqJDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDMzMTAwMDAwMFoXDTEzMDMzMDIzNTk1OVowaTELMAkGA1UE
+BhMCRlIxDTALBgNVBAcTBExZT04xKjAoBgNVBAoMIUVjb2xlIE5vcm1hbGUgU3Vw
+w6lyaWV1cmUgZGUgTHlvbjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnMtbHlvbi5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKenkDAt0aFrCHDigqfe
+9zDCD+c5VFDvhbYPy0c5jKhLutpo49R3uevQGTC48JIqfDr/IVLSAM+BM0KuEovL
+UqLZZuW45RzlR+YGPW+R3fEpE9MmGZz7rltu2vXfxI1AZzqvhhPXCdi2RlEjEwxJ
+WymfgA8mrlyUp1VQtfgehz+LgRzleFaLcr2ww+WCc7dMxvDU5UfF+SHytfhD/BO6
+3FyT/3e3vnE/AKIMe+y1QMLUo0Cue5O4JU1IJCKd4PDpBTu4b6m/l5HC/70Hn2nq
+jrTWYxsveAMWPzak5SKTo/G7fbxAv+WRYevbYlG+WapfX5KZKyciUyN9i8VExa7f
+9pMCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBRTG1iE/xCeq/67td3H7iphPqf+9TAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYD
+VR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
+Y3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRh
+MF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+U1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9y
+ZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVucy1seW9uLmZyghdzaGliYm9sZXRo
+Mi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUFAAOCAQEAEtXgiiMCGQYfpPMbvytv
+o+cBxF7dHcT61DzS3/imZullXG+G8mZnqe1TNmsZBtHGz+e47bGom36aUKr37wb9
+kg7IMpveQaCyPaLPAihxCVGbdhe9n5tWeLO0dele784H1aLMiuGaKyBdOe9rXIRe
+Mgk6C5960tO3GzQa8tW5g5XaWrej2rTTEqRXozsF5yHlYuCobK4XtOdFV9M3Kesg
+0dAqsxZPP+iVUAFIjRmeJ6ZToAUO+RqrMBtwPYHz94DO8mcQwpBnPKdtvaQ0G8HQ
+rt9C3/DEh4crgo2UidNYNF9GUEwE0pqVNFIDAGfDBJGpX7aHN28jcPyRufZUiszz
+NA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ens-lyon.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
+f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
+tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
+I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
+p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
+WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
+3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
+Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
+oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
+bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
+y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
+3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIErTCCA5WgAwIBAgIQAc1kf8uRsFb9YRhj0YQqJDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDMzMTAwMDAwMFoXDTEzMDMzMDIzNTk1OVowaTELMAkGA1UE
+BhMCRlIxDTALBgNVBAcTBExZT04xKjAoBgNVBAoMIUVjb2xlIE5vcm1hbGUgU3Vw
+w6lyaWV1cmUgZGUgTHlvbjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnMtbHlvbi5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKenkDAt0aFrCHDigqfe
+9zDCD+c5VFDvhbYPy0c5jKhLutpo49R3uevQGTC48JIqfDr/IVLSAM+BM0KuEovL
+UqLZZuW45RzlR+YGPW+R3fEpE9MmGZz7rltu2vXfxI1AZzqvhhPXCdi2RlEjEwxJ
+WymfgA8mrlyUp1VQtfgehz+LgRzleFaLcr2ww+WCc7dMxvDU5UfF+SHytfhD/BO6
+3FyT/3e3vnE/AKIMe+y1QMLUo0Cue5O4JU1IJCKd4PDpBTu4b6m/l5HC/70Hn2nq
+jrTWYxsveAMWPzak5SKTo/G7fbxAv+WRYevbYlG+WapfX5KZKyciUyN9i8VExa7f
+9pMCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBRTG1iE/xCeq/67td3H7iphPqf+9TAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYD
+VR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
+Y3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRh
+MF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+U1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9y
+ZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVucy1seW9uLmZyghdzaGliYm9sZXRo
+Mi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUFAAOCAQEAEtXgiiMCGQYfpPMbvytv
+o+cBxF7dHcT61DzS3/imZullXG+G8mZnqe1TNmsZBtHGz+e47bGom36aUKr37wb9
+kg7IMpveQaCyPaLPAihxCVGbdhe9n5tWeLO0dele784H1aLMiuGaKyBdOe9rXIRe
+Mgk6C5960tO3GzQa8tW5g5XaWrej2rTTEqRXozsF5yHlYuCobK4XtOdFV9M3Kesg
+0dAqsxZPP+iVUAFIjRmeJ6ZToAUO+RqrMBtwPYHz94DO8mcQwpBnPKdtvaQ0G8HQ
+rt9C3/DEh4crgo2UidNYNF9GUEwE0pqVNFIDAGfDBJGpX7aHN28jcPyRufZUiszz
+NA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Ecole Normale Supérieure de Lyon</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Ecole Normale Supérieure de Lyon</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Hugo Etievant</SurName>
+    <EmailAddress>hugo.etievant@ens-lyon.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Sébastien Mei</SurName>
+    <EmailAddress>Sebastien.Mei@ens-lyon.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fiz-technik.de.xml b/swamid-interfederations-2.0/shibboleth.fiz-technik.de.xml
deleted file mode 100644
index 82eeab9d..00000000
--- a/swamid-interfederations-2.0/shibboleth.fiz-technik.de.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.fiz-technik.de/tecfinder">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.fiz-technik.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.fiz-technik.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=shibboleth.fiz-technik.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDrzCCAxigAwIBAgIQSmJiEIhvAft2pfFj8ep6UjANBgkqhkiG9w0BAQUFADCB
-xDELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
-Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
-CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhh
-d3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
-ZS5jb20wHhcNMTAwMzMwMDAwMDAwWhcNMTMwMzI5MjM1OTU5WjCBxDEiMCAGA1UE
-ChQZc2hpYmJvbGV0aC5maXotdGVjaG5pay5kZTE7MDkGA1UECxMyR28gdG8gaHR0
-cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0b3J5L2luZGV4Lmh0bWwxIjAgBgNV
-BAsTGVRoYXd0ZSBTU0wxMjMgY2VydGlmaWNhdGUxGTAXBgNVBAsTEERvbWFpbiBW
-YWxpZGF0ZWQxIjAgBgNVBAMUGXNoaWJib2xldGguZml6LXRlY2huaWsuZGUwgZ8w
-DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDklec3g2ICvi2qW/wtqnW1YA1/2eHu
-Rs01+aEMcb/ccljjbl+dW8klZgZA5Srisz+GTDwxBrf6zVFeS57LpIyXAEjnDUOW
-bK3430IyzI1iK4NYwRm94Ay587U18Hz+U3poxj2QVYND0O2lAK8YzqbzkTIoZk9U
-eXQq6xRhLYxnAgMBAAGjgZ8wgZwwDAYDVR0TAQH/BAIwADA5BgNVHR8EMjAwMC6g
-LKAqhihodHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlU2VydmVyQ0EuY3JsMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYI
-KwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQAD
-gYEAKmlKgA3lVXhrOw8B2DENHdsXW2UHbwb1YMhGiD4vGETlqOPdcr/yxwGQ7y2M
-u4E6h4nwnIbf7iGw/N/d27RRpELP8RISHDmEyjanUsI5jjF69+dsqU6zbVVJtBDe
-3gXxVMmLZ3gV/u4BtQX3+4qsQe0cZG/sMW0sp5wU+8K9Yq0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.fiz-technik.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.fiz-technik.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=shibboleth.fiz-technik.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDrzCCAxigAwIBAgIQSmJiEIhvAft2pfFj8ep6UjANBgkqhkiG9w0BAQUFADCB
-xDELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
-Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
-CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhh
-d3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
-ZS5jb20wHhcNMTAwMzMwMDAwMDAwWhcNMTMwMzI5MjM1OTU5WjCBxDEiMCAGA1UE
-ChQZc2hpYmJvbGV0aC5maXotdGVjaG5pay5kZTE7MDkGA1UECxMyR28gdG8gaHR0
-cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0b3J5L2luZGV4Lmh0bWwxIjAgBgNV
-BAsTGVRoYXd0ZSBTU0wxMjMgY2VydGlmaWNhdGUxGTAXBgNVBAsTEERvbWFpbiBW
-YWxpZGF0ZWQxIjAgBgNVBAMUGXNoaWJib2xldGguZml6LXRlY2huaWsuZGUwgZ8w
-DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDklec3g2ICvi2qW/wtqnW1YA1/2eHu
-Rs01+aEMcb/ccljjbl+dW8klZgZA5Srisz+GTDwxBrf6zVFeS57LpIyXAEjnDUOW
-bK3430IyzI1iK4NYwRm94Ay587U18Hz+U3poxj2QVYND0O2lAK8YzqbzkTIoZk9U
-eXQq6xRhLYxnAgMBAAGjgZ8wgZwwDAYDVR0TAQH/BAIwADA5BgNVHR8EMjAwMC6g
-LKAqhihodHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlU2VydmVyQ0EuY3JsMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYI
-KwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQAD
-gYEAKmlKgA3lVXhrOw8B2DENHdsXW2UHbwb1YMhGiD4vGETlqOPdcr/yxwGQ7y2M
-u4E6h4nwnIbf7iGw/N/d27RRpELP8RISHDmEyjanUsI5jjF69+dsqU6zbVVJtBDe
-3gXxVMmLZ3gV/u4BtQX3+4qsQe0cZG/sMW0sp5wU+8K9Yq0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">WTI-Frankfurt eG</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">WTI-Frankfurt</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.wti-frankfurt.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christian</GivenName>
-    <SurName>Seger</SurName>
-    <EmailAddress>christian.seger@wti-frankfurt.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.genios.de.xml b/swamid-interfederations-2.0/shibboleth.genios.de.xml
deleted file mode 100644
index 5410dcd2..00000000
--- a/swamid-interfederations-2.0/shibboleth.genios.de.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.genios.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.genios.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.genios.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.genios.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIEDwkukjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTEwMjkxNTEzMDdaFw0xNDEw
-MjgxNTEzMDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRzaGliYm9sZXRoLmdlbmlvcy5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANs1k1RNyLZJd5PM2XgPBeq3
-LYXgP6DfmAFbFQuoIDANZneVnjLsHs/DqlqDV8pxzVKaOePrtVG9XDqiwAQNMxkX
-Fs/yiGQgcpsOu/Hn55MJDPgVs8gJlo72twjlfsMYkysxeKpo02HcPk94v3G+DGqu
-paM0Qatil5bFGtPFnbiPcEHWhL5IHeMmOQgtgPRmcCdegUoiUQy3XzNe2/AlebQq
-3jY5/j+139Gt4l6NdFBVtrClC3No9TYQzud5/AZqK6c8C/OdoZS5JqGTCjxuFr52
-HFIgUquO+NnvX3l+/KHEX3BpJn8G3QSxTK29N/ZOyvBnZZERc6wLjlHsPfRKfDEC
-AwEAAaOCAeAwggHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUAsSAuxpb2YDdSV9WArYEb5tR
-2ZwwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIgYDVR0RBBswGYEX
-bWljaGFlbC5rbGVua0BnZW5pb3MuZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9j
-YWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNl
-cnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCBmjBL
-BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAFoCZY0R/3oytr3alxrwA6Tr+Kbo
-QakMblJoTygM6U+JA5+aKbSiQ5Kdyhw77ax2pmwN7BQYTLyL23S69C5/hFIg5BBk
-dbaIxxixf+Y7Nt+GZQL1WoUDikRs+KPRJqBOh0AVbYLnEUsOgEWWC7e/WnarH/lK
-taXlY6gtmP9FoUgn96U6tw1KOTXaGnA0DX3DBVhzMMQubgeecEAPey8wuIc1CpZP
-HjFM51epuXN3Tgw25hDokzI31dxNFAi+N8DjC3EHLWGPj8ac+m0pJ/7c4BMKU0H5
-bgLvAdbf7U7Z4IidrTae8SmJ385S0oLvO/NOheaRinhBZbSPkkXxniZaDAU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.genios.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.genios.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIEDwkukjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTEwMjkxNTEzMDdaFw0xNDEw
-MjgxNTEzMDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRzaGliYm9sZXRoLmdlbmlvcy5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANs1k1RNyLZJd5PM2XgPBeq3
-LYXgP6DfmAFbFQuoIDANZneVnjLsHs/DqlqDV8pxzVKaOePrtVG9XDqiwAQNMxkX
-Fs/yiGQgcpsOu/Hn55MJDPgVs8gJlo72twjlfsMYkysxeKpo02HcPk94v3G+DGqu
-paM0Qatil5bFGtPFnbiPcEHWhL5IHeMmOQgtgPRmcCdegUoiUQy3XzNe2/AlebQq
-3jY5/j+139Gt4l6NdFBVtrClC3No9TYQzud5/AZqK6c8C/OdoZS5JqGTCjxuFr52
-HFIgUquO+NnvX3l+/KHEX3BpJn8G3QSxTK29N/ZOyvBnZZERc6wLjlHsPfRKfDEC
-AwEAAaOCAeAwggHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUAsSAuxpb2YDdSV9WArYEb5tR
-2ZwwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIgYDVR0RBBswGYEX
-bWljaGFlbC5rbGVua0BnZW5pb3MuZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9j
-YWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNl
-cnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCBmjBL
-BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAFoCZY0R/3oytr3alxrwA6Tr+Kbo
-QakMblJoTygM6U+JA5+aKbSiQ5Kdyhw77ax2pmwN7BQYTLyL23S69C5/hFIg5BBk
-dbaIxxixf+Y7Nt+GZQL1WoUDikRs+KPRJqBOh0AVbYLnEUsOgEWWC7e/WnarH/lK
-taXlY6gtmP9FoUgn96U6tw1KOTXaGnA0DX3DBVhzMMQubgeecEAPey8wuIc1CpZP
-HjFM51epuXN3Tgw25hDokzI31dxNFAi+N8DjC3EHLWGPj8ac+m0pJ/7c4BMKU0H5
-bgLvAdbf7U7Z4IidrTae8SmJ385S0oLvO/NOheaRinhBZbSPkkXxniZaDAU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">GBI-Genios Deutsche Wirtschaftsdatenbanken GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">GBI-Genios Deutsche Wirtschaftsdatenbanken GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.genios.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Klenk</SurName>
-    <EmailAddress>michael.klenk@genios.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.globaldata.com.xml b/swamid-interfederations-2.0/shibboleth.globaldata.com.xml
deleted file mode 100644
index c650e116..00000000
--- a/swamid-interfederations-2.0/shibboleth.globaldata.com.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.globaldata.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ded096.maximumasp.local</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ded096.maximumasp.local</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAItPz9n2+PuaMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB4XDTExMTEyODEwMTQxMFoXDTE2
-MTEyNjEwMTQxMFowIjEgMB4GA1UEAxMXZGVkMDk2Lm1heGltdW1hc3AubG9jYWww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwNeNpZKlWDp7GciyA162g
-VSy3uTRG2BT48mp/oB4Wh7DqNbPHx8PrWJrN0xw+c1o1OarYuaWK24H9F1n3ZI8g
-i/czA4Zi2JsIZmWksu5jYVgZQQnMyVCrA1fB4tjz2GTnrmy7HTt7axMAHlUyupDw
-gh/YcaJ84U1JssiLeSypkHeSyLv/Cew5HI6kARv99/oVSBR7kfOAUPg+fP8kjvlK
-dn6RShLwkY+9KQCK9lY6aaJHrNtRDfSQVZsZgfLwzK+HCGspWHFp7KirfdTBcCkR
-w+berqH4RmOPbcv4TxGva/XEefM9Ikw8FD1Yb7Hcum6avHcD/s02jYzvISUr56FT
-AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB0G
-A1UdDgQWBBQsoQCuifh3Q5K7lzut09/s9A3G8jANBgkqhkiG9w0BAQUFAAOCAQEA
-DyvSdKPdXmbCft4A6Bwqpw0Y1hMuyme8wOskJpQIJ7WXhdyCB3eOYz1dGcmFkeQU
-aUJS6x9ZPLkRVX0e8Eoa/w1rYam5Zi3Fv0ZjLLKA7EFkX4aNzeE8vU0y/XZ9amRf
-fIZ/Tse7wvCJTHWNrw0eoTy2xNnPRWhLALF8nNaR66S5Usesosv0fKqpK20nrjmF
-wtHuAhh4Jbh6mZZemqKOgcxs9JX5qTsO96plS+Rb2iH2oMP0PrqzjwvHyFAPv8gb
-Rt8vBK4vYP16FHxWHw9TNnlQ93w4ozWNtnUHOrvoXghavIUg7MTOIQZ5awgMKr8U
-KRmv+oFXiBHlwyDVz3wIPg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ded096.maximumasp.local</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ded096.maximumasp.local</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAItPz9n2+PuaMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB4XDTExMTEyODEwMTQxMFoXDTE2
-MTEyNjEwMTQxMFowIjEgMB4GA1UEAxMXZGVkMDk2Lm1heGltdW1hc3AubG9jYWww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwNeNpZKlWDp7GciyA162g
-VSy3uTRG2BT48mp/oB4Wh7DqNbPHx8PrWJrN0xw+c1o1OarYuaWK24H9F1n3ZI8g
-i/czA4Zi2JsIZmWksu5jYVgZQQnMyVCrA1fB4tjz2GTnrmy7HTt7axMAHlUyupDw
-gh/YcaJ84U1JssiLeSypkHeSyLv/Cew5HI6kARv99/oVSBR7kfOAUPg+fP8kjvlK
-dn6RShLwkY+9KQCK9lY6aaJHrNtRDfSQVZsZgfLwzK+HCGspWHFp7KirfdTBcCkR
-w+berqH4RmOPbcv4TxGva/XEefM9Ikw8FD1Yb7Hcum6avHcD/s02jYzvISUr56FT
-AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB0G
-A1UdDgQWBBQsoQCuifh3Q5K7lzut09/s9A3G8jANBgkqhkiG9w0BAQUFAAOCAQEA
-DyvSdKPdXmbCft4A6Bwqpw0Y1hMuyme8wOskJpQIJ7WXhdyCB3eOYz1dGcmFkeQU
-aUJS6x9ZPLkRVX0e8Eoa/w1rYam5Zi3Fv0ZjLLKA7EFkX4aNzeE8vU0y/XZ9amRf
-fIZ/Tse7wvCJTHWNrw0eoTy2xNnPRWhLALF8nNaR66S5Usesosv0fKqpK20nrjmF
-wtHuAhh4Jbh6mZZemqKOgcxs9JX5qTsO96plS+Rb2iH2oMP0PrqzjwvHyFAPv8gb
-Rt8vBK4vYP16FHxWHw9TNnlQ93w4ozWNtnUHOrvoXghavIUg7MTOIQZ5awgMKr8U
-KRmv+oFXiBHlwyDVz3wIPg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Global Data</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">GBI, Global Data</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.globaldata.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Anand</GivenName>
-    <SurName>Perumandla</SurName>
-    <EmailAddress>aperumandla@globaldata.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jeevan</GivenName>
-    <SurName>Pinnireddy</SurName>
-    <EmailAddress>jpinnireddy@globaldata.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org.xml b/swamid-interfederations-2.0/shibboleth.highwire.org.xml
deleted file mode 100644
index b7611a80..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/rupjnls">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Rockefeller University Press Journals</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Rockefeller University Press Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rupress.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml b/swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml
deleted file mode 100644
index 628362ab..00000000
--- a/swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.illumina.csa.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.illumina.csa.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.illumina.csa.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDRjCCAi6gAwIBAgIBADANBgkqhkiG9w0BAQQFADAmMSQwIgYDVQQDExtzaGli
-Ym9sZXRoLmlsbHVtaW5hLmNzYS5jb20wHhcNMTAwNTE5MjA1NTE2WhcNMTMwNTE4
-MjA1NTE2WjAmMSQwIgYDVQQDExtzaGliYm9sZXRoLmlsbHVtaW5hLmNzYS5jb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSXNMiD0tcy3DrBiAGbZmK
-9vfubnuz4AfNTZshRNQJHKnMPjc++Vd0AhLEnJzFwTtgvlZ5dIprOgAxC+mfB5N5
-c4WsxrqNNcmtJMKaEi46MsGLj+/s2vxf07MJjZUzJ1Taeni2kXYswuNLO+X6FRfU
-kPWF4uDTrKDDHQQfWmogQxTbkPO8BV9fgNJZZ8hazk08kAD2ubQr5ZXgV8Z8EpUH
-QLConXjH3v7+d4j0qSQP8EBLJPnut6gGe3P0GPbr6Mioep+qnxXlGzkDhaD7hiDr
-P0euqmoHclU7G28Xfy1Ro93UrpW1F8Sm2jwqIp8XjGE63CxohX9lrbbXnUJe9Bfn
-AgMBAAGjfzB9MB0GA1UdDgQWBBRbM2JLRKrIxQ3LLJPMQZszQa2LEDBOBgNVHSME
-RzBFgBRbM2JLRKrIxQ3LLJPMQZszQa2LEKEqpCgwJjEkMCIGA1UEAxMbc2hpYmJv
-bGV0aC5pbGx1bWluYS5jc2EuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-AQEEBQADggEBAHdPTDYH53OU25SkOCWT/WoBBCv+UErTxBu5aKmoRcw2SASgQVBL
-6hup5Etfwg7LHhWpKscIRQk+rPTGW1DM/RHeSUleTD1qzhgW2w+rdI+dMyOD2Ho7
-xqX9hSJYnHmhzqgjuri5rQ8dYKUuqbrs5ryqlAb7VZP8jY0QWawdO9m5F5+gOAZC
-46X+hGwdKaTBWWV/3RX3StgDIs1GjPZ5RudiKI/76iIbqroz0hBKJh18Gy+eVv2h
-+bN3hVsSEn9WcOz75uP90Q/lg8LuZqBZKCFrEGHSsYbGtk5IiumElnoPAqp19gH1
-4i6fOm/9CSJLtMAZAAvBOqeMquAe94I5tdc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.illumina.csa.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.illumina.csa.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDRjCCAi6gAwIBAgIBADANBgkqhkiG9w0BAQQFADAmMSQwIgYDVQQDExtzaGli
-Ym9sZXRoLmlsbHVtaW5hLmNzYS5jb20wHhcNMTAwNTE5MjA1NTE2WhcNMTMwNTE4
-MjA1NTE2WjAmMSQwIgYDVQQDExtzaGliYm9sZXRoLmlsbHVtaW5hLmNzYS5jb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSXNMiD0tcy3DrBiAGbZmK
-9vfubnuz4AfNTZshRNQJHKnMPjc++Vd0AhLEnJzFwTtgvlZ5dIprOgAxC+mfB5N5
-c4WsxrqNNcmtJMKaEi46MsGLj+/s2vxf07MJjZUzJ1Taeni2kXYswuNLO+X6FRfU
-kPWF4uDTrKDDHQQfWmogQxTbkPO8BV9fgNJZZ8hazk08kAD2ubQr5ZXgV8Z8EpUH
-QLConXjH3v7+d4j0qSQP8EBLJPnut6gGe3P0GPbr6Mioep+qnxXlGzkDhaD7hiDr
-P0euqmoHclU7G28Xfy1Ro93UrpW1F8Sm2jwqIp8XjGE63CxohX9lrbbXnUJe9Bfn
-AgMBAAGjfzB9MB0GA1UdDgQWBBRbM2JLRKrIxQ3LLJPMQZszQa2LEDBOBgNVHSME
-RzBFgBRbM2JLRKrIxQ3LLJPMQZszQa2LEKEqpCgwJjEkMCIGA1UEAxMbc2hpYmJv
-bGV0aC5pbGx1bWluYS5jc2EuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-AQEEBQADggEBAHdPTDYH53OU25SkOCWT/WoBBCv+UErTxBu5aKmoRcw2SASgQVBL
-6hup5Etfwg7LHhWpKscIRQk+rPTGW1DM/RHeSUleTD1qzhgW2w+rdI+dMyOD2Ho7
-xqX9hSJYnHmhzqgjuri5rQ8dYKUuqbrs5ryqlAb7VZP8jY0QWawdO9m5F5+gOAZC
-46X+hGwdKaTBWWV/3RX3StgDIs1GjPZ5RudiKI/76iIbqroz0hBKJh18Gy+eVv2h
-+bN3hVsSEn9WcOz75uP90Q/lg8LuZqBZKCFrEGHSsYbGtk5IiumElnoPAqp19gH1
-4i6fOm/9CSJLtMAZAAvBOqeMquAe94I5tdc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">ProQuest</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest-CSA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Host</GivenName>
-    <SurName>Master</SurName>
-    <EmailAddress>hostmaster@csa.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Host</GivenName>
-    <SurName>Master</SurName>
-    <EmailAddress>hostmaster@csa.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.metapress.com.xml b/swamid-interfederations-2.0/shibboleth.metapress.com.xml
deleted file mode 100644
index 37e9cc29..00000000
--- a/swamid-interfederations-2.0/shibboleth.metapress.com.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.metapress.com/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.metapress.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.metapress.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=MetaPress,O=EBSCO Industries\, Inc.,L=Birmingham,ST=Alabama,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzjCCBLagAwIBAgIQSxVYxfBDm07E/ewzv9//WDANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMDkwNzA5
-MDAwMDAwWhcNMTIwNzIyMjM1OTU5WjCBujELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FsYWJhbWExEzARBgNVBAcUCkJpcm1pbmdoYW0xHzAdBgNVBAoUFkVCU0NPIElu
-ZHVzdHJpZXMsIEluYy4xEjAQBgNVBAsUCU1ldGFQcmVzczEzMDEGA1UECxQqVGVy
-bXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MRowGAYDVQQD
-FBF3d3cubWV0YXByZXNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANAPC4w32D0Op8alyIxfONpWuIFeLGCyXnaeOcOErbgnoHopdbWWUo8wjiEU
-U29vhIMwF3u+j61N8/dqZYxxA4quICrzNXBun2pOmjeTXAR+tXgJVWuYnPhnMSuV
-vmE3U7lX1ZvwP2FkHE8H2ZyPunsl6RDeJ54x7rKSKdp9OkidT0+O0UySDrgLuqZ8
-SF1x9OexB5iptj8mYfj2Jzq/ReHh/HX3ID5JdJMOv2eQ+SEiNjmCYLm+PMPsGioV
-dNpkx9/pY7VL+n33wC6LqttYHIt1f9IWIvyCpfJwdWEhtehjFIdF3v//x7yO1oWd
-WhHH8w1ri2vXtMex3owFT5QFeAcCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzIt
-Y3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5Bgtg
-hkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5j
-b20vcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-gBSl7wsRzsBBA6NKZZBIshzgVy19RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
-MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
-L1NWUlNlY3VyZS1HMi1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBu
-BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
-BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
-b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBADuSJ4d+vP3YzNGiidkS
-0pyRxh8xukjDZZoxH1WvC/59Easd5ImEj3S1CK3TRVLMYsqAKLS+ZKw70M3RGjhl
-cdkC+XKBX8owdoJvxCPzGkcVbl4+fbZBFU9Ig+4D0Td66Y8zvF4WNKVfkfCbOhWk
-9S69SYhmpKvPrS17l72FrQl1yr6pBMN43BbjweWaR0r+w6Qous/8p9YRx5bvRGEx
-bbqSHr+ThK+cA+ejsKFih6b7J1/tISSp3UYu3OGRZfW5aYC+zLX/fSzNpEIOoQkD
-1eiD1q3uKUkZ7i5OulGc6iD292VVLCTC5T25o67sGFLUrv3Jaz78uE35egIBTMFu
-IBA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.metapress.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.metapress.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=MetaPress,O=EBSCO Industries\, Inc.,L=Birmingham,ST=Alabama,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzjCCBLagAwIBAgIQSxVYxfBDm07E/ewzv9//WDANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMDkwNzA5
-MDAwMDAwWhcNMTIwNzIyMjM1OTU5WjCBujELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FsYWJhbWExEzARBgNVBAcUCkJpcm1pbmdoYW0xHzAdBgNVBAoUFkVCU0NPIElu
-ZHVzdHJpZXMsIEluYy4xEjAQBgNVBAsUCU1ldGFQcmVzczEzMDEGA1UECxQqVGVy
-bXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MRowGAYDVQQD
-FBF3d3cubWV0YXByZXNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANAPC4w32D0Op8alyIxfONpWuIFeLGCyXnaeOcOErbgnoHopdbWWUo8wjiEU
-U29vhIMwF3u+j61N8/dqZYxxA4quICrzNXBun2pOmjeTXAR+tXgJVWuYnPhnMSuV
-vmE3U7lX1ZvwP2FkHE8H2ZyPunsl6RDeJ54x7rKSKdp9OkidT0+O0UySDrgLuqZ8
-SF1x9OexB5iptj8mYfj2Jzq/ReHh/HX3ID5JdJMOv2eQ+SEiNjmCYLm+PMPsGioV
-dNpkx9/pY7VL+n33wC6LqttYHIt1f9IWIvyCpfJwdWEhtehjFIdF3v//x7yO1oWd
-WhHH8w1ri2vXtMex3owFT5QFeAcCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzIt
-Y3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5Bgtg
-hkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5j
-b20vcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-gBSl7wsRzsBBA6NKZZBIshzgVy19RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
-MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
-L1NWUlNlY3VyZS1HMi1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBu
-BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
-BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
-b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBADuSJ4d+vP3YzNGiidkS
-0pyRxh8xukjDZZoxH1WvC/59Easd5ImEj3S1CK3TRVLMYsqAKLS+ZKw70M3RGjhl
-cdkC+XKBX8owdoJvxCPzGkcVbl4+fbZBFU9Ig+4D0Td66Y8zvF4WNKVfkfCbOhWk
-9S69SYhmpKvPrS17l72FrQl1yr6pBMN43BbjweWaR0r+w6Qous/8p9YRx5bvRGEx
-bbqSHr+ThK+cA+ejsKFih6b7J1/tISSp3UYu3OGRZfW5aYC+zLX/fSzNpEIOoQkD
-1eiD1q3uKUkZ7i5OulGc6iD292VVLCTC5T25o67sGFLUrv3Jaz78uE35egIBTMFu
-IBA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Metapress</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">MetaPress</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.metapress.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Tiffany</GivenName>
-    <SurName>Rich</SurName>
-    <EmailAddress>tiffanyrich@metapress.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Casey</GivenName>
-    <SurName>Patterson</SurName>
-    <EmailAddress>metapress@openidp.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mzk.cz.xml b/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
new file mode 100644
index 00000000..a84716cb
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mzk.cz/simplesaml/metadata.xml">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">mzk.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Moravian Library in Brno</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Moravská zemská knihovna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Moravian Library in Brno</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Moravské zemské knihovny</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mzk.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.mzk.cz/</mdui:InformationURL>
+        <mdui:Logo height="68" width="92">https://www2.eduid.cz/idp-loga/mzk.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIJAP7tUyCsoo2RMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejAeFw0xMTA3MjAwNjUyMjFaFw0xNDA3MTkwNjUyMjFaMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3A8vApmQ5m5S+vblZKdVzA7z3ef+3jqE5XfdVX9ehRTuQ1FZfjcooX6G7/Y3cR4ylFBwQSJ1TNm8vX1s8w/sbmuP6t40HLezMiwdj7gDr6HY8roXF2I+UQPxsCM+c0SleOAoZiVNQsWGAi9w0jU8AN+VsmPuRqeAUdkVGFzaiS2lsWPiriP/EOWBxo0i4rc1jE0bwam4/hJEfUub6n+11YmmKFTtieYVRomWmlwuCOMQ30xwXJwrF7p8rMNhKLohBQKU/3BhDZC1U269AAlAa9WVF1hhXjypkzFXdwKA42rGVKl5G17tWwmhv9kTmgZnLtK1KDq1mBYfo9VUOysA8CAwEAAaOB9jCB8zAdBgNVHQ4EFgQUK1gE2KOVHyAUVS5m/2wK40F0ohkwgcMGA1UdIwSBuzCBuIAUK1gE2KOVHyAUVS5m/2wK40F0ohmhgZSkgZEwgY4xCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzENMAsGA1UEBxMEQnJubzEZMBcGA1UEChMQTW9yYXZpYW4gTGlicmFyeTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3oxIDAeBgkqhkiG9w0BCQEWEXNoaWJib2xldGhAbXprLmN6ggkA/u1TIKyijZEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAvkpXj3KlQ+dRxqvw5WX338tepnd070CV0cEIf06e4BBDkdOKsKxwKuY+26/G8kYLdok22GCZPDkpOe0j+IDXWfjy48X65+anIY75jEOZRBIgQkjeNMC9+PkRxV9w7k1qlWsQ8sJVNX9d7npkhA6fNItrWSm79nPRoT6GURgDvRRRddIyPS+RHtQIPe7a/bbWD4Sw7RdqZw0BEWiVEg6odFK1XQ72XYeIxfWvpCqcsLtlb6zCjOH5X31UYPrccoKKUGPs7IMP4NFkCnS28FpCAxRMqOEdwt7iWhedJFr51k+vX6wKGI/AiyHkhHm97+w7OsrwIZfpX4yUDfALdaN10Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIJAP7tUyCsoo2RMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejAeFw0xMTA3MjAwNjUyMjFaFw0xNDA3MTkwNjUyMjFaMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3A8vApmQ5m5S+vblZKdVzA7z3ef+3jqE5XfdVX9ehRTuQ1FZfjcooX6G7/Y3cR4ylFBwQSJ1TNm8vX1s8w/sbmuP6t40HLezMiwdj7gDr6HY8roXF2I+UQPxsCM+c0SleOAoZiVNQsWGAi9w0jU8AN+VsmPuRqeAUdkVGFzaiS2lsWPiriP/EOWBxo0i4rc1jE0bwam4/hJEfUub6n+11YmmKFTtieYVRomWmlwuCOMQ30xwXJwrF7p8rMNhKLohBQKU/3BhDZC1U269AAlAa9WVF1hhXjypkzFXdwKA42rGVKl5G17tWwmhv9kTmgZnLtK1KDq1mBYfo9VUOysA8CAwEAAaOB9jCB8zAdBgNVHQ4EFgQUK1gE2KOVHyAUVS5m/2wK40F0ohkwgcMGA1UdIwSBuzCBuIAUK1gE2KOVHyAUVS5m/2wK40F0ohmhgZSkgZEwgY4xCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzENMAsGA1UEBxMEQnJubzEZMBcGA1UEChMQTW9yYXZpYW4gTGlicmFyeTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3oxIDAeBgkqhkiG9w0BCQEWEXNoaWJib2xldGhAbXprLmN6ggkA/u1TIKyijZEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAvkpXj3KlQ+dRxqvw5WX338tepnd070CV0cEIf06e4BBDkdOKsKxwKuY+26/G8kYLdok22GCZPDkpOe0j+IDXWfjy48X65+anIY75jEOZRBIgQkjeNMC9+PkRxV9w7k1qlWsQ8sJVNX9d7npkhA6fNItrWSm79nPRoT6GURgDvRRRddIyPS+RHtQIPe7a/bbWD4Sw7RdqZw0BEWiVEg6odFK1XQ72XYeIxfWvpCqcsLtlb6zCjOH5X31UYPrccoKKUGPs7IMP4NFkCnS28FpCAxRMqOEdwt7iWhedJFr51k+vX6wKGI/AiyHkhHm97+w7OsrwIZfpX4yUDfALdaN10Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mzk.cz/simplesaml/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Moravian Library</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Moravská zemská knihovna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Moravian Library</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Moravská zemská knihovna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mzk.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.mzk.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>shibboleth@mzk.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ovid.com.xml b/swamid-interfederations-2.0/shibboleth.ovid.com.xml
deleted file mode 100644
index 3af836cb..00000000
--- a/swamid-interfederations-2.0/shibboleth.ovid.com.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ovid.com/entity">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.ovid.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.ovid.com,O=Ovid Technologies\, Inc.,L=Sandy,ST=Utah,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+zCCA+OgAwIBAgIQRcoWrU6+ffPVrfItakXStDANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTEwMzI4
-MDAwMDAwWhcNMTIwMzI3MjM1OTU5WjBsMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-VXRhaDEOMAwGA1UEBxQFU2FuZHkxIDAeBgNVBAoUF092aWQgVGVjaG5vbG9naWVz
-LCBJbmMuMRwwGgYDVQQDFBNzaGliYm9sZXRoLm92aWQuY29tMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQCw1X91LxDWuHGrQUsXVLEVPy1TWAeCq+o9O8b/B7Ak
-xlqPlSpbduanoo5quky+5PhVDcePXzbkzIX6gXV0yKQdkxOqoSTelXQr/kgacWVm
-TouCY1Gq/YyGk4PlMw9CKW4har9gcdN4hX20Ml0CNBqAbKD7laW9/KClj0Nf7rhK
-jwIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwRQYDVR0fBD4w
-PDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1jcmwudmVyaXNpZ24uY29tL1NW
-UlNlY3VyZUczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYB
-BQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYDVR0lBBYwFAYI
-KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPY
-vnmlMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVy
-aXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52
-ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFww
-WjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweL
-IQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkq
-hkiG9w0BAQUFAAOCAQEAnH4QwA1KVFARs7qXwzBUgGs6nZSkuZ5BMmnrpIbjJah3
-U7cEsb30/nhDckRVdHOx/+FWuYs5l4gPZ5VGlNz25yv4Tsy5jxcNZGHHDzGZWAcc
-GQZ+CSGYb5Bi2UUI4pLAK0qo7cDc/WHyYG/hMEUiZs5VbeplJupEXvDnP0GoJRfl
-npDYxsgoGjX6vUYqJCoccRRVot0tJCAm2vLBYk5Vb15XPd8cotb7OceW/wznj79o
-7kQji0SE5U8eJTJvMLcuRqpC2yYLlrVyZHxk6v2xgFs5AsjXR/zBv8+hVukrhIb3
-MLXlHVJRLoeP410NcHfsm1LrhOHl/GJmuXWm+DUIBg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com:8085/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com:8085/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML2/POST" index="7"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Ovid Technologies - A Wolters Kluwer Business</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Ovid</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ovid.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Mark</GivenName>
-    <SurName>Rodrigues</SurName>
-    <EmailAddress>mark.rodrigues@wolterskluwer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Marquiss</SurName>
-    <EmailAddress>john.marquiss@wolterskluwer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Global Online</GivenName>
-    <SurName>Operations</SurName>
-    <EmailAddress>goosandy@ovid.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ufsc.br.xml b/swamid-interfederations-2.0/shibboleth.ufsc.br.xml
deleted file mode 100644
index e3b503b8..00000000
--- a/swamid-interfederations-2.0/shibboleth.ufsc.br.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.ufsc.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufsc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFSC - Universidade Federal de Santa Catarina</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufsc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufsc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIESzCCAzOgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxDELMAkGA1UEBhMCQlIx
-FzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMRYwFAYDVQQHEw1GbG9yaWFub3BvbGlz
-MTYwNAYDVQQKEy1VRlNDIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgU2FudGEg
-Q2F0YXJpbmExLzAtBgNVBAsTJk5QRCAtIE51Y2xlbyBkZSBQcm9jZXNzYW1lbnRv
-IGRlIERhZG9zMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwHhcNMTAwNTAy
-MTUyNTQzWhcNMTMwNTAxMTUyNTQzWjCBxDELMAkGA1UEBhMCQlIxFzAVBgNVBAgT
-DlNhbnRhIENhdGFyaW5hMRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMTYwNAYDVQQK
-Ey1VRlNDIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmEx
-LzAtBgNVBAsTJk5QRCAtIE51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRlIERhZG9z
-MRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/FYsW
-LIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPREI82
-4htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fktVY7
-41kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZPYPm
-/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5kPT/g
-gxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAGjRjBEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsGAQUFBwMBBglghkgBhvhCBAEG
-CisGAQQBgjcKAwMwDQYJKoZIhvcNAQEFBQADggEBABDXKoRWo0mR3SNv98le5NbN
-0QeuL52xlm51qmhWHKCT0ph0AmfDO4LdG/o1oPrtZup34/7BBRKHifuvluknH2DW
-dD9JhriTxsCsw/6Q5UtkQ2ZL40eic2VKk7LKsv8WsVq0Dddfz9aQVAmqnAExKLux
-YY+Hd0263kpDiu/0yEiT4G/3RPhKAmtib08Muc5FPQfIjM/IpF0OydhKYLCPQhtQ
-+0L6xe7VreHsP/n9EoGQ/2hZty+D4k2myZ/ypZH00jSs4+0cVysLZGKbRp481nOn
-utYTuLXJ0VDcCFf3RMwNYDCkW9k160NOZIap3RGIftCo2KR12TlxIE0+McltbGQ=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ufsc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufsc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIESzCCAzOgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxDELMAkGA1UEBhMCQlIx
-FzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMRYwFAYDVQQHEw1GbG9yaWFub3BvbGlz
-MTYwNAYDVQQKEy1VRlNDIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgU2FudGEg
-Q2F0YXJpbmExLzAtBgNVBAsTJk5QRCAtIE51Y2xlbyBkZSBQcm9jZXNzYW1lbnRv
-IGRlIERhZG9zMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwHhcNMTAwNTAy
-MTUyNTQzWhcNMTMwNTAxMTUyNTQzWjCBxDELMAkGA1UEBhMCQlIxFzAVBgNVBAgT
-DlNhbnRhIENhdGFyaW5hMRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMTYwNAYDVQQK
-Ey1VRlNDIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmEx
-LzAtBgNVBAsTJk5QRCAtIE51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRlIERhZG9z
-MRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/FYsW
-LIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPREI82
-4htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fktVY7
-41kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZPYPm
-/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5kPT/g
-gxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAGjRjBEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsGAQUFBwMBBglghkgBhvhCBAEG
-CisGAQQBgjcKAwMwDQYJKoZIhvcNAQEFBQADggEBABDXKoRWo0mR3SNv98le5NbN
-0QeuL52xlm51qmhWHKCT0ph0AmfDO4LdG/o1oPrtZup34/7BBRKHifuvluknH2DW
-dD9JhriTxsCsw/6Q5UtkQ2ZL40eic2VKk7LKsv8WsVq0Dddfz9aQVAmqnAExKLux
-YY+Hd0263kpDiu/0yEiT4G/3RPhKAmtib08Muc5FPQfIjM/IpF0OydhKYLCPQhtQ
-+0L6xe7VreHsP/n9EoGQ/2hZty+D4k2myZ/ypZH00jSs4+0cVysLZGKbRp481nOn
-utYTuLXJ0VDcCFf3RMwNYDCkW9k160NOZIap3RGIftCo2KR12TlxIE0+McltbGQ=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufsc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufsc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcio Clemes</SurName>
-    <EmailAddress>marcio@npd.ufsc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni-bonn.de.xml b/swamid-interfederations-2.0/shibboleth.uni-bonn.de.xml
deleted file mode 100644
index 2b90ed74..00000000
--- a/swamid-interfederations-2.0/shibboleth.uni-bonn.de.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni-bonn.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-bonn.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uni-bonn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-bonn.de,OU=Hochschulrechenzentrum,O=Universitaet Bonn,L=Bonn,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQTCCBSmgAwIBAgIHEunRqyAN0TANBgkqhkiG9w0BAQUFADCBujELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDTALBgNVBAcTBEJv
-bm4xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBCb25uMR8wHQYDVQQLExZIb2Noc2No
-dWxyZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbml2ZXJzaXRhZXQgQm9ubiBDQTEi
-MCAGCSqGSIb3DQEJARYTY2FhZG1pbkB1bmktYm9ubi5kZTAeFw0xMTExMjExMzM3
-MzJaFw0xNjExMTkxMzM3MzJaMIGYMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjENMAsGA1UEBxMEQm9ubjEaMBgGA1UEChMRVW5pdmVy
-c2l0YWV0IEJvbm4xHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xHzAd
-BgNVBAMTFnNoaWJib2xldGgudW5pLWJvbm4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDhmb095e8n0Ntnl+T69lwmLIJOsoR9K2H+queaqzrEoXWx
-X3EEJSb7nIHQ9RuP4kUo8KRkUtYNoKBV/LZC2XH+NKvgnGyYFIu6GKBZFXeYuQMc
-VRTypqEeTJnQ9Vt7N+7c2KojOQ5lB8qtJk5EuAkofgKBgePgVgob7a3SFx+0HnNX
-R6SDOBQQo695NdgDhuUSiS63WRi0Lafec2xjpb+a9Iq5gjhUsP7lhve3fjm7fnky
-IARB6EE8N37htwEFquG1UWFMvPxa0URymi0GZuTH6Fjok6CnR+NWGrK8QufltW9U
-ONE0/KJrNM5f5HxtuBa+n3To/u9VPag4SQirvuQtAgMBAAGjggJqMIICZjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFHqcomCwNt7ndEc81rP8KsSSBdtQMB8GA1UdIwQYMBaAFOs3
-0OvXhC5GnhLTsxjbjeWC5GinMIHJBgNVHREEgcEwgb6BD2J2d0B1bmktYm9ubi5k
-ZYIWc2hpYmJvbGV0aC51bmktYm9ubi5kZYIbc2hpYmJvbGV0aC5yaHJ6LnVuaS1i
-b25uLmRlghxzaGliYm9sZXRoMS5yaHJ6LnVuaS1ib25uLmRlghxzaGliYm9sZXRo
-Mi5yaHJ6LnVuaS1ib25uLmRlghxzaGliYm9sZXRoMy5yaHJ6LnVuaS1ib25uLmRl
-ghxzaGliYm9sZXRoNC5yaHJ6LnVuaS1ib25uLmRlMIGBBgNVHR8EejB4MDqgOKA2
-hjRodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib25uLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDqgOKA2hjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1ib25uLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGcBggrBgEFBQcBAQSBjzCBjDBEBggrBgEFBQcw
-AoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYm9ubi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwRAYIKwYBBQUHMAKGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLWJvbm4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQBpSi0VhhudTolynhedRGNbvHi8uK8HD51pG9Xm1BTlqIMa4VwkrBeU07As
-nsSciEBSiALIhrLayokU/z5EpROSE4HBvHMomjSezpkPQ60bwIABSplmiwCpu5zF
-ArW5cuNFvSdgVKqkElg4Us2uZYcu9s3HdJWB5giU3GbhyReAviQOHO5Dzo+4twbp
-FqDbI6Tj+m4ZOd1u19hcR4TBIvgn7CEk7tSAZfdEQF+nRlYmFyV0LMGCAqksIYC/
-JJvOc54vwjBXXA+3LU5CSoTt7wjLXC2BjLH4OeJL05owk55toOhNNXg1AxMw1Gew
-NHr2AA4aMaB5TQyo2nz1udsI86g4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-bonn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-bonn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni-bonn.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-bonn.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni-bonn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-bonn.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-bonn.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uni-bonn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-bonn.de,OU=Hochschulrechenzentrum,O=Universitaet Bonn,L=Bonn,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQTCCBSmgAwIBAgIHEunRqyAN0TANBgkqhkiG9w0BAQUFADCBujELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDTALBgNVBAcTBEJv
-bm4xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBCb25uMR8wHQYDVQQLExZIb2Noc2No
-dWxyZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbml2ZXJzaXRhZXQgQm9ubiBDQTEi
-MCAGCSqGSIb3DQEJARYTY2FhZG1pbkB1bmktYm9ubi5kZTAeFw0xMTExMjExMzM3
-MzJaFw0xNjExMTkxMzM3MzJaMIGYMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjENMAsGA1UEBxMEQm9ubjEaMBgGA1UEChMRVW5pdmVy
-c2l0YWV0IEJvbm4xHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xHzAd
-BgNVBAMTFnNoaWJib2xldGgudW5pLWJvbm4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDhmb095e8n0Ntnl+T69lwmLIJOsoR9K2H+queaqzrEoXWx
-X3EEJSb7nIHQ9RuP4kUo8KRkUtYNoKBV/LZC2XH+NKvgnGyYFIu6GKBZFXeYuQMc
-VRTypqEeTJnQ9Vt7N+7c2KojOQ5lB8qtJk5EuAkofgKBgePgVgob7a3SFx+0HnNX
-R6SDOBQQo695NdgDhuUSiS63WRi0Lafec2xjpb+a9Iq5gjhUsP7lhve3fjm7fnky
-IARB6EE8N37htwEFquG1UWFMvPxa0URymi0GZuTH6Fjok6CnR+NWGrK8QufltW9U
-ONE0/KJrNM5f5HxtuBa+n3To/u9VPag4SQirvuQtAgMBAAGjggJqMIICZjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFHqcomCwNt7ndEc81rP8KsSSBdtQMB8GA1UdIwQYMBaAFOs3
-0OvXhC5GnhLTsxjbjeWC5GinMIHJBgNVHREEgcEwgb6BD2J2d0B1bmktYm9ubi5k
-ZYIWc2hpYmJvbGV0aC51bmktYm9ubi5kZYIbc2hpYmJvbGV0aC5yaHJ6LnVuaS1i
-b25uLmRlghxzaGliYm9sZXRoMS5yaHJ6LnVuaS1ib25uLmRlghxzaGliYm9sZXRo
-Mi5yaHJ6LnVuaS1ib25uLmRlghxzaGliYm9sZXRoMy5yaHJ6LnVuaS1ib25uLmRl
-ghxzaGliYm9sZXRoNC5yaHJ6LnVuaS1ib25uLmRlMIGBBgNVHR8EejB4MDqgOKA2
-hjRodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib25uLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDqgOKA2hjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1ib25uLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGcBggrBgEFBQcBAQSBjzCBjDBEBggrBgEFBQcw
-AoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYm9ubi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwRAYIKwYBBQUHMAKGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLWJvbm4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQBpSi0VhhudTolynhedRGNbvHi8uK8HD51pG9Xm1BTlqIMa4VwkrBeU07As
-nsSciEBSiALIhrLayokU/z5EpROSE4HBvHMomjSezpkPQ60bwIABSplmiwCpu5zF
-ArW5cuNFvSdgVKqkElg4Us2uZYcu9s3HdJWB5giU3GbhyReAviQOHO5Dzo+4twbp
-FqDbI6Tj+m4ZOd1u19hcR4TBIvgn7CEk7tSAZfdEQF+nRlYmFyV0LMGCAqksIYC/
-JJvOc54vwjBXXA+3LU5CSoTt7wjLXC2BjLH4OeJL05owk55toOhNNXg1AxMw1Gew
-NHr2AA4aMaB5TQyo2nz1udsI86g4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-bonn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-bonn.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">uni-bonn.de</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bonn</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-bonn.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Irina</GivenName>
-    <SurName>Neerfeld</SurName>
-    <EmailAddress>neerfeld@uni-bonn.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Annette</GivenName>
-    <SurName>Jamitzky</SurName>
-    <EmailAddress>jamitzky@uni-bonn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni-trier.de.xml b/swamid-interfederations-2.0/shibboleth.uni-trier.de.xml
deleted file mode 100644
index f2bffca6..00000000
--- a/swamid-interfederations-2.0/shibboleth.uni-trier.de.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni-trier.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>urts35.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=urts35.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFazCCBFOgAwIBAgIHEmM7DinMbzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTEwODExMTEzMTExWhcNMTUx
-MjMxMjM1OTU5WjCBgTELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBxMFVHJpZXIxGzAZBgNVBAoTElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECxMEWklNSzEcMBoGA1UEAxMTdXJ0czM1LnVuaS10cmllci5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO26IXeNpQDCSFCWhbIz3xvV
-5uHgSOtCNluHl/QE1TZ4UzkM+fFZvwTmp6RFesyGd/RrGnCVtAJVo/FujhPyZssH
-Erl0InYdvZnIa40bX4llxwA6bs+kkCfDzY+8nuKTXNXOCdRoOxedtiUwpNbsiWtN
-6KLhKdUn75e5R/7mW/6laCcTz0LpWT2lCqDn77Fb5Tn8tuRCcMPKEi1DlMP22vOn
-/d4CGWvGYyvR/RwpRmAvva8f4I99Zer5KY4JLnB65m0lAHvcz/2BxFhX6oe0FKJI
-SaqCcTpQXQjPyU8KkPZU3i1jUUx8y0XbWXCzMoWq9EhWUmWRub66F8Q9Gvz/FmkC
-AwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEHpkJpBk149HP6mUARHOS53w
-Fj4wHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwTAYDVR0RBEUwQ4EU
-emllZ2xlckB1bmktdHJpZXIuZGWCBnVydHMzNYIXc2hpYmJvbGV0aC51bmktdHJp
-ZXIuZGWCCnNoaWJib2xldGgwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
-MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
-BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAaMlGD1R6mbnmmmxyXC2Txp
-/Q7UymsTtjykS4Ct/19fQJxl4c5QxzXWQVta6VwxXVBt7G6SjIeyoRFceAg8TEnD
-wOmA+b4iTiD2xxiqreF/gB4TFwWA9jAJOHO8kr0iVK0HwtVGd/I9TVODPY6z8HMa
-Mo7Zs1BTLPbBI/H3lwRXY5nj6jLPGZHDMFmfKltfTIdWfU3xHmXHvJ1aSxBXNpmi
-18PkyB3cLh+x7gmm9ePhE/kgOinFW6mGTqAZcGuSBYIWoZ3hzAroV+JrqjW5W7DD
-9jUQ40xEFjN5qXNehv/bhph98oavY+tzDLG/TCamx3LMdURRCQig4rBo7cDuHfY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni-trier.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>urts35.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=urts35.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFazCCBFOgAwIBAgIHEmM7DinMbzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTEwODExMTEzMTExWhcNMTUx
-MjMxMjM1OTU5WjCBgTELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBxMFVHJpZXIxGzAZBgNVBAoTElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECxMEWklNSzEcMBoGA1UEAxMTdXJ0czM1LnVuaS10cmllci5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO26IXeNpQDCSFCWhbIz3xvV
-5uHgSOtCNluHl/QE1TZ4UzkM+fFZvwTmp6RFesyGd/RrGnCVtAJVo/FujhPyZssH
-Erl0InYdvZnIa40bX4llxwA6bs+kkCfDzY+8nuKTXNXOCdRoOxedtiUwpNbsiWtN
-6KLhKdUn75e5R/7mW/6laCcTz0LpWT2lCqDn77Fb5Tn8tuRCcMPKEi1DlMP22vOn
-/d4CGWvGYyvR/RwpRmAvva8f4I99Zer5KY4JLnB65m0lAHvcz/2BxFhX6oe0FKJI
-SaqCcTpQXQjPyU8KkPZU3i1jUUx8y0XbWXCzMoWq9EhWUmWRub66F8Q9Gvz/FmkC
-AwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEHpkJpBk149HP6mUARHOS53w
-Fj4wHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwTAYDVR0RBEUwQ4EU
-emllZ2xlckB1bmktdHJpZXIuZGWCBnVydHMzNYIXc2hpYmJvbGV0aC51bmktdHJp
-ZXIuZGWCCnNoaWJib2xldGgwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
-MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
-BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAaMlGD1R6mbnmmmxyXC2Txp
-/Q7UymsTtjykS4Ct/19fQJxl4c5QxzXWQVta6VwxXVBt7G6SjIeyoRFceAg8TEnD
-wOmA+b4iTiD2xxiqreF/gB4TFwWA9jAJOHO8kr0iVK0HwtVGd/I9TVODPY6z8HMa
-Mo7Zs1BTLPbBI/H3lwRXY5nj6jLPGZHDMFmfKltfTIdWfU3xHmXHvJ1aSxBXNpmi
-18PkyB3cLh+x7gmm9ePhE/kgOinFW6mGTqAZcGuSBYIWoZ3hzAroV+JrqjW5W7DD
-9jUQ40xEFjN5qXNehv/bhph98oavY+tzDLG/TCamx3LMdURRCQig4rBo7cDuHfY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Trier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Trier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-trier.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Uwe</GivenName>
-    <SurName>Ziegler</SurName>
-    <EmailAddress>ziegler@uni-trier.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unifi.it.xml b/swamid-interfederations-2.0/shibboleth.unifi.it.xml
new file mode 100644
index 00000000..4349f7c5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.unifi.it.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unifi.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-23T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Florence</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Firenze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for University of Florence users </mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Firenze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6zHVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scceiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQzH+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJib2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Yo/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyMqNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURusaq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9Tr8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it: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://shibboleth.unifi.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unifi.it/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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6zHVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scceiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQzH+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJib2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Yo/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyMqNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURusaq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9Tr8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it: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">University of Studies of Florence</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Firenze</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Florence</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Firenze</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unifi.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unifi.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>idem@unifi.it.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.utb.cz.xml b/swamid-interfederations-2.0/shibboleth.utb.cz.xml
new file mode 100644
index 00000000..2e051061
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.utb.cz.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth.utb.cz/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">utb.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Tomas Bata University in Zlín</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Tomáše Bati ve Zlíně</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Tomas Bata University in Zlín</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Tomáše Bati ve Zlíně</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.utb.cz/index.php?lang=2</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.utb.cz/index.php?lang=1</mdui:InformationURL>
+        <mdui:Logo height="20" width="150" xml:lang="cs">https://shibboleth.utb.cz/idp/images/logo_cs_150x20.png</mdui:Logo>
+        <mdui:Logo height="20" width="150" xml:lang="en">https://shibboleth.utb.cz/idp/images/logo_en_150x20.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPR52o0qmfjhfAJboYmgUpU/SqjDMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGgudXRiLmN6MB4XDTExMTEwMzEyMjk0
+N1oXDTMxMTEwMzEyMjk0N1owHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dGIuY3ow
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFRk1W6FPOnadCPc4c7A2l
+KQCxuFDyLR8N0xl5zO3tpTZigrINz67uhtiBuKf9rjGggMpis6UeciCE3/AkPIVX
+k7qfj/UiLmcTjYZIsTDI5mcSTRpaq5vYJdz0X2CisSikn25wg3cUbKUdBNWT8T0b
+LrhAUO4ggx9A9tA0vtwg6a2bIUFoGFcbL/Id2isGMzz2rbUxHv++QJTxPNzXwL4A
+wLooYQs4lAUryfnjtoQxfnvi5HqrKs5e1+fv3IvTCLobBwfkXlQLeW6lSxFcPG9O
+nwByQ850LKah0Or8gQu2qrVFQzYv3GI8qXyMlqy9A/7d07O5Uv7szM1qjyVZh/ZN
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJib2xldGgudXRiLmN6hihodHRwczov
+L3NoaWJib2xldGgudXRiLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTmmhOV
+wIQYpPgGpS7cKCtioshLgjANBgkqhkiG9w0BAQUFAAOCAQEAAMCQLFF/BWMlT1BV
+/GfVdWCg7oY7FR7VHJ3fH1FTKZvnrBcYy9TRu/D+TLqnpJCTn+7c3J3g7LgsTYC9
+R/wn2qxF0UpAmn932EDWWUPUshS8hA1M5Zro4yjR9qW7l4i063AE2DMrjcartZPk
+IpiDh7CMu+xJnggrA/8aComkgfBp+kCz2xQO86tw+wKzx37lm1WyPZuqlIzpJlhJ
+IFlWgY0cksTWiNm1xra51au80h26ax/qoIO7VdYFZ1MHWOqOio57l2Nv14znaYPZ
+1Jh1bXQr/aq8Yjx95a7JoiiHOjXNS4PdSsMUUUxHALhpen2ceJrLSfFbSnqS7k3u
+e72PuA==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.utb.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utb.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">utb.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPR52o0qmfjhfAJboYmgUpU/SqjDMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGgudXRiLmN6MB4XDTExMTEwMzEyMjk0
+N1oXDTMxMTEwMzEyMjk0N1owHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dGIuY3ow
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFRk1W6FPOnadCPc4c7A2l
+KQCxuFDyLR8N0xl5zO3tpTZigrINz67uhtiBuKf9rjGggMpis6UeciCE3/AkPIVX
+k7qfj/UiLmcTjYZIsTDI5mcSTRpaq5vYJdz0X2CisSikn25wg3cUbKUdBNWT8T0b
+LrhAUO4ggx9A9tA0vtwg6a2bIUFoGFcbL/Id2isGMzz2rbUxHv++QJTxPNzXwL4A
+wLooYQs4lAUryfnjtoQxfnvi5HqrKs5e1+fv3IvTCLobBwfkXlQLeW6lSxFcPG9O
+nwByQ850LKah0Or8gQu2qrVFQzYv3GI8qXyMlqy9A/7d07O5Uv7szM1qjyVZh/ZN
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJib2xldGgudXRiLmN6hihodHRwczov
+L3NoaWJib2xldGgudXRiLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTmmhOV
+wIQYpPgGpS7cKCtioshLgjANBgkqhkiG9w0BAQUFAAOCAQEAAMCQLFF/BWMlT1BV
+/GfVdWCg7oY7FR7VHJ3fH1FTKZvnrBcYy9TRu/D+TLqnpJCTn+7c3J3g7LgsTYC9
+R/wn2qxF0UpAmn932EDWWUPUshS8hA1M5Zro4yjR9qW7l4i063AE2DMrjcartZPk
+IpiDh7CMu+xJnggrA/8aComkgfBp+kCz2xQO86tw+wKzx37lm1WyPZuqlIzpJlhJ
+IFlWgY0cksTWiNm1xra51au80h26ax/qoIO7VdYFZ1MHWOqOio57l2Nv14znaYPZ
+1Jh1bXQr/aq8Yjx95a7JoiiHOjXNS4PdSsMUUUxHALhpen2ceJrLSfFbSnqS7k3u
+e72PuA==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Tomas Bata University in Zlín</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Tomas Bata University in Zlín</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Univerzita Tomáše Bati ve Zlíně</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.utb.cz/index.php?lang=2</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.utb.cz/index.php?lang=1</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Ivan</GivenName>
+    <SurName>Masár</SurName>
+    <EmailAddress>imasar@k.utb.cz</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Ondřej</GivenName>
+    <SurName>Fabián</SurName>
+    <EmailAddress>fabian@k.utb.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml b/swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml
deleted file mode 100644
index 53d37d38..00000000
--- a/swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth1.rz.hft-stuttgart.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hft-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth1.rz.hft-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth1.rz.hft-stuttgart.de,O=Hochschule fuer Technik Stuttgart,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIEEC7jezANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
-REUxKjAoBgNVBAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEW
-MBQGA1UECxMNUmVjaGVuemVudHJ1bTEdMBsGA1UEAxMUSGZULVN0dXR0Z2FydCBD
-QS1HMDExIzAhBgkqhkiG9w0BCQEWFHBraUBoZnQtc3R1dHRnYXJ0LmRlMB4XDTEw
-MDYwOTA5NTkwOFoXDTE1MDYwODA5NTkwOFowYzELMAkGA1UEBhMCREUxKjAoBgNV
-BAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEoMCYGA1UEAxMf
-c2hpYmJvbGV0aDEucnouaGZ0LXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJ9MYSQpqbmV643kMInlv1c5CQjyKw3C12/ZKFpiRixm
-V6UAgLhtYyvGEkljYY0yNChHtVFEaqIiUykfDzcPfaiVuAWRE+kKVnQ0kh+qRL1w
-/vIy5zoETcDfmiUDUOxW4h+o5IjBPwRvb1/4wBe97kJqG4+GIQ6O6SzSnAGQ0vGj
-YOetkbIxAkW8Vi5FfFIh80vqWXYkA7LHIgiGofbKVu/8v1wEkL36g95eKpUFuyh1
-n/QAIxDbKB2QRWzv8YEq9UmA0cOaBLv6yLmaxccIdIb84xiBrvMYOB94fqv0crwO
-zxN7NMU+cSNHtszZDYI8rEcN6deZuoNEKci4QvyRLScCAwEAAaOCAbQwggGwMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQU6atJwhxY1aZ6aZ8Gx6tihQ56XRkwHwYDVR0jBBgwFoAU
-cbWZntYfgHFOyE9eGPu6gf6V+xMwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9oZnQtc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsGAQUF
-BzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBKDMf/EyqR4sjd31b+uABdLzD+o14B5ejumSgWfvOS
-mr8eDvdRWreQZvLFtSWXUCzaYi3hDPhjGJLxM02Lo+7oVFHBGjMaxBoyXlZ+PLbj
-gT90PqMDXgBr+L+bF2GGWNJxo3ZF1oX6IcMambiV4JZ8bDyCaPLCD1gkVaQDCjaH
-56AbHKmxs2ot5j8KChzTTyqWGy7/gCyeC4S8MpV75krvanfAz3gdalhwdV+IOdF9
-HNHZayQHrYtMd0F1i8hCyVXi9QyJwCpQitWbN/HmbuXUttu68uDf83y9kUF6v40k
-1kPEHFpAssjRZMqFtxGkuXDEd8TUf45zsT/etRXkcFW8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hft-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth1.rz.hft-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth1.rz.hft-stuttgart.de,O=Hochschule fuer Technik Stuttgart,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIEEC7jezANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
-REUxKjAoBgNVBAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEW
-MBQGA1UECxMNUmVjaGVuemVudHJ1bTEdMBsGA1UEAxMUSGZULVN0dXR0Z2FydCBD
-QS1HMDExIzAhBgkqhkiG9w0BCQEWFHBraUBoZnQtc3R1dHRnYXJ0LmRlMB4XDTEw
-MDYwOTA5NTkwOFoXDTE1MDYwODA5NTkwOFowYzELMAkGA1UEBhMCREUxKjAoBgNV
-BAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEoMCYGA1UEAxMf
-c2hpYmJvbGV0aDEucnouaGZ0LXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJ9MYSQpqbmV643kMInlv1c5CQjyKw3C12/ZKFpiRixm
-V6UAgLhtYyvGEkljYY0yNChHtVFEaqIiUykfDzcPfaiVuAWRE+kKVnQ0kh+qRL1w
-/vIy5zoETcDfmiUDUOxW4h+o5IjBPwRvb1/4wBe97kJqG4+GIQ6O6SzSnAGQ0vGj
-YOetkbIxAkW8Vi5FfFIh80vqWXYkA7LHIgiGofbKVu/8v1wEkL36g95eKpUFuyh1
-n/QAIxDbKB2QRWzv8YEq9UmA0cOaBLv6yLmaxccIdIb84xiBrvMYOB94fqv0crwO
-zxN7NMU+cSNHtszZDYI8rEcN6deZuoNEKci4QvyRLScCAwEAAaOCAbQwggGwMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQU6atJwhxY1aZ6aZ8Gx6tihQ56XRkwHwYDVR0jBBgwFoAU
-cbWZntYfgHFOyE9eGPu6gf6V+xMwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9oZnQtc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsGAQUF
-BzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBKDMf/EyqR4sjd31b+uABdLzD+o14B5ejumSgWfvOS
-mr8eDvdRWreQZvLFtSWXUCzaYi3hDPhjGJLxM02Lo+7oVFHBGjMaxBoyXlZ+PLbj
-gT90PqMDXgBr+L+bF2GGWNJxo3ZF1oX6IcMambiV4JZ8bDyCaPLCD1gkVaQDCjaH
-56AbHKmxs2ot5j8KChzTTyqWGy7/gCyeC4S8MpV75krvanfAz3gdalhwdV+IOdF9
-HNHZayQHrYtMd0F1i8hCyVXi9QyJwCpQitWbN/HmbuXUttu68uDf83y9kUF6v40k
-1kPEHFpAssjRZMqFtxGkuXDEd8TUf45zsT/etRXkcFW8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">HFT-Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule für Technik Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hft-stuttgart.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hans-Peter</GivenName>
-    <SurName>Heppel</SurName>
-    <EmailAddress>hans-peter.heppel@hft-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.ufms.br.xml b/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
index fab13110..8e1e777c 100644
--- a/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
+++ b/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
@@ -23,32 +23,28 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEwTCCA6mgAwIBAgIBADANBgkqhkiG9w0BAQUFADCB/zELMAkGA1UEBhMCQlIx
-GzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDEVMBMGA1UEBxMMQ2FtcG8gR3Jh
-bmRlMTowOAYDVQQKEzFVRk1TIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gTWF0
-byBHcm9zc28gZG8gU3VsMTowOAYDVQQLEzFVRk1TIC0gVW5pdmVyc2lkYWRlIEZl
-ZGVyYWwgZG8gTWF0byBHcm9zc28gZG8gU3VsMSYwJAYJKoZIhvcNAQkBFhdicml2
-YWxkby5qdW5pb3JAdWZtcy5icjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5i
-cjAeFw0xMDA5MDkxOTQ0MzVaFw0xMzA5MDgxOTQ0MzVaMIH/MQswCQYDVQQGEwJC
-UjEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMRUwEwYDVQQHEwxDYW1wbyBH
-cmFuZGUxOjA4BgNVBAoTMVVGTVMgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBN
-YXRvIEdyb3NzbyBkbyBTdWwxOjA4BgNVBAsTMVVGTVMgLSBVbml2ZXJzaWRhZGUg
-RmVkZXJhbCBkbyBNYXRvIEdyb3NzbyBkbyBTdWwxJjAkBgkqhkiG9w0BCQEWF2Jy
-aXZhbGRvLmp1bmlvckB1Zm1zLmJyMRwwGgYDVQQDExNzaGliYm9sZXRoMi51Zm1z
-LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuP6n5bTFwA9aFxAx
-lJWzlcMJuGHe0eG4IYvmVODpTzz8M3kzHtXZwg8qcccPd/+c+rY94mmGpDH/11T4
-eBnpZJ4x9Jz4kC/zW5/lS/Sce8UnGf/7Jfya/iBs0ZdEyKXFsCWiXCFH8gKisJL5
-cr4Ae8/+/BWIYBPxZ/EDT6y0GJqRGoihgNVpDXt6PVO7f2+sRYDjpGToUQto5/DA
-Tfip+XlMR9MGkJOrYhx2fNKx+bnfAuhNKHKZDgxBVseR9l5+bVND1J+kZ4FVBLKs
-4JEEGwJN7ZEXQ+3dIFxvDR0z++KHL9Ir779wQaQw40h5a2L1KuW1e83T1F6VVZWR
-jxSNqwIDAQABo0YwRDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAh
-BggrBgEFBQcDAQYJYIZIAYb4QgQBBgorBgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUA
-A4IBAQA3MOvYaqfwv5NcEzJ45/hCxZ55GJLmZRGxY2Zh/zxNr1L92aNTQxKSy9GJ
-AbVq0HDIjfeul7MwmyOZeMtE5p+vH4p5TNvH0dl7XHO/znXB9YXp2ur6eSq5+a+l
-z7sYBukoxh2f8FOyCC3Q7K8LPcWLp9qYSO2afVnRn2IrKN7bTK1QaSoqMYhHtFxu
-a5tg8ShIu5+p5jWdszdj5T/vsT50Dk+DzbD3982fvW5w8WsGyx48RODFGPzR1I7/
-e9ZnIRiIdcsOlq2r0r41zQZLB8pMW/JejKMf2ta5tRWQ/j6XfPQRnSbyO0UjVitZ
-lkqI2tRwg0C+2HVWQXMUga97IjyC
+    MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
+EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
+BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDAy
+MTExMTE5MDVaFw0xNzAyMTAxMTE5MDVaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
+ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
+TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
+EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
+i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
+n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
+8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
+HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
+XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAE7H4Lymnax9AUsSmTy3jX/WBL1zJT25XRmpQsTVd2uF
+v4G5edhdtqFSPrFU1ukRYfI9o4HL+pPyU/Y9/DgatOKNjBMHLEyWxvdJWmEGOrig
+mLGQjKFo38ntqmO4Afpho2P7mJl69axfpGhqSl+r7lUco+Xf6POr2kmyEN8Mz3Kv
+LaRkCZkzAKYGYg7jVSfLCo5EsEDnIp6pzSJ9lDZf6IUS8sVYqF8aIBrvj0Lx3kU+
+F3iFKXeAU9TJO7VfLIZZxBflbqzbN+zQ+R2TYWS+dNP14d0sCUkgqCY80BTZuogj
+eWbcB5us/5mwzuuxPbjVQcd62opBc0GpKr5dYzBoKNk=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -71,32 +67,28 @@ lkqI2tRwg0C+2HVWQXMUga97IjyC
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEwTCCA6mgAwIBAgIBADANBgkqhkiG9w0BAQUFADCB/zELMAkGA1UEBhMCQlIx
-GzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDEVMBMGA1UEBxMMQ2FtcG8gR3Jh
-bmRlMTowOAYDVQQKEzFVRk1TIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gTWF0
-byBHcm9zc28gZG8gU3VsMTowOAYDVQQLEzFVRk1TIC0gVW5pdmVyc2lkYWRlIEZl
-ZGVyYWwgZG8gTWF0byBHcm9zc28gZG8gU3VsMSYwJAYJKoZIhvcNAQkBFhdicml2
-YWxkby5qdW5pb3JAdWZtcy5icjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5i
-cjAeFw0xMDA5MDkxOTQ0MzVaFw0xMzA5MDgxOTQ0MzVaMIH/MQswCQYDVQQGEwJC
-UjEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMRUwEwYDVQQHEwxDYW1wbyBH
-cmFuZGUxOjA4BgNVBAoTMVVGTVMgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBN
-YXRvIEdyb3NzbyBkbyBTdWwxOjA4BgNVBAsTMVVGTVMgLSBVbml2ZXJzaWRhZGUg
-RmVkZXJhbCBkbyBNYXRvIEdyb3NzbyBkbyBTdWwxJjAkBgkqhkiG9w0BCQEWF2Jy
-aXZhbGRvLmp1bmlvckB1Zm1zLmJyMRwwGgYDVQQDExNzaGliYm9sZXRoMi51Zm1z
-LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuP6n5bTFwA9aFxAx
-lJWzlcMJuGHe0eG4IYvmVODpTzz8M3kzHtXZwg8qcccPd/+c+rY94mmGpDH/11T4
-eBnpZJ4x9Jz4kC/zW5/lS/Sce8UnGf/7Jfya/iBs0ZdEyKXFsCWiXCFH8gKisJL5
-cr4Ae8/+/BWIYBPxZ/EDT6y0GJqRGoihgNVpDXt6PVO7f2+sRYDjpGToUQto5/DA
-Tfip+XlMR9MGkJOrYhx2fNKx+bnfAuhNKHKZDgxBVseR9l5+bVND1J+kZ4FVBLKs
-4JEEGwJN7ZEXQ+3dIFxvDR0z++KHL9Ir779wQaQw40h5a2L1KuW1e83T1F6VVZWR
-jxSNqwIDAQABo0YwRDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAh
-BggrBgEFBQcDAQYJYIZIAYb4QgQBBgorBgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUA
-A4IBAQA3MOvYaqfwv5NcEzJ45/hCxZ55GJLmZRGxY2Zh/zxNr1L92aNTQxKSy9GJ
-AbVq0HDIjfeul7MwmyOZeMtE5p+vH4p5TNvH0dl7XHO/znXB9YXp2ur6eSq5+a+l
-z7sYBukoxh2f8FOyCC3Q7K8LPcWLp9qYSO2afVnRn2IrKN7bTK1QaSoqMYhHtFxu
-a5tg8ShIu5+p5jWdszdj5T/vsT50Dk+DzbD3982fvW5w8WsGyx48RODFGPzR1I7/
-e9ZnIRiIdcsOlq2r0r41zQZLB8pMW/JejKMf2ta5tRWQ/j6XfPQRnSbyO0UjVitZ
-lkqI2tRwg0C+2HVWQXMUga97IjyC
+MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
+EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
+BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDAy
+MTExMTE5MDVaFw0xNzAyMTAxMTE5MDVaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
+ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
+TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
+EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
+i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
+n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
+8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
+HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
+XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAE7H4Lymnax9AUsSmTy3jX/WBL1zJT25XRmpQsTVd2uF
+v4G5edhdtqFSPrFU1ukRYfI9o4HL+pPyU/Y9/DgatOKNjBMHLEyWxvdJWmEGOrig
+mLGQjKFo38ntqmO4Afpho2P7mJl69axfpGhqSl+r7lUco+Xf6POr2kmyEN8Mz3Kv
+LaRkCZkzAKYGYg7jVSfLCo5EsEDnIp6pzSJ9lDZf6IUS8sVYqF8aIBrvj0Lx3kU+
+F3iFKXeAU9TJO7VfLIZZxBflbqzbN+zQ+R2TYWS+dNP14d0sCUkgqCY80BTZuogj
+eWbcB5us/5mwzuuxPbjVQcd62opBc0GpKr5dYzBoKNk=
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml
deleted file mode 100644
index b3933e85..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.brillonline.nl/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth2sp.brillonline.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth2sp.brillonline.nl,O=semantico,L=Brighton,ST=Sussex,C=UK</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
-SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
-GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
-jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
-M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
-DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
-eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
-kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
-R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
-XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
-MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
-EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
-YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
-XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
-E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
-OsSkSoP6HZrPCOXMEAK23C8pxQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth2sp.brillonline.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth2sp.brillonline.nl,O=semantico,L=Brighton,ST=Sussex,C=UK</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
-SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
-GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
-jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
-M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
-DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
-eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
-kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
-R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
-XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
-MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
-EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
-YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
-XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
-E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
-OsSkSoP6HZrPCOXMEAK23C8pxQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Brill Shibboleth 2 SP</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Brill Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.brill.nl/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Help</GivenName>
-    <SurName>desk</SurName>
-    <EmailAddress>brill-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Colin</GivenName>
-    <SurName>Caveney</SurName>
-    <EmailAddress>colin.caveney@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml b/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
new file mode 100644
index 00000000..4ced22cd
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Padova</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Padova</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users affiliated to the University of Padova</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Padova</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unipd.it/en/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unipd.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipd.it/en/idem</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipd.it/idem</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEFBQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgzNjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlwZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69HsIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlAYkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj31K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKAerlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQkKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSGK2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAMOKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95KHSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgtedd1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsGd/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zmlG+DXFhqRaj5xn2FulnFc</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it: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://shibidp.cca.unipd.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cca.unipd.it/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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEFBQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgzNjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlwZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69HsIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlAYkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj31K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKAerlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQkKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSGK2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAMOKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95KHSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgtedd1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsGd/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zmlG+DXFhqRaj5xn2FulnFc</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it: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">University of Padova</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Padova</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Padova</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Padova</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unipd.it/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unipd.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>supporto.sso@unipd.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sivic.redclara.net.xml b/swamid-interfederations-2.0/sivic.redclara.net.xml
new file mode 100644
index 00000000..d5e66362
--- /dev/null
+++ b/swamid-interfederations-2.0/sivic.redclara.net.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sivic.redclara.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SIVIC - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">SIVIC - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's SIVIC Service</mdui:Description>
+        <mdui:Description xml:lang="es">SIVIC de RedCLARA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DS" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:KeyName>sivic.redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=sivic.redclara.net,C=CL,description=g3XkHflq7oMCiH0l
+</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDDVYzMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMxMjA5MTQxMTUx
+WhcNMTQxMjEwMDk0NTM0WjBtMRkwFwYDVQQNExBnM1hrSGZscTdvTUNpSDBsMQsw
+CQYDVQQGEwJDTDEbMBkGA1UEAxMSc2l2aWMucmVkY2xhcmEubmV0MSYwJAYJKoZI
+hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANKco/ktHClnGMI875YaOxX4N7aoYzUMq/o+i/k9AdGM
+GTx4TZvF5WzZyaf/4r7DGjQli9T4/qUHkbC+Htkhx3RM0AV78fcA+nbL55gTmc6c
+FbzZ0prZBAoEccg6/TfJmZvbf1fNUESlTDtjnuR3vwnE2t8IfSNelz3agNprjLT6
+3U6M7M9nyyfqrk1nZ33WgugJgxUL/+nzGsyRZ6RvUpNV/p71wTzJw/HealNVSV+/
+pDoo1aosyJaJ8H6ftA+Cn5UDqwdb24evVxdpOyqO7JLonQDlZeekS92J2XmBnZ4B
+Q0DELszvnOFeO+hiznBIEQBmdmpYve7pHpkKl9hr78MCAwEAAaOCAuUwggLhMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBTQXYm5du9yHiVrCQ4cEDMZ3Tox/jAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
+awj3zGQu7w4sRTArBgNVHREEJDAighJzaXZpYy5yZWRjbGFyYS5uZXSCDHJlZGNs
+YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
+AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
+aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
+Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
+b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
+IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
+YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
+dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
+AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
+ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
+L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
+LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBAERLEsxQlX9E4GGHisEp
+fniTTQz8LmQlsBHffw6r8yvml7ZVsWUV9gSYtmps6YIPT6aDPw1HyolB7CKZOWc9
+vCYQAgpw5wvtKMrv2SJSEhNJAoGbzADBVUZNrMYlRUX52L6bMTFSa8nbm1ZKn4w1
+x2FAuM2x6YSgo7AcpSUnWs8ORMZPK0P6rdBpSV6mv48RS+pzDTzNOotuuV4+KWsS
+6QbjmaC4pHRr5Wa+GkCD99HZl9xesToHBD07ru6cX8PAJ/7p9/S13+BjvElg7vYZ
+tdSiOm5NfPEpVHjPeufoeM6M1N356akvZKYJIcOSY+TVPzQT4yvcqVbhayixcOs0
+0UE=
+
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:KeyName>sivic.redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=sivic.redclara.net,C=CL,description=g3XkHflq7oMCiH0l
+</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDDVYzMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMxMjA5MTQxMTUx
+WhcNMTQxMjEwMDk0NTM0WjBtMRkwFwYDVQQNExBnM1hrSGZscTdvTUNpSDBsMQsw
+CQYDVQQGEwJDTDEbMBkGA1UEAxMSc2l2aWMucmVkY2xhcmEubmV0MSYwJAYJKoZI
+hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANKco/ktHClnGMI875YaOxX4N7aoYzUMq/o+i/k9AdGM
+GTx4TZvF5WzZyaf/4r7DGjQli9T4/qUHkbC+Htkhx3RM0AV78fcA+nbL55gTmc6c
+FbzZ0prZBAoEccg6/TfJmZvbf1fNUESlTDtjnuR3vwnE2t8IfSNelz3agNprjLT6
+3U6M7M9nyyfqrk1nZ33WgugJgxUL/+nzGsyRZ6RvUpNV/p71wTzJw/HealNVSV+/
+pDoo1aosyJaJ8H6ftA+Cn5UDqwdb24evVxdpOyqO7JLonQDlZeekS92J2XmBnZ4B
+Q0DELszvnOFeO+hiznBIEQBmdmpYve7pHpkKl9hr78MCAwEAAaOCAuUwggLhMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBTQXYm5du9yHiVrCQ4cEDMZ3Tox/jAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
+awj3zGQu7w4sRTArBgNVHREEJDAighJzaXZpYy5yZWRjbGFyYS5uZXSCDHJlZGNs
+YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
+AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
+aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
+Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
+b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
+IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
+YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
+dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
+AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
+ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
+L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
+LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBAERLEsxQlX9E4GGHisEp
+fniTTQz8LmQlsBHffw6r8yvml7ZVsWUV9gSYtmps6YIPT6aDPw1HyolB7CKZOWc9
+vCYQAgpw5wvtKMrv2SJSEhNJAoGbzADBVUZNrMYlRUX52L6bMTFSa8nbm1ZKn4w1
+x2FAuM2x6YSgo7AcpSUnWs8ORMZPK0P6rdBpSV6mv48RS+pzDTzNOotuuV4+KWsS
+6QbjmaC4pHRr5Wa+GkCD99HZl9xesToHBD07ru6cX8PAJ/7p9/S13+BjvElg7vYZ
+tdSiOm5NfPEpVHjPeufoeM6M1N356akvZKYJIcOSY+TVPzQT4yvcqVbhayixcOs0
+0UE=
+
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sivic.redclara.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sivic.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Urban</md:SurName>
+    <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/slcs.pca.dfn.de.xml b/swamid-interfederations-2.0/slcs.pca.dfn.de.xml
deleted file mode 100644
index 09a167a9..00000000
--- a/swamid-interfederations-2.0/slcs.pca.dfn.de.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://slcs.pca.dfn.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://slcs.pca.dfn.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>slcs.pca.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=slcs.pca.dfn.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFATCCA+mgAwIBAgIEDbn3WDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTAyMTcwODQ4MDhaFw0xNDAy
-MTYwODQ4MDhaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9zbGNzLnBjYS5kZm4uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw3Jc6eE6FdEoDHX4bGRTQ8tt2f65t
-hR76ZN4o4WIMXlnKuUiPcj84bSnsToXi8CTZy0Y3IS/iqiG+VIhlwombfqgEJb1/
-YXxW9hL3s38qobUNsSlv1cam6MjJVRRbvmnulqA2UkcXh0j8oXjMgMrvRscvc5Vr
-R+qrLotFyEp3weKYTS03k6f2QN63pFCtwu+4db5g7DLAgf4T8LkCwPR1yrAjfIyQ
-KZlilI1I+LIEepIbZ5Yi/HWxGJ4rE0QQzf595yiygtXL+lwgOjexnKOEoVNdRa3k
-gDUoh5xyTkdnLDjV2J/fsHkzjy8mODDl9POPm+5xsLXLwGMn+ChU6CSrAgMBAAGj
-ggHeMIIB2jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJweQjSs1QUY3yB1FTgAhsULqiHTMB8G
-A1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMCAGA1UdEQQZMBeBFXdlYm1h
-c3RlckBkZm4tY2VydC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMt
-Y2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAilQf5k73NxqSFP81D51u6cnwE+ZW1WCPcUhd
-IkQ+K85pP57nd4ClbL+mond011qRiyzA9txYuoxw6+J6mXU9MlKDgWh7ACVIjEZB
-VeS/ROi0GvRKQBlUp4OgwFFMhoHp5wZbpL7cCp5NE7ZOMNZfGk095tEFEDZX7Csg
-GlcR2n3wMi66UIFjaMKTdmh5kPFVtQNw8FltrO+qRJeTljDTB4Ct9SOCV7F2VnNo
-/bBzPejsxto0mF0W/gqyfZqcQSnSGEFVDQsAEv2aLMHoFvuOIr4nHWTsimbKuidM
-73o/AK2KZu86hs7mFt0tLOrUUlJJOtekqrPLWHFfLLBT8f9L+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>slcs.pca.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=slcs.pca.dfn.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFATCCA+mgAwIBAgIEDbn3WDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTAyMTcwODQ4MDhaFw0xNDAy
-MTYwODQ4MDhaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9zbGNzLnBjYS5kZm4uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw3Jc6eE6FdEoDHX4bGRTQ8tt2f65t
-hR76ZN4o4WIMXlnKuUiPcj84bSnsToXi8CTZy0Y3IS/iqiG+VIhlwombfqgEJb1/
-YXxW9hL3s38qobUNsSlv1cam6MjJVRRbvmnulqA2UkcXh0j8oXjMgMrvRscvc5Vr
-R+qrLotFyEp3weKYTS03k6f2QN63pFCtwu+4db5g7DLAgf4T8LkCwPR1yrAjfIyQ
-KZlilI1I+LIEepIbZ5Yi/HWxGJ4rE0QQzf595yiygtXL+lwgOjexnKOEoVNdRa3k
-gDUoh5xyTkdnLDjV2J/fsHkzjy8mODDl9POPm+5xsLXLwGMn+ChU6CSrAgMBAAGj
-ggHeMIIB2jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJweQjSs1QUY3yB1FTgAhsULqiHTMB8G
-A1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMCAGA1UdEQQZMBeBFXdlYm1h
-c3RlckBkZm4tY2VydC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMt
-Y2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAilQf5k73NxqSFP81D51u6cnwE+ZW1WCPcUhd
-IkQ+K85pP57nd4ClbL+mond011qRiyzA9txYuoxw6+J6mXU9MlKDgWh7ACVIjEZB
-VeS/ROi0GvRKQBlUp4OgwFFMhoHp5wZbpL7cCp5NE7ZOMNZfGk095tEFEDZX7Csg
-GlcR2n3wMi66UIFjaMKTdmh5kPFVtQNw8FltrO+qRJeTljDTB4Ct9SOCV7F2VnNo
-/bBzPejsxto0mF0W/gqyfZqcQSnSGEFVDQsAEv2aLMHoFvuOIr4nHWTsimbKuidM
-73o/AK2KZu86hs7mFt0tLOrUUlJJOtekqrPLWHFfLLBT8f9L+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DFN-CERT Services GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DFN Short-Lived Credential Service (DFN-SLCS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dfn-cert.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Reimer</GivenName>
-    <SurName>Karlsen-Masur</SurName>
-    <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Reimer</GivenName>
-    <SurName>Karlsen-Masur</SurName>
-    <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr.xml b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
index 15af9807..86babd6d 100644
--- a/swamid-interfederations-2.0/sourcesup.cru.fr.xml
+++ b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
@@ -97,11 +97,6 @@ HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
       <ServiceDescription xml:lang="fr">SourceSup est un site d'hébergement de projets de développement logiciel pour la communauté enseignement supérieur et recherche française.</ServiceDescription>
       <ServiceDescription xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</ServiceDescription>
       <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"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
diff --git a/swamid-interfederations-2.0/sp.asknet.de.xml b/swamid-interfederations-2.0/sp.asknet.de.xml
deleted file mode 100644
index 28ee30ea..00000000
--- a/swamid-interfederations-2.0/sp.asknet.de.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.asknet.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.asknet.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.asknet.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.asknet.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+jCCA+KgAwIBAgIED9Kx6zANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAzMzExMTM5MDhaFw0xNTAz
-MzAxMTM5MDhaMEsxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRUwEwYDVQQDEwxzcC5hc2tuZXQuZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+n8aGXU8eGT0HeiRTnXASUoTstkWzkkhL
-LOEGblTGhO7cMFbJM/g/kOdUIIRi0dzhan8UdAKkeqtWnUpf2vgKfu/f97mwfpT7
-qKbN2LvX1VoQXtpmCwkf477fKXsaiHojRxx87/zfURJRUQK9fDeO7k1r3iTzSLJO
-7lEDIQVeezplT1MhzOYPdS8sUaCJogPgvYBZ+mPjpA8SYx6Rq5mtlDZGUII951Uh
-InrCCgmk0WpIxclL1IHdNqy3FOv1XSDS0k+KBQQnu/FpxhInUm1lILXfV2IkTvnn
-HcTJFh6/5Ojk8sOEh0vaBB2Q1ncJsrR0NWCBlgLfSdhX5zXmeFmtAgMBAAGjggHa
-MIIB1jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFNVU8a0BOqrMQNKc91DuHripAe3nMB8GA1Ud
-IwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMBwGA1UdEQQVMBOBEWNlcnRhZG1A
-YXNrbmV0LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9
-hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
-SIb3DQEBBQUAA4IBAQAmucftP9132NU6iIByTjBoup1At2Nj0NeA+vE7Tg3iHBZh
-yWGxTsCVCHLSzDi8RpQKnnov1wsJ/Z7JCyd+C292zIFoUamliYVJKcTJtCOLmCkq
-wGLbbYq8CK8Tlv5BaWaleiNVaBxx1At7QT7PnV/YF9dPR3tQKP5vLYtPARAexbcV
-fKsNZP13cjxUMSmHBTgMLgpegD8btC7KcdKbO9xcLPz8A8ge00NElX53dqVGH83z
-RaTY5YqsKUIDh0mx2UxjFV9irG5X/QE6YCt0tBZtjaE7b9cHapIL9BZDRE7aRGDt
-rWoZ1ruqB2jP59EBdg4sTfzhvlLtUdL3H3aUimlg
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.asknet.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.asknet.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+jCCA+KgAwIBAgIED9Kx6zANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAzMzExMTM5MDhaFw0xNTAz
-MzAxMTM5MDhaMEsxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRUwEwYDVQQDEwxzcC5hc2tuZXQuZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+n8aGXU8eGT0HeiRTnXASUoTstkWzkkhL
-LOEGblTGhO7cMFbJM/g/kOdUIIRi0dzhan8UdAKkeqtWnUpf2vgKfu/f97mwfpT7
-qKbN2LvX1VoQXtpmCwkf477fKXsaiHojRxx87/zfURJRUQK9fDeO7k1r3iTzSLJO
-7lEDIQVeezplT1MhzOYPdS8sUaCJogPgvYBZ+mPjpA8SYx6Rq5mtlDZGUII951Uh
-InrCCgmk0WpIxclL1IHdNqy3FOv1XSDS0k+KBQQnu/FpxhInUm1lILXfV2IkTvnn
-HcTJFh6/5Ojk8sOEh0vaBB2Q1ncJsrR0NWCBlgLfSdhX5zXmeFmtAgMBAAGjggHa
-MIIB1jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFNVU8a0BOqrMQNKc91DuHripAe3nMB8GA1Ud
-IwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMBwGA1UdEQQVMBOBEWNlcnRhZG1A
-YXNrbmV0LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9
-hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
-SIb3DQEBBQUAA4IBAQAmucftP9132NU6iIByTjBoup1At2Nj0NeA+vE7Tg3iHBZh
-yWGxTsCVCHLSzDi8RpQKnnov1wsJ/Z7JCyd+C292zIFoUamliYVJKcTJtCOLmCkq
-wGLbbYq8CK8Tlv5BaWaleiNVaBxx1At7QT7PnV/YF9dPR3tQKP5vLYtPARAexbcV
-fKsNZP13cjxUMSmHBTgMLgpegD8btC7KcdKbO9xcLPz8A8ge00NElX53dqVGH83z
-RaTY5YqsKUIDh0mx2UxjFV9irG5X/QE6YCt0tBZtjaE7b9cHapIL9BZDRE7aRGDt
-rWoZ1ruqB2jP59EBdg4sTfzhvlLtUdL3H3aUimlg
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.asknet.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.asknet.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">asknet AG Karlsruhe</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">asknet AG Serviceprovider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.asknet.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Frank</GivenName>
-    <SurName>Flottemesch</SurName>
-    <EmailAddress>frank.flottemesch@asknet.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jörgen</GivenName>
-    <SurName>Dahlke</SurName>
-    <EmailAddress>joergen.dahlke@asknet.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.eblib.com.xml b/swamid-interfederations-2.0/sp.eblib.com.xml
deleted file mode 100644
index 0a5bc150..00000000
--- a/swamid-interfederations-2.0/sp.eblib.com.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.eblib.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.eblib.com/Shibboleth.sso/DS" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.eblib.com/Shibboleth.sso/ACODS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ebooks.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=vinay.bharadwaj@ebooks.com,CN=ebooks.com,OU=Area Servizi ICT,O=Politecnico di Milano,L=Milan,ST=Milan,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNzCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCSVQx
-DjAMBgNVBAgTBU1pbGFuMQ4wDAYDVQQHEwVNaWxhbjEeMBwGA1UEChMVUG9saXRl
-Y25pY28gZGkgTWlsYW5vMRkwFwYDVQQLExBBcmVhIFNlcnZpemkgSUNUMRMwEQYD
-VQQDEwplYm9va3MuY29tMSkwJwYJKoZIhvcNAQkBFhp2aW5heS5iaGFyYWR3YWpA
-ZWJvb2tzLmNvbTAeFw0xMTAyMjMxNTU2NDRaFw0xNjAyMjIxNTU2NDRaMIGoMQsw
-CQYDVQQGEwJJVDEOMAwGA1UECBMFTWlsYW4xDjAMBgNVBAcTBU1pbGFuMR4wHAYD
-VQQKExVQb2xpdGVjbmljbyBkaSBNaWxhbm8xGTAXBgNVBAsTEEFyZWEgU2Vydml6
-aSBJQ1QxEzARBgNVBAMTCmVib29rcy5jb20xKTAnBgkqhkiG9w0BCQEWGnZpbmF5
-LmJoYXJhZHdhakBlYm9va3MuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQD9XQY5ysPYf4+guHJH+o75Ebn+bXE44uogDRo+IMLqCKxvEV5+C9RaDLKmeAs1
-YbYaHRx1Y5bHgHgj4nX44k266qpV78WoUEslkP9ivOKW4+waMzYvRGSC++vMIVtr
-ir6jQ94WvCxnS6JPJ5mDX6mEiVPIfuevBqYt+Cgj0Q2bMQIDAQABo28wbTAMBgNV
-HRMBAf8EAjAAMB0GA1UdDgQWBBS99SAMv7ZRQnNJ64Q5iC+xVikSCDALBgNVHQ8E
-BAMCBLAwEQYJYIZIAYb4QgEBBAQDAgWgMB4GCWCGSAGG+EIBDQQRFg94Y2EgY2Vy
-dGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADgYEAG9XLSlU6eORQ1LTL481PFvwsmxUq
-q0Dc6MRsFLwilB3nI1MyA9R6EDh/Tw1Fo7YiZ397OrgYEMvVV5GC+z923Zta9pI+
-h71V8Nt69iFENpx52d3BuYDNkhjSf5oo1KkVHgAmhCPjhFqFa+B6BE79KIz2Bwrx
-YzM6IclOG3yKzoY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ebooks.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=vinay.bharadwaj@ebooks.com,CN=ebooks.com,OU=Area Servizi ICT,O=Politecnico di Milano,L=Milan,ST=Milan,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNzCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCSVQx
-DjAMBgNVBAgTBU1pbGFuMQ4wDAYDVQQHEwVNaWxhbjEeMBwGA1UEChMVUG9saXRl
-Y25pY28gZGkgTWlsYW5vMRkwFwYDVQQLExBBcmVhIFNlcnZpemkgSUNUMRMwEQYD
-VQQDEwplYm9va3MuY29tMSkwJwYJKoZIhvcNAQkBFhp2aW5heS5iaGFyYWR3YWpA
-ZWJvb2tzLmNvbTAeFw0xMTAyMjMxNTU2NDRaFw0xNjAyMjIxNTU2NDRaMIGoMQsw
-CQYDVQQGEwJJVDEOMAwGA1UECBMFTWlsYW4xDjAMBgNVBAcTBU1pbGFuMR4wHAYD
-VQQKExVQb2xpdGVjbmljbyBkaSBNaWxhbm8xGTAXBgNVBAsTEEFyZWEgU2Vydml6
-aSBJQ1QxEzARBgNVBAMTCmVib29rcy5jb20xKTAnBgkqhkiG9w0BCQEWGnZpbmF5
-LmJoYXJhZHdhakBlYm9va3MuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQD9XQY5ysPYf4+guHJH+o75Ebn+bXE44uogDRo+IMLqCKxvEV5+C9RaDLKmeAs1
-YbYaHRx1Y5bHgHgj4nX44k266qpV78WoUEslkP9ivOKW4+waMzYvRGSC++vMIVtr
-ir6jQ94WvCxnS6JPJ5mDX6mEiVPIfuevBqYt+Cgj0Q2bMQIDAQABo28wbTAMBgNV
-HRMBAf8EAjAAMB0GA1UdDgQWBBS99SAMv7ZRQnNJ64Q5iC+xVikSCDALBgNVHQ8E
-BAMCBLAwEQYJYIZIAYb4QgEBBAQDAgWgMB4GCWCGSAGG+EIBDQQRFg94Y2EgY2Vy
-dGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADgYEAG9XLSlU6eORQ1LTL481PFvwsmxUq
-q0Dc6MRsFLwilB3nI1MyA9R6EDh/Tw1Fo7YiZ397OrgYEMvVV5GC+z923Zta9pI+
-h71V8Nt69iFENpx52d3BuYDNkhjSf5oo1KkVHgAmhCPjhFqFa+B6BE79KIz2Bwrx
-YzM6IclOG3yKzoY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.eblib.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.eblib.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Ebook Library</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">EBL</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.eblib.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Vinay</GivenName>
-    <SurName>Bharadwaj</SurName>
-    <EmailAddress>v@ebooks.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml b/swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml
deleted file mode 100644
index 06ce1e4f..00000000
--- a/swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.elearning.uni-bremen.de/module.php/saml/sp/metadata.php/default-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.elearning.uni-bremen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.elearning.uni-bremen.de,OU=Zentrum fuer Multimedia in der Lehre,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIEEKXHTTANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
-aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
-Q0EwHhcNMTAwOTA3MTQxODM3WhcNMTUwODEyMTQxODM3WjCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
-bml2ZXJzaXRhZXQgQnJlbWVuMS0wKwYDVQQLEyRaZW50cnVtIGZ1ZXIgTXVsdGlt
-ZWRpYSBpbiBkZXIgTGVocmUxIzAhBgNVBAMTGnNwLmVsZWFybmluZy51bmktYnJl
-bWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRz6jsYLtM9u
-mhTah1G1ja6fM6pxYotgxAX0AVIeqN0yPoMqbyWPyVSah6dYWcB6w9mluUMOQl7n
-uYrR02PPewdeaQjbfszzMsvedPisstsgQQovcqsDerQf/8DCwoYTRXr02BH58zIP
-g6xa10lCPmAVs8hvQCgOwfpHiJkBosFYnXT26KgB+x5BvzRtk0SP6suxaukTAzrY
-5P6B9bS0a6cug5BAKPTtGePogyiMG4q1+XYH0CbLNW5xaBdSwP5D8ZbPDTQ+kaJ6
-clJjpvQikNsAd54QAXEtAugGcd+FHePQ66zc6Pwd9ScMBujdWc+urJR7XxO+4arS
-IVocpMFzrwIDAQABo4IBpjCCAaIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ66O97b2HFg7rR
-kNvrX0sSEZZ35DAfBgNVHSMEGDAWgBTky8TsedDfrm6skomunUkvxeWYQTCBhQYD
-VR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYnJlbWVu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4hjZodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgaAGCCsGAQUFBwEB
-BIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1i
-cmVtZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEYGCCsGAQUFBzAChjpodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCZWz6MxY30W1tO9ee+bvveN7qnyHcP
-mVIVrCaJoNBj1XrybyWwJIAHJgxu8MAk9mqovgPnankubQapGPLvm9cEQcy2Prk8
-0dMbYUvQUDQ7bBAqtWz+tcJ7xdbbAsS5ZKXkqgrrjxhdELmraNDuJLixq0uoeyHw
-LFfjps9UgaikwwxlAkh/GI3eKbEdBjW600BwmKGgX8+Fn2xxkEDlDuiBrTqOenJ1
-ya7z3CrdIienWIfrTcFvvQfoQMeRuKt0hyoZvgVrpEh9Cy9wr6eQb3aV1MouSOaU
-n+92msAlsUQLZR6LMB31MwVzS3NGr+9Xd2N4h2bcaD4U9nYuPAMD4JRK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.elearning.uni-bremen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.elearning.uni-bremen.de,OU=Zentrum fuer Multimedia in der Lehre,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIEEKXHTTANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
-aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
-Q0EwHhcNMTAwOTA3MTQxODM3WhcNMTUwODEyMTQxODM3WjCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
-bml2ZXJzaXRhZXQgQnJlbWVuMS0wKwYDVQQLEyRaZW50cnVtIGZ1ZXIgTXVsdGlt
-ZWRpYSBpbiBkZXIgTGVocmUxIzAhBgNVBAMTGnNwLmVsZWFybmluZy51bmktYnJl
-bWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRz6jsYLtM9u
-mhTah1G1ja6fM6pxYotgxAX0AVIeqN0yPoMqbyWPyVSah6dYWcB6w9mluUMOQl7n
-uYrR02PPewdeaQjbfszzMsvedPisstsgQQovcqsDerQf/8DCwoYTRXr02BH58zIP
-g6xa10lCPmAVs8hvQCgOwfpHiJkBosFYnXT26KgB+x5BvzRtk0SP6suxaukTAzrY
-5P6B9bS0a6cug5BAKPTtGePogyiMG4q1+XYH0CbLNW5xaBdSwP5D8ZbPDTQ+kaJ6
-clJjpvQikNsAd54QAXEtAugGcd+FHePQ66zc6Pwd9ScMBujdWc+urJR7XxO+4arS
-IVocpMFzrwIDAQABo4IBpjCCAaIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ66O97b2HFg7rR
-kNvrX0sSEZZ35DAfBgNVHSMEGDAWgBTky8TsedDfrm6skomunUkvxeWYQTCBhQYD
-VR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYnJlbWVu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4hjZodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgaAGCCsGAQUFBwEB
-BIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1i
-cmVtZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEYGCCsGAQUFBzAChjpodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCZWz6MxY30W1tO9ee+bvveN7qnyHcP
-mVIVrCaJoNBj1XrybyWwJIAHJgxu8MAk9mqovgPnankubQapGPLvm9cEQcy2Prk8
-0dMbYUvQUDQ7bBAqtWz+tcJ7xdbbAsS5ZKXkqgrrjxhdELmraNDuJLixq0uoeyHw
-LFfjps9UgaikwwxlAkh/GI3eKbEdBjW600BwmKGgX8+Fn2xxkEDlDuiBrTqOenJ1
-ya7z3CrdIienWIfrTcFvvQfoQMeRuKt0hyoZvgVrpEh9Cy9wr6eQb3aV1MouSOaU
-n+92msAlsUQLZR6LMB31MwVzS3NGr+9Xd2N4h2bcaD4U9nYuPAMD4JRK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Bremen - Zentrum für Multimedia in der Lehre</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bremen - Zentrum für Multimedia in der Lehre</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://elearning.uni-bremen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Oster</SurName>
-    <EmailAddress>olio@zmml.uni-bremen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.korp.csc.fi.xml b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
index d35d911d..e97615f0 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
@@ -14,12 +14,13 @@
     <Extensions>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
         <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
+        <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
         <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
diff --git a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
deleted file mode 100644
index e8774313..00000000
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.onlinelibrary.wiley.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.onlinelibrary.wiley.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.onlinelibrary.wiley.com,OU=Internet Hosting,O=John Wiley &amp; Sons\, Inc,L=Somerset,ST=New Jersey,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJjCCBA6gAwIBAgIQf8xgfHknPoBIKeZ+du1IjTANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNzE5
-MDAwMDAwWhcNMTIwNzE4MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
-Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
-bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
-VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAxVwHCIeAYJhnOnIeoMa3xrO0MeHii7ewtMEVWSFIc8sUCuIH
-TBKmrZhRblxLq+IokDD/3EWinbQy8h6Y03HZs6N3rVkBjsRRzK2K6IwoScb6tIZn
-SaOZW07eLG4GGtwc2BHlYwQ2Z3TYI/9cJbujqi/Oo9Sn7HCjsQImyddtq4sCAwEA
-AaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4
-oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1
-cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIB
-FhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19RzB2
-BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWdu
-LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVyaXNp
-Z24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBW
-FglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAm
-FiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcN
-AQEFBQADggEBAF/uHCrjIt/9pk+3YuQ17YwCASb0tsVwKQcURjHQElRp7biB9Yeb
-or2frE8NIzCZxe8anzq4uiIVdy1IrnCp8fSLVunmwimfh6jc3kDQSf87wjh5Xxln
-ZpKECfnt/gcTzeaGtcBLM1pUTNTYth4r/IGfQj6g6DSZVdsWBcn7ggfJo+d1oqoI
-QzKCUsLF8DxUlfLyoWtRo4hSFKVdKb7FoqMPj+gpQ5Emu8azR17MEU61Z1XgNPN2
-3QTEer7Uhd12JTaerFnc8aebbQaWt0xnaEmwelIm50Pvoxms6gKQPRFo2M+YNZM6
-YjwnO0CxymDk6bfYSbFO6qPv00QmBphHgFw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.onlinelibrary.wiley.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.onlinelibrary.wiley.com,OU=Internet Hosting,O=John Wiley &amp; Sons\, Inc,L=Somerset,ST=New Jersey,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJjCCBA6gAwIBAgIQf8xgfHknPoBIKeZ+du1IjTANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNzE5
-MDAwMDAwWhcNMTIwNzE4MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
-Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
-bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
-VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAxVwHCIeAYJhnOnIeoMa3xrO0MeHii7ewtMEVWSFIc8sUCuIH
-TBKmrZhRblxLq+IokDD/3EWinbQy8h6Y03HZs6N3rVkBjsRRzK2K6IwoScb6tIZn
-SaOZW07eLG4GGtwc2BHlYwQ2Z3TYI/9cJbujqi/Oo9Sn7HCjsQImyddtq4sCAwEA
-AaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4
-oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1
-cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIB
-FhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19RzB2
-BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWdu
-LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVyaXNp
-Z24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBW
-FglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAm
-FiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcN
-AQEFBQADggEBAF/uHCrjIt/9pk+3YuQ17YwCASb0tsVwKQcURjHQElRp7biB9Yeb
-or2frE8NIzCZxe8anzq4uiIVdy1IrnCp8fSLVunmwimfh6jc3kDQSf87wjh5Xxln
-ZpKECfnt/gcTzeaGtcBLM1pUTNTYth4r/IGfQj6g6DSZVdsWBcn7ggfJo+d1oqoI
-QzKCUsLF8DxUlfLyoWtRo4hSFKVdKb7FoqMPj+gpQ5Emu8azR17MEU61Z1XgNPN2
-3QTEer7Uhd12JTaerFnc8aebbQaWt0xnaEmwelIm50Pvoxms6gKQPRFo2M+YNZM6
-YjwnO0CxymDk6bfYSbFO6qPv00QmBphHgFw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">John Wiley and Sons</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">John Wiley and Sons</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://onlinelibrary.wiley.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Sean</GivenName>
-    <SurName>Timmins</SurName>
-    <EmailAddress>stimmins@wiley.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Chris</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>cpotter@wiley.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.tshhosting.com.xml b/swamid-interfederations-2.0/sp.tshhosting.com.xml
deleted file mode 100644
index 06af7b79..00000000
--- a/swamid-interfederations-2.0/sp.tshhosting.com.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.tshhosting.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.isiknowledge.com/" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.webofknowledge.com/" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.webofknowledgev4.com/" index="3"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.tshhosting.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.tshhosting.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=Thomson Scientific,O=Thomson Reuters (Tax &amp; Accounting) Inc.,L=East Haven,ST=Connecticut,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF7jCCBNagAwIBAgIQE6nUqB9NUlBYPyzlywMpUjANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNzA2
-MDAwMDAwWhcNMTIwNzEwMjM1OTU5WjCB2jELMAkGA1UEBhMCVVMxFDASBgNVBAgT
-C0Nvbm5lY3RpY3V0MRMwEQYDVQQHFApFYXN0IEhhdmVuMTAwLgYDVQQKFCdUaG9t
-c29uIFJldXRlcnMgKFRheCAmIEFjY291bnRpbmcpIEluYy4xGzAZBgNVBAsUElRo
-b21zb24gU2NpZW50aWZpYzEzMDEGA1UECxQqVGVybXMgb2YgdXNlIGF0IHd3dy52
-ZXJpc2lnbi5jb20vcnBhIChjKTA1MRwwGgYDVQQDFBNzaGliLnRzaGhvc3Rpbmcu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyW3478pCuAxKLWVx
-n6RDCOsnRHN4GP9Z10GWhuE9CTCe+Z95sfeMhwwbpYgclX0ygYv8ZTsDqfu6Ln78
-RDg/5G4H6ceA0dgiE7FT3yWCR/puIb8kWYgaq5XD5jq+e0cCWWeLhkL836D8LDuI
-OwKXvbbzaRql38RxJj59lg/XARc7j6UdMUPcKcJrkSeuMrn6gw626x4yL01R5uEc
-5s+VuwodLo1hTiRsewCOyfX0N7Fv16j8bxEecZtTfGOSL5FoxcjXjAf3JQcFoKr7
-76IY5ImPxNnS1vwfx84tWN0m/481ho/Q9rH15jChF/QXvIENCu/LUfURO0UajjHs
-yGADdQIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwRQYDVR0f
-BD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMi1jcmwudmVyaXNpZ24uY29t
-L1NWUlNlY3VyZUcyLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
-KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFKXvCxHOwEEDo0plkEiy
-HOBXLX1HMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
-dmVyaXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUcyLWFp
-YS52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzIuY2VyMG4GCCsGAQUFBwEMBGIwYKFe
-oFwwWjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4myms
-SweLIQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjAN
-BgkqhkiG9w0BAQUFAAOCAQEAH+DiV8qdzW762rt7SIY7+z9xJSobGqzQKZRRFv00
-0lt1peE/UDGyRSc7fSSfnCXgjKxYOLT43z0zFqvX2B3au1E9Sskk4IlBygjRkaJr
-jRYTJ4xBOMx6ppD93xXC59Unv9VwK5qo/qObqnMWz5ZPJBL8UOQ9QgXfQx0VJ4dx
-avmAGfeVrcSW8ih+s1KLD2D8F00a8A4wz5HvsGqL3zcph34ZrnHi0CKpOVW75LlZ
-kggo+nm06wWcaYtATsvsvkiBgFhnU8avQWMM7ienzabFPzABgjgq5OgDb6cc3cPm
-TbuT7A0uVRSN/CkntM5VSDg6KlZId4pE3QsD7TcsbMJirA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.isiknowledge.com/?auth=Shibboleth" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.isiknowledge.com/?auth=Shibboleth" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledgev4.com/?auth=Shibboleth" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledgev4.com/?auth=Shibboleth" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Thomson Scientific</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Thomson Reuters - ISI Web of Knowledge and EndNote Web</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.thomsonreuters.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Manoj</GivenName>
-    <SurName>Panicker</SurName>
-    <EmailAddress>manoj.panicker@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>websupp@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp2.cesnet.cz.xml b/swamid-interfederations-2.0/sp2.cesnet.cz.xml
deleted file mode 100644
index 17b0eb6f..00000000
--- a/swamid-interfederations-2.0/sp2.cesnet.cz.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" entityID="https://sp2.cesnet.cz/sp/shibboleth/edugain">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CESNET Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A test SP showing released attributes and SAML assertions.</mdui:Description>
-        <mdui:DisplayName xml:lang="cs">CESNET Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="cs">Testovací SP - ukazuje doručené atributy a SAML zprávy.</mdui:Description>
-      </mdui:UIInfo>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp2.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp2.cesnet.cz,O=CESNET,DC=cesnet-ca,DC=cz</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELzCCAxegAwIBAgIEQrOJWDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
-LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
-U05FVCBDQTAeFw0xMDAyMjIwOTU5MzFaFw0xMTAzMjIxMDI5MzFaMFgxEjAQBgoJ
-kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEPMA0GA1UE
-ChMGQ0VTTkVUMRYwFAYDVQQDEw1zcDIuY2VzbmV0LmN6MIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQC+Q9oT1doCHIBxlNtPhsfVhfTUAQ8EcBnbOZeNRpcabQ4v
-Xvb65ji2Wgis3LDvr1oin0u1i5kTI35bi8nHjRYIfTtPwv+eXVEjsHbR+kDymmo+
-NeRT19ogZlNjslL2CZKtpb9b1cabIgco6rPWOo42CPiMGhp3pmTZD50MwrZS5wID
-AQABo4IBmDCCAZQwDgYDVR0PAQH/BAQDAgWgMBkGA1UdIAQSMBAwDgYMKwYBBAG+
-eQECAgIAMBgGA1UdEQQRMA+CDXNwMi5jZXNuZXQuY3owggELBgNVHR8EggECMIH/
-MFqgWKBWpFQwUjESMBAGCgmSJomT8ixkARkWAmN6MRkwFwYKCZImiZPyLGQBGRYJ
-Y2VzbmV0LWNhMRIwEAYDVQQDEwlDRVNORVQgQ0ExDTALBgNVBAMTBENSTDUwgaCg
-gZ2ggZqGQmh0dHA6Ly93d3cuY2VzbmV0LmN6L3BraS9jcmwvY249Q0VTTkVUJTIw
-Q0EsZGM9Y2VzbmV0LWNhLGRjPWN6LmNybIZUbGRhcDovL2xkYXAuY2VzbmV0LWNh
-LmN6L2NuPUNFU05FVCUyMENBLGRjPWNlc25ldC1jYSxkYz1jej9jZXJ0aWZpY2F0
-ZVJldm9jYXRpb25MaXN0MB8GA1UdIwQYMBaAFC9sBcNRJqyvOZw+ODXdUikngMX1
-MB0GA1UdDgQWBBSo9Hnbvg5HchstLUwj8kkBHA88HDANBgkqhkiG9w0BAQUFAAOC
-AQEAgbnrp/sPF76DlC2Ehll9I417XOnOZdW3C1rKcZSh9vm6tonse21pBVC4799H
-Ajy4i22AbIg37N9Wh7sfUf0pZbuen4Eo6PEdUTQhIsJTAp/Dpp7WlQwjDRSUCTS7
-PyqPHKHCacSogDCwilylgBvD/VokryJKWce4cIr2YT09+uMCCIqHNYcihDEBOdGM
-0S1uFcV7bUeHtXqvDfWeSaU0XgraSZvSuDGu1S5BkKvg3GbaYlakjEZce6g1GQsA
-035XrYOVM4U3+W/C8SuxS47R31SGE1xsBWbwz6EPhUK1/SFAoAPDZ5P1aeuugcEX
-OdbkmjrpK8okfqGw+9V2Sgk08Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp2.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp2.cesnet.cz,O=CESNET,DC=cesnet-ca,DC=cz</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELzCCAxegAwIBAgIEQrOJWDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
-LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
-U05FVCBDQTAeFw0xMDAyMjIwOTU5MzFaFw0xMTAzMjIxMDI5MzFaMFgxEjAQBgoJ
-kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEPMA0GA1UE
-ChMGQ0VTTkVUMRYwFAYDVQQDEw1zcDIuY2VzbmV0LmN6MIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQC+Q9oT1doCHIBxlNtPhsfVhfTUAQ8EcBnbOZeNRpcabQ4v
-Xvb65ji2Wgis3LDvr1oin0u1i5kTI35bi8nHjRYIfTtPwv+eXVEjsHbR+kDymmo+
-NeRT19ogZlNjslL2CZKtpb9b1cabIgco6rPWOo42CPiMGhp3pmTZD50MwrZS5wID
-AQABo4IBmDCCAZQwDgYDVR0PAQH/BAQDAgWgMBkGA1UdIAQSMBAwDgYMKwYBBAG+
-eQECAgIAMBgGA1UdEQQRMA+CDXNwMi5jZXNuZXQuY3owggELBgNVHR8EggECMIH/
-MFqgWKBWpFQwUjESMBAGCgmSJomT8ixkARkWAmN6MRkwFwYKCZImiZPyLGQBGRYJ
-Y2VzbmV0LWNhMRIwEAYDVQQDEwlDRVNORVQgQ0ExDTALBgNVBAMTBENSTDUwgaCg
-gZ2ggZqGQmh0dHA6Ly93d3cuY2VzbmV0LmN6L3BraS9jcmwvY249Q0VTTkVUJTIw
-Q0EsZGM9Y2VzbmV0LWNhLGRjPWN6LmNybIZUbGRhcDovL2xkYXAuY2VzbmV0LWNh
-LmN6L2NuPUNFU05FVCUyMENBLGRjPWNlc25ldC1jYSxkYz1jej9jZXJ0aWZpY2F0
-ZVJldm9jYXRpb25MaXN0MB8GA1UdIwQYMBaAFC9sBcNRJqyvOZw+ODXdUikngMX1
-MB0GA1UdDgQWBBSo9Hnbvg5HchstLUwj8kkBHA88HDANBgkqhkiG9w0BAQUFAAOC
-AQEAgbnrp/sPF76DlC2Ehll9I417XOnOZdW3C1rKcZSh9vm6tonse21pBVC4799H
-Ajy4i22AbIg37N9Wh7sfUf0pZbuen4Eo6PEdUTQhIsJTAp/Dpp7WlQwjDRSUCTS7
-PyqPHKHCacSogDCwilylgBvD/VokryJKWce4cIr2YT09+uMCCIqHNYcihDEBOdGM
-0S1uFcV7bUeHtXqvDfWeSaU0XgraSZvSuDGu1S5BkKvg3GbaYlakjEZce6g1GQsA
-035XrYOVM4U3+W/C8SuxS47R31SGE1xsBWbwz6EPhUK1/SFAoAPDZ5P1aeuugcEX
-OdbkmjrpK8okfqGw+9V2Sgk08Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">CESNET Test SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Shows available attributes and assertions</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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="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"/>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET, a. l. e.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ivan</md:GivenName>
-    <md:SurName>Novakov</md:SurName>
-    <md:EmailAddress>novakoi@fel.cvut.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.h-da.de.xml b/swamid-interfederations-2.0/sso.h-da.de.xml
deleted file mode 100644
index 62364425..00000000
--- a/swamid-interfederations-2.0/sso.h-da.de.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.h-da.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">h-da.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.h-da.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.h-da.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.h-da.de,OU=IT Dienste und Anwendungen,O=Hochschule Darmstadt,L=Darmstadt,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIED+fPjDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTESMBAGA1UEBxMJRGFybXN0YWR0MR0wGwYDVQQKExRIb2Noc2NodWxlIERhcm1z
-dGFkdDEdMBsGA1UEAxMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxGjAYBgkqhkiG9w0B
-CQEWC3BraUBoLWRhLmRlMB4XDTEwMDQxNjEyMDMwOVoXDTE1MDQxNTEyMDMwOVow
-gYwxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEjAQBgNVBAcTCURhcm1z
-dGFkdDEdMBsGA1UEChMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxIzAhBgNVBAsTGklU
-IERpZW5zdGUgdW5kIEFud2VuZHVuZ2VuMRQwEgYDVQQDEwtzc28uaC1kYS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALho1XOuYt0eezN7Owx/u0do
-8nUmRpg3miPFagplAxlBu+0vYPANmGQLxsOjbLifMjhY35roo7z04/wxjSwEGNXE
-ukcLO5uOsnJvc9CANKm6Nx9qkOynibBBoGwb73zOqcPeMVp6QMKSWM4jOMLxCH3o
-Zd8jG6n0B0/WyfRQuTVIZ+Mwgn/oZ++QmjAVqrCassJxKGzNPnRfWPilXNiM4G+V
-UT5JK7aQ2vkvgMhEUV/gIfUXXVIBboub9JIP4k9NT1AXr7f7+IX7h+k86RryGhLT
-IaNZ1HFRCn7bN8AYFay241XsL2Yl0VzpqFVDwT8W1gnZg2pRBT0yeprvAOsefiEC
-AwEAAaOCAcUwggHBMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTT3Qx3x18q3OqGcLbuLr58v87ecDAfBgNVHSME
-GDAWgBQKDoQ4bwTmT/fB6I4U3TF6WrzRtDAdBgNVHREEFjAUgRJpdC1zZXJ2aWNl
-QGgtZGEuZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZGFybXN0YWR0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWRhcm1z
-dGFkdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKYP9aJIzChxgBWmXDROeMAKoU/G+eMGeWdm09yQY5GdMzNgPI/b4ZqNjfylMxZe
-TJfLTWaFnJ2cfJIpQjVjxHQBb7wg9gJk08eV5zCd87X/nF2LaHC6bRpTx75DyrtJ
-tnVQIUMNHjp/M4PpDISKhQS5lq4hbXFdXwLnWXe/+el9Pg5fhHAEJ0L5Hr1S+RZL
-igHalo/X6u+rFbbNSYS0dwZ6VkHWRHwIYh2kbwBAYr9C8ViH0KcfzBj2oNrpYJ6x
-Cb6PxneOxz8QjILptZIoj/4wjFJRzdJoFWrOZN16klKT8RrYdYxr2pz/FK24nmam
-e2RPyqbv/NPwrY+7bVC0ulE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.h-da.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.h-da.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.h-da.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.h-da.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.h-da.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.h-da.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">h-da.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.h-da.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.h-da.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.h-da.de,OU=IT Dienste und Anwendungen,O=Hochschule Darmstadt,L=Darmstadt,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIED+fPjDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTESMBAGA1UEBxMJRGFybXN0YWR0MR0wGwYDVQQKExRIb2Noc2NodWxlIERhcm1z
-dGFkdDEdMBsGA1UEAxMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxGjAYBgkqhkiG9w0B
-CQEWC3BraUBoLWRhLmRlMB4XDTEwMDQxNjEyMDMwOVoXDTE1MDQxNTEyMDMwOVow
-gYwxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEjAQBgNVBAcTCURhcm1z
-dGFkdDEdMBsGA1UEChMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxIzAhBgNVBAsTGklU
-IERpZW5zdGUgdW5kIEFud2VuZHVuZ2VuMRQwEgYDVQQDEwtzc28uaC1kYS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALho1XOuYt0eezN7Owx/u0do
-8nUmRpg3miPFagplAxlBu+0vYPANmGQLxsOjbLifMjhY35roo7z04/wxjSwEGNXE
-ukcLO5uOsnJvc9CANKm6Nx9qkOynibBBoGwb73zOqcPeMVp6QMKSWM4jOMLxCH3o
-Zd8jG6n0B0/WyfRQuTVIZ+Mwgn/oZ++QmjAVqrCassJxKGzNPnRfWPilXNiM4G+V
-UT5JK7aQ2vkvgMhEUV/gIfUXXVIBboub9JIP4k9NT1AXr7f7+IX7h+k86RryGhLT
-IaNZ1HFRCn7bN8AYFay241XsL2Yl0VzpqFVDwT8W1gnZg2pRBT0yeprvAOsefiEC
-AwEAAaOCAcUwggHBMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTT3Qx3x18q3OqGcLbuLr58v87ecDAfBgNVHSME
-GDAWgBQKDoQ4bwTmT/fB6I4U3TF6WrzRtDAdBgNVHREEFjAUgRJpdC1zZXJ2aWNl
-QGgtZGEuZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZGFybXN0YWR0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWRhcm1z
-dGFkdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKYP9aJIzChxgBWmXDROeMAKoU/G+eMGeWdm09yQY5GdMzNgPI/b4ZqNjfylMxZe
-TJfLTWaFnJ2cfJIpQjVjxHQBb7wg9gJk08eV5zCd87X/nF2LaHC6bRpTx75DyrtJ
-tnVQIUMNHjp/M4PpDISKhQS5lq4hbXFdXwLnWXe/+el9Pg5fhHAEJ0L5Hr1S+RZL
-igHalo/X6u+rFbbNSYS0dwZ6VkHWRHwIYh2kbwBAYr9C8ViH0KcfzBj2oNrpYJ6x
-Cb6PxneOxz8QjILptZIoj/4wjFJRzdJoFWrOZN16klKT8RrYdYxr2pz/FK24nmam
-e2RPyqbv/NPwrY+7bVC0ulE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.h-da.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.h-da.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Darmstadt</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Darmstadt, University of Applied Sciences</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.h-da.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Service Desk</GivenName>
-    <SurName>IT-Dienste und -Anwendungen</SurName>
-    <EmailAddress>it-service@h-da.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Service Desk</GivenName>
-    <SurName>IT-Dienste und -Anwendungen</SurName>
-    <EmailAddress>it-service@h-da.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl.xml b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
index 7d8100ce..a18527b0 100644
--- a/swamid-interfederations-2.0/sso.man.poznan.pl.xml
+++ b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.man.poznan.pl/pozman/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-02-22T14:05:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-03-13T14:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/sso.siropglobal.org.xml b/swamid-interfederations-2.0/sso.siropglobal.org.xml
index 0c5356b3..1a7bd13c 100644
--- a/swamid-interfederations-2.0/sso.siropglobal.org.xml
+++ b/swamid-interfederations-2.0/sso.siropglobal.org.xml
@@ -60,8 +60,14 @@ DP4gOoktkZlkyPT0AUi/samZ1GKtYrOGd9Z1/7fLlYYeFyA1QdFbBX5qxPM=
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">SWITCH</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.switch.ch/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Andreas</GivenName>
diff --git a/swamid-interfederations-2.0/sso.uni-passau.de.xml b/swamid-interfederations-2.0/sso.uni-passau.de.xml
deleted file mode 100644
index 6ffe373c..00000000
--- a/swamid-interfederations-2.0/sso.uni-passau.de.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.uni-passau.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-passau.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.uni-passau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.uni-passau.de,OU=Rechenzentrum,O=Universitaet Passau,L=Passau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIEEGjaiTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-REUxDzANBgNVBAcTBlBhc3NhdTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IFBhc3Nh
-dTEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTElMCMGA1UEAxMcVW5pdmVyc2l0YWV0
-IFBhc3NhdSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTY2FAcnoudW5pLXBhc3Nh
-dS5kZTAeFw0xMDA3MjMwOTEyMjZaFw0xMjA3MjIwOTEyMjZaMHAxCzAJBgNVBAYT
-AkRFMQ8wDQYDVQQHEwZQYXNzYXUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBQYXNz
-YXUxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xGjAYBgNVBAMTEXNzby51bmktcGFz
-c2F1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1aBBI4P4qYFf
-wg+NkT6Fgt1vlFdQr4Mh9kpB6Vf8N88Y5P9auQ5aen2FvtXboTuofjzDgOecee5L
-fOIjJ/n2am/DurFy3z49N61vUJIXZvxcepKWCPJiGO+5ad+SXziXzxXcgr6SLhlD
-3awAgxA6xZ5rsI8GZCDEt2rq8RlZ3AugZSFGJmRmxx5WYwB7nF269dwUlice3uqa
-PazFFxrPYLcKK0fYpfWOMOR4jArxeOudgo1LAoEOsL+SNUhVpFdC+oO99sC2NJqE
-FuRB9DLWXeXIRSQ3NAJ6u6bZNBl3aJ2k+97H6eN6Y+yqUf78t4qH4dEb6kObzRSZ
-+mhxVLlqYwIDAQABo4IBnDCCAZgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYD
-VR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUWkamZ0Mu69OevdM8ClQ4tPG4n
-MB8GA1UdIwQYMBaAFAmx36HoYV2hzcb0g3k6LAYMjOwIMIGFBgNVHR8EfjB8MDyg
-OqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1wYXNzYXUtY2EvcHViL2Ny
-bC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXBh
-c3NhdS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYI
-KwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAFPipp6pIli1YSCIIB+jEBczNDGHd548bCsE7QBUqGhL
-gZZDe46FsL0x52+if9cg0xl4nc30JzW6lLomAzS8RjzVLlMEFoSXgjgzGXxwRQT8
-L+sy1OhLCTF1p2sa13XRGzOJv1LuDAFU794dtzrSHKatFMT+GGuiqnSKQNEholz0
-uTZoXPNywDXwil6umH7KgRACyRhWjz0nC7see0IsGlTF5hc5vNUNkAfFFdBgigW8
-kU7vVI5si/HKKkRlbq6C+XjnivYYCjxLH6ivSNfqec74E8vZiA8WWGY3+oV7ByIx
-JjVhmR1NGFw53eiX+uNeaKgzqov9ufCtnPqN2yo0/iw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.uni-passau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.uni-passau.de,OU=Rechenzentrum,O=Universitaet Passau,L=Passau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIEEGjaiTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-REUxDzANBgNVBAcTBlBhc3NhdTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IFBhc3Nh
-dTEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTElMCMGA1UEAxMcVW5pdmVyc2l0YWV0
-IFBhc3NhdSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTY2FAcnoudW5pLXBhc3Nh
-dS5kZTAeFw0xMDA3MjMwOTEyMjZaFw0xMjA3MjIwOTEyMjZaMHAxCzAJBgNVBAYT
-AkRFMQ8wDQYDVQQHEwZQYXNzYXUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBQYXNz
-YXUxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xGjAYBgNVBAMTEXNzby51bmktcGFz
-c2F1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1aBBI4P4qYFf
-wg+NkT6Fgt1vlFdQr4Mh9kpB6Vf8N88Y5P9auQ5aen2FvtXboTuofjzDgOecee5L
-fOIjJ/n2am/DurFy3z49N61vUJIXZvxcepKWCPJiGO+5ad+SXziXzxXcgr6SLhlD
-3awAgxA6xZ5rsI8GZCDEt2rq8RlZ3AugZSFGJmRmxx5WYwB7nF269dwUlice3uqa
-PazFFxrPYLcKK0fYpfWOMOR4jArxeOudgo1LAoEOsL+SNUhVpFdC+oO99sC2NJqE
-FuRB9DLWXeXIRSQ3NAJ6u6bZNBl3aJ2k+97H6eN6Y+yqUf78t4qH4dEb6kObzRSZ
-+mhxVLlqYwIDAQABo4IBnDCCAZgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYD
-VR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUWkamZ0Mu69OevdM8ClQ4tPG4n
-MB8GA1UdIwQYMBaAFAmx36HoYV2hzcb0g3k6LAYMjOwIMIGFBgNVHR8EfjB8MDyg
-OqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1wYXNzYXUtY2EvcHViL2Ny
-bC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXBh
-c3NhdS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYI
-KwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAFPipp6pIli1YSCIIB+jEBczNDGHd548bCsE7QBUqGhL
-gZZDe46FsL0x52+if9cg0xl4nc30JzW6lLomAzS8RjzVLlMEFoSXgjgzGXxwRQT8
-L+sy1OhLCTF1p2sa13XRGzOJv1LuDAFU794dtzrSHKatFMT+GGuiqnSKQNEholz0
-uTZoXPNywDXwil6umH7KgRACyRhWjz0nC7see0IsGlTF5hc5vNUNkAfFFdBgigW8
-kU7vVI5si/HKKkRlbq6C+XjnivYYCjxLH6ivSNfqec74E8vZiA8WWGY3+oV7ByIx
-JjVhmR1NGFw53eiX+uNeaKgzqov9ufCtnPqN2yo0/iw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uni-passau.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.uni-passau.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.uni-passau.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.uni-passau.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.uni-passau.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.uni-passau.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-passau.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.uni-passau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.uni-passau.de,OU=Rechenzentrum,O=Universitaet Passau,L=Passau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIEEGjaiTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-REUxDzANBgNVBAcTBlBhc3NhdTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IFBhc3Nh
-dTEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTElMCMGA1UEAxMcVW5pdmVyc2l0YWV0
-IFBhc3NhdSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTY2FAcnoudW5pLXBhc3Nh
-dS5kZTAeFw0xMDA3MjMwOTEyMjZaFw0xMjA3MjIwOTEyMjZaMHAxCzAJBgNVBAYT
-AkRFMQ8wDQYDVQQHEwZQYXNzYXUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBQYXNz
-YXUxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xGjAYBgNVBAMTEXNzby51bmktcGFz
-c2F1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1aBBI4P4qYFf
-wg+NkT6Fgt1vlFdQr4Mh9kpB6Vf8N88Y5P9auQ5aen2FvtXboTuofjzDgOecee5L
-fOIjJ/n2am/DurFy3z49N61vUJIXZvxcepKWCPJiGO+5ad+SXziXzxXcgr6SLhlD
-3awAgxA6xZ5rsI8GZCDEt2rq8RlZ3AugZSFGJmRmxx5WYwB7nF269dwUlice3uqa
-PazFFxrPYLcKK0fYpfWOMOR4jArxeOudgo1LAoEOsL+SNUhVpFdC+oO99sC2NJqE
-FuRB9DLWXeXIRSQ3NAJ6u6bZNBl3aJ2k+97H6eN6Y+yqUf78t4qH4dEb6kObzRSZ
-+mhxVLlqYwIDAQABo4IBnDCCAZgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYD
-VR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUWkamZ0Mu69OevdM8ClQ4tPG4n
-MB8GA1UdIwQYMBaAFAmx36HoYV2hzcb0g3k6LAYMjOwIMIGFBgNVHR8EfjB8MDyg
-OqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1wYXNzYXUtY2EvcHViL2Ny
-bC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXBh
-c3NhdS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYI
-KwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAFPipp6pIli1YSCIIB+jEBczNDGHd548bCsE7QBUqGhL
-gZZDe46FsL0x52+if9cg0xl4nc30JzW6lLomAzS8RjzVLlMEFoSXgjgzGXxwRQT8
-L+sy1OhLCTF1p2sa13XRGzOJv1LuDAFU794dtzrSHKatFMT+GGuiqnSKQNEholz0
-uTZoXPNywDXwil6umH7KgRACyRhWjz0nC7see0IsGlTF5hc5vNUNkAfFFdBgigW8
-kU7vVI5si/HKKkRlbq6C+XjnivYYCjxLH6ivSNfqec74E8vZiA8WWGY3+oV7ByIx
-JjVhmR1NGFw53eiX+uNeaKgzqov9ufCtnPqN2yo0/iw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.uni-passau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.uni-passau.de,OU=Rechenzentrum,O=Universitaet Passau,L=Passau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIEEGjaiTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-REUxDzANBgNVBAcTBlBhc3NhdTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IFBhc3Nh
-dTEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTElMCMGA1UEAxMcVW5pdmVyc2l0YWV0
-IFBhc3NhdSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTY2FAcnoudW5pLXBhc3Nh
-dS5kZTAeFw0xMDA3MjMwOTEyMjZaFw0xMjA3MjIwOTEyMjZaMHAxCzAJBgNVBAYT
-AkRFMQ8wDQYDVQQHEwZQYXNzYXUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBQYXNz
-YXUxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xGjAYBgNVBAMTEXNzby51bmktcGFz
-c2F1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1aBBI4P4qYFf
-wg+NkT6Fgt1vlFdQr4Mh9kpB6Vf8N88Y5P9auQ5aen2FvtXboTuofjzDgOecee5L
-fOIjJ/n2am/DurFy3z49N61vUJIXZvxcepKWCPJiGO+5ad+SXziXzxXcgr6SLhlD
-3awAgxA6xZ5rsI8GZCDEt2rq8RlZ3AugZSFGJmRmxx5WYwB7nF269dwUlice3uqa
-PazFFxrPYLcKK0fYpfWOMOR4jArxeOudgo1LAoEOsL+SNUhVpFdC+oO99sC2NJqE
-FuRB9DLWXeXIRSQ3NAJ6u6bZNBl3aJ2k+97H6eN6Y+yqUf78t4qH4dEb6kObzRSZ
-+mhxVLlqYwIDAQABo4IBnDCCAZgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYD
-VR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUWkamZ0Mu69OevdM8ClQ4tPG4n
-MB8GA1UdIwQYMBaAFAmx36HoYV2hzcb0g3k6LAYMjOwIMIGFBgNVHR8EfjB8MDyg
-OqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1wYXNzYXUtY2EvcHViL2Ny
-bC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXBh
-c3NhdS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYI
-KwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAFPipp6pIli1YSCIIB+jEBczNDGHd548bCsE7QBUqGhL
-gZZDe46FsL0x52+if9cg0xl4nc30JzW6lLomAzS8RjzVLlMEFoSXgjgzGXxwRQT8
-L+sy1OhLCTF1p2sa13XRGzOJv1LuDAFU794dtzrSHKatFMT+GGuiqnSKQNEholz0
-uTZoXPNywDXwil6umH7KgRACyRhWjz0nC7see0IsGlTF5hc5vNUNkAfFFdBgigW8
-kU7vVI5si/HKKkRlbq6C+XjnivYYCjxLH6ivSNfqec74E8vZiA8WWGY3+oV7ByIx
-JjVhmR1NGFw53eiX+uNeaKgzqov9ufCtnPqN2yo0/iw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uni-passau.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.uni-passau.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Passau</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Passau</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-passau.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthias</GivenName>
-    <SurName>Absmeier</SurName>
-    <EmailAddress>matthias.absmeier@uni-passau.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid.user.uu.se.xml b/swamid-interfederations-2.0/swamid.user.uu.se.xml
deleted file mode 100644
index 365a267f..00000000
--- a/swamid-interfederations-2.0/swamid.user.uu.se.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" entityID="https://swamid.user.uu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet (gammal)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University (old)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider 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://cas.user.uu.se/cas/om.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
-        <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>uu.se</mdui:DomainHint>
-        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
-        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
-        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
-        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
-        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
-        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
-M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
-BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
-u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
-W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
-Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
-gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
-L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
-kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
-qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
-HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
-Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
-lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
-L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUNUPiQemS9gt9uEtcjg7LzGzpAE0wDQYJKoZIhvcNAQEF 
-BQAwHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2UwHhcNMTMxMDAzMTQ1NzM4 
-WhcNMzMxMDAzMTQ1NzM4WjAcMRowGAYDVQQDExFzd2FtaWQudXNlci51dS5zZTCC 
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSNBRhfSDpWel0cB5BhM3mH 
-C3sFFXbGKWWhPxloLtDEGjc3vK14FLXjy0oft0QbELIevGeJkMaFQGU73iCjdkjo 
-5isUccGwJEIV/q/DpxlMs+CeROFPRIQhn+IfxA9/xFvH5roc1XY+Vpuo7fuKJJ+r 
-Wwm0Vf4jBMGdtvaLZp85Pkd1x0scXapFZub9Dv/jrPpsoz7IK4olQvudfcew0k4v 
-8H1eNV0bNiGmJ4c5AELhNdtmLdYgdzz2sxpkxwSQpGoFoB7oaz2n0efhrWYjPGnH 
-j7MpH4UCWoF9MGROV9sjee2tIrUdd08a//kx5TlMnPQVB2+lf1g1/PfGfA575nEC 
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3dhbWlkLnVzZXIudXUuc2WGKGh0dHBzOi8v 
-c3dhbWlkLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEmxaqhH 
-E6O+XLfObHbNKAQfzSnLMA0GCSqGSIb3DQEBBQUAA4IBAQCn1xxkIwx4Tz1R0jSA 
-482BHLA3Z/Hny61+4Pe3kYrudzGyCRbgplPc8JkpnsaC4nvcEOVDeywz1sbVRcGj 
-0i93GY3OqYrFWfyipP9dWIww4FgLbgmhA+XZ34/np4uRbDdIYbUZ8Ts/5a0DcsSw 
-z7cBR8v69ISF+1qKoNjeFdNTrLIAzc0cDQMcgWObmZRTPVd2nby9/NcJ3P1WCFf/ 
-IAZ52kMSTkRjnek7DL7XM7m1PCi/dsyVPJTLdVOqpIXov787qV4o2MC28Ff3ttsj 
-bFbyDFjmEF99CIb4dJ+HEYnxIWJzX+zzZoHkzpS4qDTM3nrq6GKak/Qoagyyn+z6 
-GP8s 
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
-M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
-BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
-u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
-W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
-Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
-gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
-L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
-kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
-qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
-HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
-Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
-lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
-L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUNUPiQemS9gt9uEtcjg7LzGzpAE0wDQYJKoZIhvcNAQEF 
-BQAwHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2UwHhcNMTMxMDAzMTQ1NzM4 
-WhcNMzMxMDAzMTQ1NzM4WjAcMRowGAYDVQQDExFzd2FtaWQudXNlci51dS5zZTCC 
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSNBRhfSDpWel0cB5BhM3mH 
-C3sFFXbGKWWhPxloLtDEGjc3vK14FLXjy0oft0QbELIevGeJkMaFQGU73iCjdkjo 
-5isUccGwJEIV/q/DpxlMs+CeROFPRIQhn+IfxA9/xFvH5roc1XY+Vpuo7fuKJJ+r 
-Wwm0Vf4jBMGdtvaLZp85Pkd1x0scXapFZub9Dv/jrPpsoz7IK4olQvudfcew0k4v 
-8H1eNV0bNiGmJ4c5AELhNdtmLdYgdzz2sxpkxwSQpGoFoB7oaz2n0efhrWYjPGnH 
-j7MpH4UCWoF9MGROV9sjee2tIrUdd08a//kx5TlMnPQVB2+lf1g1/PfGfA575nEC 
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3dhbWlkLnVzZXIudXUuc2WGKGh0dHBzOi8v 
-c3dhbWlkLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEmxaqhH 
-E6O+XLfObHbNKAQfzSnLMA0GCSqGSIb3DQEBBQUAA4IBAQCn1xxkIwx4Tz1R0jSA 
-482BHLA3Z/Hny61+4Pe3kYrudzGyCRbgplPc8JkpnsaC4nvcEOVDeywz1sbVRcGj 
-0i93GY3OqYrFWfyipP9dWIww4FgLbgmhA+XZ34/np4uRbDdIYbUZ8Ts/5a0DcsSw 
-z7cBR8v69ISF+1qKoNjeFdNTrLIAzc0cDQMcgWObmZRTPVd2nby9/NcJ3P1WCFf/ 
-IAZ52kMSTkRjnek7DL7XM7m1PCi/dsyVPJTLdVOqpIXov787qV4o2MC28Ff3ttsj 
-bFbyDFjmEF99CIb4dJ+HEYnxIWJzX+zzZoHkzpS4qDTM3nrq6GKak/Qoagyyn+z6 
-GP8s 
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet (gammal)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University (old)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <SurName>AKKA SAML2</SurName>
-    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/talli.funet.fi.xml b/swamid-interfederations-2.0/talli.funet.fi.xml
deleted file mode 100644
index e9aef664..00000000
--- a/swamid-interfederations-2.0/talli.funet.fi.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://talli.funet.fi/haka">
-  <md:SPSSODescriptor 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://talli.funet.fi/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
-        <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
-        <mdui:Keywords xml:lang="fi">testi attribuutit</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">test attributes</mdui:Keywords>
-      </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEPDCCAySgAwIBAgIRAPVZgYydDTblWmnoE8hJXtcwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDA0MzAwMDAwMDBaFw0xMjA0MjkyMzU5NTlaMIGbMQswCQYD
-VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
-BAcTBUVzcG9vMRYwFAYDVQQJEw1LZWlsYXJhbnRhIDE0MSkwJwYDVQQKEyBDU0Mg
-LSBJVCBDZW50ZXIgZm9yIFNjaWVuY2UgTHRkLjEXMBUGA1UEAxMOdGFsbGkuZnVu
-ZXQuZmkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANiaWHK6o5i9CNsvhO1Z
-EsN1t5tYVEKAkPbdj34A5nZbFuSrtU0ZDakqLuUTHKwYDuOHV7IQfl4Fw4hKNmGk
-T/AH2Sjt+yNSZVzjLBmn370XmqATPTu68Fe28/Gqcb/LR9LAKZ7n2Z/zQ/xvAG/G
-fRmvJyLsVAyuvYSvdijgagtVAgMBAAGjggFhMIIBXTAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUDoTAoTwuJwp/7XSVeIKYgnJeK7ow
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwGQYDVR0RBBIwEIIOdGFsbGkuZnVuZXQuZmkwDQYJ
-KoZIhvcNAQEFBQADggEBAFXKj9K3Z/RQRJxtVv3yuCxXgs8Xi/9pl6A6RSw7IBdI
-eszHLEBrz/vRRENHcNAVnZwGgfnXJItWZxbiKcRHfG2yFGXkG10fjPxdHwRjyksj
-hPwHefzkEK9b7rJmd+VlfHLGUULnlLIhwJmyaaMPP8wjkDiAk54jGW0Kk2ApdZy5
-I32nlIIGuRYJNa59txFY8lTULe6InHTJ0SBGAlSOaLEdRIL9nXxWYx+JFmV0s+Ag
-eEAH1RvfTsj/y527aKeZCRXGK8M8QBOJaA1VAE84H7qCBfB61q1jLPZJQqi/PpQt
-2KCOpM+WV/k5TYUAwOWgA4UPrRLjzevS2njKE5hC8h8=</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://talli.funet.fi/haka/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
-      <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"/>
-      <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"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
-      <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"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <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"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Arto</md:GivenName>
-    <md:SurName>Tuomi</md:SurName>
-    <md:EmailAddress>haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Lauros</md:SurName>
-    <md:EmailAddress>haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Kari</md:GivenName>
-    <md:SurName>Laalo</md:SurName>
-    <md:EmailAddress>kari.laalo@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-sp.aco.net.xml b/swamid-interfederations-2.0/test-sp.aco.net.xml
deleted file mode 100644
index 0640ab26..00000000
--- a/swamid-interfederations-2.0/test-sp.aco.net.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-sp.aco.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z"/>
-  </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://saml-test.aco.net/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test-sp.aco.net/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saml-test.aco.net/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test-sp.aco.net/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ACOnet Test Service Provider</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">ACOnet Test Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A SAML2 Service Provider available to all ACOnet Identity Federation members for testing purposes.</mdui:Description>
-        <mdui:Description xml:lang="de">Ein SAML2 Service Provider, der allen ACOnet Identity Federation Mitgliedern für Tests zur Verfügung steht.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://aai-wiki.univie.ac.at/SAML-Test</mdui:InformationURL>
-        <mdui:Logo height="60" width="234">https://www.aco.net/fileadmin/aconet/Logos/Banner/234x60.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAObaiwc63DWQMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3Rlc3Qtc3AuYWNvLm5ldDAeFw0wODA3MDkxMTQ1NTVaFw0xODA3MDcxMTQ1
-NTVaMBoxGDAWBgNVBAMTD3Rlc3Qtc3AuYWNvLm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALZXEDbiffZnDnsWcJlVUBlaAyEycf+0Bjg/DjsQAz4l
-vG9poVFKlPjaQCQCyk56PXhN0ZuZZJEylHHfMrJvfM6bpylY/a+KFyeNi28acrlg
-u+BRx7uXg+wac0mfp9Z9nj93qQBP4iC7Lbv9AUDrHvp6ig/MF8P8sEb3VZRwwJDc
-x2fLuro/TueYcT0Xw3Y70vkjaAbkugjNE2pU3OL7TxgXx+qzsOmoPiWI61VgpSkm
-pmxsN1bjiKJs1sqQ/K3pQ9mcR6Mb5STShcpKf6ZqmuUD53oPeWyB03vmi0AzCXeU
-uGftaM2iWwhaxLApEE6cgxctR2lc91sQtoCo0B1FIMkCAwEAAaNhMF8wPgYDVR0R
-BDcwNYIPdGVzdC1zcC5hY28ubmV0hiJodHRwczovL3Rlc3Qtc3AuYWNvLm5ldC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTyPUKdsFFI3eqmI9OQsgaDw6e8fjANBgkqhkiG
-9w0BAQUFAAOCAQEAeD0OZAEjUr2RJFCbW820q0iG49x0jvL3lSvbYKaUY+4zthXj
-394fALks0blb7XceA857NfIXHn2NI9ZrHllmpTjc6IeD332c6NW8AevYjU+mwGuM
-ejLfUgi137jrXaP7jlGSL85aFIWTGoBT6IZu+qiVo8qbWY5EH+3gSIQYCYpfKuaJ
-6EbpYsqZ1tEg6tfUGJK4Ly87HHBCRNwDV9/85yGt+puwvjsPeaXELsGOpTaA8lGJ
-i0o8V/egkPa0mbqghudG9cwZluJCJSWxvxv7yersHIdedRwZyv7vSGu4FI4g39Km
-vNzoGHMHg8pOo6cx9Arah88V+SEsBxtCh3V9Fg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-test.aco.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-sp.aco.net/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-test.aco.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-test.aco.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-test.aco.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-test.aco.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</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:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-test.aco.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-sp.aco.net/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-test.aco.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-sp.aco.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-test.aco.net/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-sp.aco.net/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml-test.aco.net/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-sp.aco.net/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">ACOnet Test Service Provider</md:ServiceName>
-      <md:ServiceName xml:lang="de">ACOnet Test Service Provider</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">A SAML2 Service Provider available to all ACOnet Identity Federation members for testing purposes.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="de">Ein SAML2 Service Provider, der allen ACOnet Identity Federation Mitgliedern für Tests zur Verfügung steht.</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"/>
-      <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="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"/>
-      <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="displayName" 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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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="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"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">ACOnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ACOnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ACOnet</md:GivenName>
-    <md:SurName>Identity Federation Operator</md:SurName>
-    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>ACOnet</md:GivenName>
-    <md:SurName>Identity Federation Operator</md:SurName>
-    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ticket.iop.org.xml b/swamid-interfederations-2.0/ticket.iop.org.xml
deleted file mode 100644
index 0319a419..00000000
--- a/swamid-interfederations-2.0/ticket.iop.org.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ticket.iop.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ticket.iop.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ticket.iop.org,OU=Member\, VeriSign Trust Network,OU=Authenticated by VeriSign,OU=Terms of use at www.verisign.co.uk/rpa (c)05,O=IOP Publishing Ltd,L=Bristol,ST=Avon,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIQRs9QFKCMIHlnWILL+H/kMjANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTEwMzA5
-MDAwMDAwWhcNMTIwNDA2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
-BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
-IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
-ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
-JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
-AxQOdGlja2V0LmlvcC5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK0k
-vYlzSH7vvdi1wquPhBap5XOkZbXSTzxFauceC62qdw2xOwCJW+N8VPliT2bF0+Ic
-uqBRWXRoF7+z5aJWf7Zrq4XjxlJVd0TkiNGSXRY7IA7c2ciNPS8YP+iVrjoHcO0N
-9JFZkfuqnFdajf6exlCe0ZpW9Q/i9QUBglS8oeQhAgMBAAGjggHTMIIBzzAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZS
-U2VjdXJlLUczLWNybC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1Ud
-IAQ/MD0wOwYLYIZIAYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cu
-dmVyaXNpZ24uY28udWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAfBgNVHSMEGDAWgBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRq
-MGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEF
-BQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNl
-Y3VyZUczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYw
-ITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9n
-by52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBABp/
-vWyJLNePxfNv1kLP9w2F5O6vpJr/y4NuH/Wv5LpJinN9KZ6Jht7zC2g7VaGvA75+
-bb95cQ43uJ8KpOMmsaQ4vapwAZLxW/twUMUh2qbUmlmBnkKBPNZxzCRcNmhKOAfe
-ngqzUjEo/eZpsFfuvg9d/9L1od5kDfGFr4OFeN+Tin7zHoKbRv129NyIwLhaSixA
-t7LgIqlDQ4PRHCg0YWsE1CBSzSy+nWgDmWjcRIYeFoXve+wpsup3gtoBcxSKp6R5
-Zo/W8ldI1Yak/Rkmn/73b1cGG0uqRDWfOHiswnes/xjDIQS9qqJRlNFHd9jkHxwb
-Ny/fu2lNRrmtoPmTctI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ticket.iop.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ticket.iop.org,OU=Member\, VeriSign Trust Network,OU=Authenticated by VeriSign,OU=Terms of use at www.verisign.co.uk/rpa (c)05,O=IOP Publishing Ltd,L=Bristol,ST=Avon,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIQRs9QFKCMIHlnWILL+H/kMjANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTEwMzA5
-MDAwMDAwWhcNMTIwNDA2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
-BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
-IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
-ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
-JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
-AxQOdGlja2V0LmlvcC5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK0k
-vYlzSH7vvdi1wquPhBap5XOkZbXSTzxFauceC62qdw2xOwCJW+N8VPliT2bF0+Ic
-uqBRWXRoF7+z5aJWf7Zrq4XjxlJVd0TkiNGSXRY7IA7c2ciNPS8YP+iVrjoHcO0N
-9JFZkfuqnFdajf6exlCe0ZpW9Q/i9QUBglS8oeQhAgMBAAGjggHTMIIBzzAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZS
-U2VjdXJlLUczLWNybC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1Ud
-IAQ/MD0wOwYLYIZIAYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cu
-dmVyaXNpZ24uY28udWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAfBgNVHSMEGDAWgBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRq
-MGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEF
-BQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNl
-Y3VyZUczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYw
-ITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9n
-by52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBABp/
-vWyJLNePxfNv1kLP9w2F5O6vpJr/y4NuH/Wv5LpJinN9KZ6Jht7zC2g7VaGvA75+
-bb95cQ43uJ8KpOMmsaQ4vapwAZLxW/twUMUh2qbUmlmBnkKBPNZxzCRcNmhKOAfe
-ngqzUjEo/eZpsFfuvg9d/9L1od5kDfGFr4OFeN+Tin7zHoKbRv129NyIwLhaSixA
-t7LgIqlDQ4PRHCg0YWsE1CBSzSy+nWgDmWjcRIYeFoXve+wpsup3gtoBcxSKp6R5
-Zo/W8ldI1Yak/Rkmn/73b1cGG0uqRDWfOHiswnes/xjDIQS9qqJRlNFHd9jkHxwb
-Ny/fu2lNRrmtoPmTctI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">IOP online services</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">IOP online services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.iop.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Haworth</SurName>
-    <EmailAddress>peter.haworth@iop.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Matt</GivenName>
-    <SurName>Keen</SurName>
-    <EmailAddress>matthew.keen@iop.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Keith</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>keith.jones@iop.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/translation.rnd.feide.no.xml b/swamid-interfederations-2.0/translation.rnd.feide.no.xml
deleted file mode 100644
index b88dfb39..00000000
--- a/swamid-interfederations-2.0/translation.rnd.feide.no.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://translation.rnd.feide.no/simplesaml/saml2/sp/metadata.php">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://translation.rnd.feide.no/simplesaml/saml2/sp/SingleLogoutService.php"/>
-    <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://translation.rnd.feide.no/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Feide RnD Translation Portal</md:ServiceName>
-      <md:ServiceName xml:lang="no">Feide RnD Oversettelsesportal</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">A web portal for translation of software developed by Feide RnD, such that simpleSAMLphp and Foodle.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">En portal hvor man kan bidra med oversettelse av programvare utviklet av Feide RnD, slik som simpleSAMLphp og Foodle.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-adfs.geant.net.xml b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
index ce2d4926..fdee8bc4 100644
--- a/swamid-interfederations-2.0/uat-adfs.geant.net.xml
+++ b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
@@ -9,6 +9,12 @@
     </mdrpi:RegistrationInfo>
   </Extensions>
   <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT ADFS (User Acceptance Test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Active Directory Federation Service (UAT) for GÉANT Intranet.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
     <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
@@ -126,6 +132,19 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-adfs.geant.net/adfs/ls/" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">GÉANT ADFS (User Acceptance Test)</ServiceName>
+      <ServiceDescription xml:lang="en">Active Directory Federation Service (UAT) for GÉANT Intranet.</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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"/>
+      <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="false"/>
+      <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"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/via-idp.lanet.lv.xml b/swamid-interfederations-2.0/via-idp.lanet.lv.xml
deleted file mode 100644
index 8187d4db..00000000
--- a/swamid-interfederations-2.0/via-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://via-idp.lanet.lv">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
-IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
-FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
-ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
-yOWlzJ0viw82thKw8EOzYCZZMFDK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
-IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
-FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
-ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
-yOWlzJ0viw82thKw8EOzYCZZMFDK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://via-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://via-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">LAIFE - VIA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ventspils University College - VIA IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.venta.lv/</OrganizationURL>
-  </Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.card.kilroy.eu.xml b/swamid-interfederations-2.0/wayf.card.kilroy.eu.xml
new file mode 100644
index 00000000..982ad3d1
--- /dev/null
+++ b/swamid-interfederations-2.0/wayf.card.kilroy.eu.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.card.kilroy.eu/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIDBzsnMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTIwNzAzMDgwOTA4WhcNMTUwNzA2MTc1NDEyWjCBwjEpMCcGA1UEBRMgd1RxM1dxT29VbXM3LzdCNGZwTGlmRG5aZzY0UXlmd0oxEzARBgNVBAsTCkdUNDYwOTc1MjAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRwwGgYDVQQDExN3YXlmLmNhcmQua2lscm95LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9fd2gHID42NGr4JlilVuhYe8FvUcJP2Yh5o84ORh6C+xrJ3KAhfwpngAvsk5rdK4BckqVU1dVVWfd4+4QRiyA+1y2BifhsGlJ+eYqrjLN1sbIYz0Yn/LxXzPJ0iDNOOaPLbv4pu5vD7Sz6HFoLjm9KTFatuodLgHODaJnApCbsmBkus+XMcLeeLl6vN+YHmXtyw+IcbrO1OBGEObPONZ0UAEelRwKv72ZfsSPUsdNW+Y07xctbTZ6YlEu0wYKUjDn73zYlc5mdujqS5yR457EnpYeLXNCFkQkdGGbMP06eCqFJ1yyMPOsNww4kMkQnzrnTI0xxAp/9xf1vBQm7bPQIDAQABo4IBrjCCAaowHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAeBgNVHREEFzAVghN3YXlmLmNhcmQua2lscm95LmV1MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBSHTlIt4wQMdYb46vD06/5hog1U4zAMBgNVHRMBAf8EAjAAMHgGCCsGAQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2VvdHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3RydXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwDQYJKoZIhvcNAQEFBQADggEBAFH0+k/LHg5e8KkhwsTEtI3ZOiG/6ZMrdB0wyJhO4dr5iEHgyKYe4ZpEu4/FP0Gx63CFid7oR48ukuT5pJS+FcT9GXZwCmO9X2Jyir45MTksKP5QjAz538JUoc5KmodgJIUw7/JIIYbHGGnlEHB18MrjnPJIDUU3hPAenbxgnQNnjUKFUkKMH+iiFmnyOlqvQDG7HGkMlWEnLNrO1+Xl4nfNJ4wLwUDxJmfRuv8NKgL+xFC2CsRsC5AiRH9j+r75ax3lES9jao/1LzcA3XZGnNneXXlHqS6NBwOKgbjBbT8zwYZj5yTVw51YBUufFyB5iGR4gKUaBaXfs5yBorr4pJM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIDBzsnMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTIwNzAzMDgwOTA4WhcNMTUwNzA2MTc1NDEyWjCBwjEpMCcGA1UEBRMgd1RxM1dxT29VbXM3LzdCNGZwTGlmRG5aZzY0UXlmd0oxEzARBgNVBAsTCkdUNDYwOTc1MjAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRwwGgYDVQQDExN3YXlmLmNhcmQua2lscm95LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9fd2gHID42NGr4JlilVuhYe8FvUcJP2Yh5o84ORh6C+xrJ3KAhfwpngAvsk5rdK4BckqVU1dVVWfd4+4QRiyA+1y2BifhsGlJ+eYqrjLN1sbIYz0Yn/LxXzPJ0iDNOOaPLbv4pu5vD7Sz6HFoLjm9KTFatuodLgHODaJnApCbsmBkus+XMcLeeLl6vN+YHmXtyw+IcbrO1OBGEObPONZ0UAEelRwKv72ZfsSPUsdNW+Y07xctbTZ6YlEu0wYKUjDn73zYlc5mdujqS5yR457EnpYeLXNCFkQkdGGbMP06eCqFJ1yyMPOsNww4kMkQnzrnTI0xxAp/9xf1vBQm7bPQIDAQABo4IBrjCCAaowHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAeBgNVHREEFzAVghN3YXlmLmNhcmQua2lscm95LmV1MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBSHTlIt4wQMdYb46vD06/5hog1U4zAMBgNVHRMBAf8EAjAAMHgGCCsGAQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2VvdHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3RydXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwDQYJKoZIhvcNAQEFBQADggEBAFH0+k/LHg5e8KkhwsTEtI3ZOiG/6ZMrdB0wyJhO4dr5iEHgyKYe4ZpEu4/FP0Gx63CFid7oR48ukuT5pJS+FcT9GXZwCmO9X2Jyir45MTksKP5QjAz538JUoc5KmodgJIUw7/JIIYbHGGnlEHB18MrjnPJIDUU3hPAenbxgnQNnjUKFUkKMH+iiFmnyOlqvQDG7HGkMlWEnLNrO1+Xl4nfNJ4wLwUDxJmfRuv8NKgL+xFC2CsRsC5AiRH9j+r75ax3lES9jao/1LzcA3XZGnNneXXlHqS6NBwOKgbjBbT8zwYZj5yTVw51YBUufFyB5iGR4gKUaBaXfs5yBorr4pJM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <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-Artifact" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">ISIC – Student Verification Service</md:ServiceName>
+      <md:ServiceName xml:lang="da">ISIC – Student Verification Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to verify that you are a student</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at verificere at du er studerende</md:ServiceDescription>
+      <md:RequestedAttribute 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.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Webmaster</md:GivenName>
+    <md:EmailAddress>jesper@accedo.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/web.tut.fi.xml b/swamid-interfederations-2.0/web.tut.fi.xml
deleted file mode 100644
index d307e284..00000000
--- a/swamid-interfederations-2.0/web.tut.fi.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:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://web.tut.fi/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQAJccxEo2duCHcGqbD4x1ezANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMTIxMzAwMDAwMFoXDTEzMTIxMjIzNTk1OVowgbkxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUzMzcyMDESMBAGA1UECBMJUGlya2FubWFhMRAwDgYD
-VQQHEwdUYW1wZXJlMRwwGgYDVQQJExNLb3JrZWFrb3VsdW5rYXR1IDEwMSkwJwYD
-VQQKEyBUYW1wZXJlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neTEWMBQGA1UECxMN
-VGlldG9oYWxsaW50bzETMBEGA1UEAxMKd2ViLnR1dC5maTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMwuC5ZzOZGbCpzsmKNIBH1rkRQRFRnh1MCO9Yj1
-1SswE4yLjA6dETebXoTMrwJb/v7uDVmv7NY33vUDolPxenXmMcfBqLfQI46MPaiV
-0cKAu0RvPHtpmTghnzFZOg4hGvYIAIT1zPkYywg7U4VFyMtJPnPnlOJeHhbh91vT
-TT37n5Fmh9RWUQJsxzfSQmE3xMVNgnPFBe84Pa+rNTbix24MgmV2hgchSuTFBaEq
-MS3Pba1SJETJ1bZcERyJNLTO8m80BuYZrBYuBjheYfQ23jf1Gy/LLgK9yZJNH9ll
-CnMoQfltT+QkOLy84GHbiEVAXzPfrAmqbZOGcHTt3Q7cAOsCAwEAAaOCAV0wggFZ
-MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRs64Sa
-dKhtvd/JVXh5Bnp6NTaw6DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
-AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAVBgNVHREEDjAMggp3
-ZWIudHV0LmZpMA0GCSqGSIb3DQEBBQUAA4IBAQBGpKYnuWg/2lN/WYKM/APV44DW
-7Unb8uV40JE2HIpcTXmbgIf/QZJRyou3MxqJS8/f1C4KGDvrWxMqJbWZIO1FGbtL
-4ghjMFfeg68z7R7uj0Gfz4/pj69oSR5duW/9yBdNQ4igO3cAb+RRCRU4iR1s7oZe
-Pcv6EAzVSd8GmAVe6EwPpiAA5Zi/61nUCXU2SRfI2E35z7XgGo6z2enHQY8WQvMg
-b+GdlT/1WE0+6q1Z5/AzDXSjx9v2lW+NOmJ0/gSEaIo3DAMaL/K1d0Jv03nNTfBb
-00f/455XQUhcJwtLj063dTVgETHTo+6CZeqBbKQCclY/oOUvTOQdT4v+4E1k</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://web.tut.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Acrobat Connect Pro -verkkokokouspalvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">TUT Acrobat Connect Pro</md:ServiceName>
-      <md:ServiceName xml:lang="sv">TUT Acrobat Connect Pro</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">TTY:n verkkokokouspalvelu.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">TUT web conference service.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">TUT-tjansten for e-moten.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <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"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jussi</md:GivenName>
-    <md:SurName>Tirkkonen</md:SurName>
-    <md:EmailAddress>jussi.tirkkonen@tut.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml b/swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml
deleted file mode 100644
index b0488223..00000000
--- a/swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webapp.rz.rwth-aachen.de/partner/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>webapp.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=webapp.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMDCCBBigAwIBAgIEDFo21TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wODA1MjYxMzIx
-MTBaFw0xMzA1MjUxMzIxMTBaMIGgMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xITAfBgNVBAMTGHdlYmFwcC5yei5yd3RoLWFhY2hlbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAPSjax3nWhzo9FlrwXb6WuWOpuX1VPMdqqHe
-U3ZOJKfvyPi2wjkKprmQAWsOoyWEOa9VYs5xwu7EI0DxG2Ki1m05qTr2qksCJCxk
-o55adwXMKwQKVDFiPSCeBk9qxsITvgDZ1F9aO8V/8dNbXLZrezKyESAVOmcuyGnV
-oPERrHsr8YAHxLmxKVE4FA9u0Y74yrG553Ao22nQB+fsqUEmxGmGLIst6plyoh+5
-tzR5CYffYfLh1WWX9sU2fXBedxZaOhDhWgHjsXFHj+912PQQDHnb6CFZujc47XrD
-k59m3+7Y9dK1TG08OeDn55zSUDQE8xKyIMm7vdDn3FpjKhr1ynsCAwEAAaOCAbEw
-ggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
-BggrBgEFBQcDATAdBgNVHQ4EFgQUjd6b6RuCG2XWIbgH9w3zNRiukwUwHwYDVR0j
-BBgwFoAUbtU+wBwvcck8v0lO72pVSOzR8jgwIgYDVR0RBBswGYEXZW1haWxAcnou
-cnd0aC1hYWNoZW4uZGUweQYDVR0fBHIwcDA2oDSgMoYwaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yd3RoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDagNKAyhjBodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwgZQGCCsG
-AQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEAGCCsGAQUFBzAChjRodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQBch7KrzkvZa5c6AcG/Y3eoBAmfKapbtfwpwYL7
-S7LdavVaSkDTLsKzgAM0qh4bWKqLEVhQe1lrgsl3sW5cmwfiXtlU8U61anTauEzu
-di7TBr4j+ROORf8VL4lP1NBkb40h5KDr/VMwRJWRAOflOn8nfPyGr5Bs/Pb9Dl3O
-Cjgz2QtFsSHgtZQYOicHEVOL48mpj6I3Q/+aX/0YQQkJDabqrCZv1SL88pfK+zEz
-iGUx8gzfRwnOsLr3jqugUefXuyw95CfyqWwkKLOxxGe1A3xqGpOxtDD6GjGH2sbn
-DNDBTV9xM9Oxj0MtYNRc7iwF7p9RZMSy2SWQx045vlwRTIgU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>webapp.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=webapp.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMDCCBBigAwIBAgIEDFo21TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wODA1MjYxMzIx
-MTBaFw0xMzA1MjUxMzIxMTBaMIGgMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xITAfBgNVBAMTGHdlYmFwcC5yei5yd3RoLWFhY2hlbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAPSjax3nWhzo9FlrwXb6WuWOpuX1VPMdqqHe
-U3ZOJKfvyPi2wjkKprmQAWsOoyWEOa9VYs5xwu7EI0DxG2Ki1m05qTr2qksCJCxk
-o55adwXMKwQKVDFiPSCeBk9qxsITvgDZ1F9aO8V/8dNbXLZrezKyESAVOmcuyGnV
-oPERrHsr8YAHxLmxKVE4FA9u0Y74yrG553Ao22nQB+fsqUEmxGmGLIst6plyoh+5
-tzR5CYffYfLh1WWX9sU2fXBedxZaOhDhWgHjsXFHj+912PQQDHnb6CFZujc47XrD
-k59m3+7Y9dK1TG08OeDn55zSUDQE8xKyIMm7vdDn3FpjKhr1ynsCAwEAAaOCAbEw
-ggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
-BggrBgEFBQcDATAdBgNVHQ4EFgQUjd6b6RuCG2XWIbgH9w3zNRiukwUwHwYDVR0j
-BBgwFoAUbtU+wBwvcck8v0lO72pVSOzR8jgwIgYDVR0RBBswGYEXZW1haWxAcnou
-cnd0aC1hYWNoZW4uZGUweQYDVR0fBHIwcDA2oDSgMoYwaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yd3RoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDagNKAyhjBodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwgZQGCCsG
-AQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEAGCCsGAQUFBzAChjRodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQBch7KrzkvZa5c6AcG/Y3eoBAmfKapbtfwpwYL7
-S7LdavVaSkDTLsKzgAM0qh4bWKqLEVhQe1lrgsl3sW5cmwfiXtlU8U61anTauEzu
-di7TBr4j+ROORf8VL4lP1NBkb40h5KDr/VMwRJWRAOflOn8nfPyGr5Bs/Pb9Dl3O
-Cjgz2QtFsSHgtZQYOicHEVOL48mpj6I3Q/+aX/0YQQkJDabqrCZv1SL88pfK+zEz
-iGUx8gzfRwnOsLr3jqugUefXuyw95CfyqWwkKLOxxGe1A3xqGpOxtDD6GjGH2sbn
-DNDBTV9xM9Oxj0MtYNRc7iwF7p9RZMSy2SWQx045vlwRTIgU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">RWTH Aachen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">RWTH Aachen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rz.rwth-aachen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Wilfred</GivenName>
-    <SurName>Gasper</SurName>
-    <EmailAddress>gasper@rz.rwth-aachen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webinar.nordu.net.xml b/swamid-interfederations-2.0/webinar.nordu.net.xml
new file mode 100644
index 00000000..6a26a667
--- /dev/null
+++ b/swamid-interfederations-2.0/webinar.nordu.net.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webinar.nordu.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/WAYF/wayf.swamid.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/WAYF/idp.protectnetwork.org"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/nordu.net" index="3"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/DS/kalmar2"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>webinar.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=webinar.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAOOLN7U/T/soMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXdlYmluYXIubm9yZHUubmV0MB4XDTEyMTAxMTA3MzUzNloXDTIyMTAwOTA3
+MzUzNlowHDEaMBgGA1UEAxMRd2ViaW5hci5ub3JkdS5uZXQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCkHGDzNHGHWdCZ8xkrLKElxJmO1uWZ5+GAr46J
+4x+xYdhTUEHr1Jy+G6l+4SPFSV7wtXE5g5LWaLyWqb3zC5DeWRU9PNxGAZ6FcGMK
+6KM3ZAmvx/FmJnD1cDrAo3duI0qt9mr1bAZLv3JIRSXwKV77x5qRhfA6D2ZVXe+j
+J/TtrlqiSkAANNQZFF0lkyITi2WKkN/5nAW9NyqZVNYVcpl5+yilQ7W5wdBJQFg5
+i7vQT/1WvPlpPLB9xOK8mukf4q0EJk6Geqt0tLG4kPkTEWs4PAnyeB0z7kg8vemy
+0gKBj+1pB8TDz0LTx4fSN944UfnHmRKdQSQnCTdA6YbLKLQTAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXdlYmluYXIubm9yZHUubmV0MB0GA1UdDgQWBBQBb9YMEUHgM4WU
+OlNGdlSA6gB0ATANBgkqhkiG9w0BAQUFAAOCAQEAFBir0eA2EEqSQXEYjF0Zr3bs
+tbkwFFL05JuIliuHv6It9Cxo6D+/B0eylFvGQeC6lvH6l1DI8SreYrVsVu4NOMbP
+VcKD7hHqYQPIJAM7I68nwyQq6cTeydqZcwe16x6vnEk0v0QyURMAFlFotZtYAMhh
+M/V1YBDfNPXMh3BYl3g6lxG5qdqYbEoNXrnrMwV6N0BixrjBmoI7K2cEUWW9pwQ8
+rZSHynfzD3dUndFFJVNzwQKyGttlsQGxS0CL5jZS0cWz/p9uvOz+kf4CEqS9QA7o
+euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">NORDUnet Webinar Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NORDUnet Webinar Service (Adobe Connect)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" 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"/>
+      <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"/>
+      <md:RequestedAttribute 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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.dante.net.xml b/swamid-interfederations-2.0/weblogin.dante.net.xml
index b66841e4..fb049d55 100644
--- a/swamid-interfederations-2.0/weblogin.dante.net.xml
+++ b/swamid-interfederations-2.0/weblogin.dante.net.xml
@@ -9,6 +9,12 @@
     </mdrpi:RegistrationInfo>
   </Extensions>
   <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT ADFS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Active Directory Federation Service for GÉANT Intranet.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
     <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
@@ -82,6 +88,19 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.dante.net/adfs/ls/" index="0" isDefault="true"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogin.dante.net/adfs/ls/" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">GÉANT ADFS</ServiceName>
+      <ServiceDescription xml:lang="en">Active Directory Federation Service for GÉANT Intranet.</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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"/>
+      <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="false"/>
+      <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"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/weblogin.uu.se.xml b/swamid-interfederations-2.0/weblogin.uu.se.xml
new file mode 100644
index 00000000..494acfcc
--- /dev/null
+++ b/swamid-interfederations-2.0/weblogin.uu.se.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblogin.uu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider 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 height="125" width="125">https://weblogin.uu.se/uu_img/uulogo_lightgrey.gif</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:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>uu.se</mdui:DomainHint>
+        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
+        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
+        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
+        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
+        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
+        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
+        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
+DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNjYagdexM5SeQsnG410D2/9el0tGH
+FL+LaDPQ2nLVWAMfYrn0PfEQ7WGG4Glpi1cAjIAG5Qq/8e05shDQ2dRFNx95wfL6
+245X3Hgroqmg4ki6VX0WOwcrBYKybRgQ6Ba9qQuhzFp1yBzD+3XlBmfOClKYkdt0
+wYsYKoA+CvmVIyy22SCh0b4qCsr+gCeCZan3zUsfQrV4Xo6aYVye+eXzZFrICwxG
+Ni8s6xfaxjL6xMEoV2ZqiRa8FUiOQBENxLRA0bGU6JuGT5i9hFu4HliRlnj3h98+
+EEb0QWDf2yrjX01IMflfWhnSiYuUXYLUvFhjTOdTlZqzjDfDpI3dAmNfAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDndlYmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2lu
+LnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBROWOq2WSHlPf+65TyF1Ccg
+DawzRTANBgkqhkiG9w0BAQUFAAOCAQEAdCIFbW6SF9+FDVJwmFiy6AEmIS9Z0ME6
+cdt5ZXpsTVwlWw3dOiPWKjOxV0V/7y/Fmj8amZIWsy1NqMSqLseObiXwVp+nh0Jw
+7qQYO85+bHMSYsr8w8a9fbu+/MeehOEDawD1QC2+AmuSTB2zt1GPcvE83XGaq83G
+zpE/7CP1aFhJGZFlxIjN6h7d+KK0vmmjH9CIcXlbFYSy3Njq4SNizc4LwNNMFYjB
+XdPKcIAfaBUhhrQbpNV/fA9AGHCp5XXIpmSfCuR+iTQyk18fj/w6szSm1zyccO3Z
+MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <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"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.uu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.uu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblogin.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
+DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNjYagdexM5SeQsnG410D2/9el0tGH
+FL+LaDPQ2nLVWAMfYrn0PfEQ7WGG4Glpi1cAjIAG5Qq/8e05shDQ2dRFNx95wfL6
+245X3Hgroqmg4ki6VX0WOwcrBYKybRgQ6Ba9qQuhzFp1yBzD+3XlBmfOClKYkdt0
+wYsYKoA+CvmVIyy22SCh0b4qCsr+gCeCZan3zUsfQrV4Xo6aYVye+eXzZFrICwxG
+Ni8s6xfaxjL6xMEoV2ZqiRa8FUiOQBENxLRA0bGU6JuGT5i9hFu4HliRlnj3h98+
+EEb0QWDf2yrjX01IMflfWhnSiYuUXYLUvFhjTOdTlZqzjDfDpI3dAmNfAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDndlYmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2lu
+LnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBROWOq2WSHlPf+65TyF1Ccg
+DawzRTANBgkqhkiG9w0BAQUFAAOCAQEAdCIFbW6SF9+FDVJwmFiy6AEmIS9Z0ME6
+cdt5ZXpsTVwlWw3dOiPWKjOxV0V/7y/Fmj8amZIWsy1NqMSqLseObiXwVp+nh0Jw
+7qQYO85+bHMSYsr8w8a9fbu+/MeehOEDawD1QC2+AmuSTB2zt1GPcvE83XGaq83G
+zpE/7CP1aFhJGZFlxIjN6h7d+KK0vmmjH9CIcXlbFYSy3Njq4SNizc4LwNNMFYjB
+XdPKcIAfaBUhhrQbpNV/fA9AGHCp5XXIpmSfCuR+iTQyk18fj/w6szSm1zyccO3Z
+MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">UU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Uppsala universitet</Company>
+    <SurName>AKKA SAML2</SurName>
+    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml b/swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml
deleted file mode 100644
index 6f74758f..00000000
--- a/swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://webshop.rz.uni-wuerzburg.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>webshop.rz.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=webshop.rz.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgIEEDlpOTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTEwMDYxNzA5MzIyNVoXDTE1MDYxNjA5MzIyNVowbDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xJDAiBgNVBAMTG3dlYnNob3AucnoudW5pLXd1ZXJ6YnVyZy5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN575+C0sepcARoGYIT9zSB
-KYSkB6Ru6AKv3lvzhxMOJqOClAW6RUNkBafdMMHvibuVYrHlYleG5NiN3H7Y26S7
-fLR2BFKbL05rXq/caqXc2aq/6HJVoNacJixT3skCAnfF5WHIEGq6BmSVIpiPtzAw
-xX3K2+8L3+TrQzOuGlTjsne2INgjnKBZHG0Wr2R5KjKzkmbtx3hd4r3soIlbeoMZ
-/g5mE2zbnLYpWxCENW/HHC/lCuuuRCY2jGlNp8kCPsoZbA4lVZv7wbTZytCSSxnF
-eyonLhS3da1Ujnht/qE5qo07aZnqfIxXRTKiE27vHkTLX9sn7fLKIVJS6dSG/AMC
-AwEAAaOCAbswggG3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjL44In40oyoDIV47udhKE5q0
-s6wwHwYDVR0jBBgwFoAUfR+oQPam9jJOgeX4MgvDbSvEM24wJAYDVR0RBB0wG4EZ
-b3JkZXJAcnoudW5pLXd1ZXJ6YnVyZy5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4
-oDagNIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9j
-YWNybC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-QgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAAtqDQy6lwnNm
-Q5sWZeEK1r7TTaSFnCa8PYcl8QhttybQMoX7hfcAsbmgBza/66VStCabephMjlyd
-I0fcD1d3Opc+m7LwMjcslVa0VMq7a4iQontbkizWFkkkGYPDItmVYOCK8fypiBOR
-uLmrTrogyQErV1PqCBlifJJOatE+nJk6X84rNd3qDpTSaHK0sjOPhnQVQdvRUcnD
-zTb9MMXYIOqrER5J7pC3oQuwC/Rc+CWTK/qZF/FF0BBVLtJK1SP+umKwDitOMOz5
-cStKE2ulSCoSH0jMmhp516knF/OIeqFuHgMMMRqqxAypuLAVbSlFhuZ25mUDngxC
-Z8hLHkleuQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>webshop.rz.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=webshop.rz.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgIEEDlpOTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTEwMDYxNzA5MzIyNVoXDTE1MDYxNjA5MzIyNVowbDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xJDAiBgNVBAMTG3dlYnNob3AucnoudW5pLXd1ZXJ6YnVyZy5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN575+C0sepcARoGYIT9zSB
-KYSkB6Ru6AKv3lvzhxMOJqOClAW6RUNkBafdMMHvibuVYrHlYleG5NiN3H7Y26S7
-fLR2BFKbL05rXq/caqXc2aq/6HJVoNacJixT3skCAnfF5WHIEGq6BmSVIpiPtzAw
-xX3K2+8L3+TrQzOuGlTjsne2INgjnKBZHG0Wr2R5KjKzkmbtx3hd4r3soIlbeoMZ
-/g5mE2zbnLYpWxCENW/HHC/lCuuuRCY2jGlNp8kCPsoZbA4lVZv7wbTZytCSSxnF
-eyonLhS3da1Ujnht/qE5qo07aZnqfIxXRTKiE27vHkTLX9sn7fLKIVJS6dSG/AMC
-AwEAAaOCAbswggG3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjL44In40oyoDIV47udhKE5q0
-s6wwHwYDVR0jBBgwFoAUfR+oQPam9jJOgeX4MgvDbSvEM24wJAYDVR0RBB0wG4EZ
-b3JkZXJAcnoudW5pLXd1ZXJ6YnVyZy5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4
-oDagNIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9j
-YWNybC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-QgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAAtqDQy6lwnNm
-Q5sWZeEK1r7TTaSFnCa8PYcl8QhttybQMoX7hfcAsbmgBza/66VStCabephMjlyd
-I0fcD1d3Opc+m7LwMjcslVa0VMq7a4iQontbkizWFkkkGYPDItmVYOCK8fypiBOR
-uLmrTrogyQErV1PqCBlifJJOatE+nJk6X84rNd3qDpTSaHK0sjOPhnQVQdvRUcnD
-zTb9MMXYIOqrER5J7pC3oQuwC/Rc+CWTK/qZF/FF0BBVLtJK1SP+umKwDitOMOz5
-cStKE2ulSCoSH0jMmhp516knF/OIeqFuHgMMMRqqxAypuLAVbSlFhuZ25mUDngxC
-Z8hLHkleuQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Würzburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Rechenzentrum Uni Würzburg Webshop</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-wuerzburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hartmut</GivenName>
-    <SurName>Plehn</SurName>
-    <EmailAddress>serverzertifikate@rz.uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Rossa</SurName>
-    <EmailAddress>leitung@rz.uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml b/swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml
deleted file mode 100644
index 44781c2c..00000000
--- a/swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.imz.hs-furtwangen.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wiki.imz.hs-furtwangen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wiki.imz.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIED6Im4zANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
-Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDAyMjIxNTU3MDdaFw0xNTAy
-MjExNTU3MDdaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
-ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
-IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxIjAgBgNV
-BAMTGXdpa2kuaW16LmhzLWZ1cnR3YW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCZOP6QOvIaPx9alcxqEPXebG4ScyjaFSOrbYl5h93A4w+T
-x5o5po56w2KRRZQE7T86r4dMvw6TkYyada0ANVzrYzs75rUn7VkarJzhWgTN1dte
-rKx5sqkudyMcnMGN5dWf107IKYTXZLNX+175D1vjM9jd2vCV0ODeeh3anldW/IlT
-TJUARIM/ZWS+6qeSoDr/VlISPzdTJTM212SXOm3xe7kCVab/zwBQhQf2/t3jJYw4
-QYsDWMZIxoudbANl3sUMSDF+7qTyzkR8QEglFnnAx9mKkLWPYGgJQyHaK9TkoD7F
-vrF8HS1NyL8qFk9Y7VesveFVurtUEipzkPbgXwNfAgMBAAGjggIeMIICGjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFB4nUD+0MySwB6ax1AJNJijrNx9AMB8GA1UdIwQYMBaAFGhw
-EA3JLXMG+YgYPp+LjO0pABbHMGgGA1UdEQRhMF+CGXdpa2kuaW16LmhzLWZ1cnR3
-YW5nZW4uZGWCHWhmdS1pbXotd2lraS5ocy1mdXJ0d2FuZ2VuLmRlgiNoZnUtaW16
-LXdpa2kuYWxwaGEuaHMtZnVydHdhbmdlbi5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7
-hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWZ1cnR3YW5nZW4tY2EvcHViL2Ny
-bC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVy
-dHdhbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYw
-SQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdl
-bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABuJEaN/Od5A+tIiXZf+PfG3qkGJteHX
-bVz2gTjdjGyV/m1wMqwFMpiRQU+JP7kN0hySMDvAo7R42an27EbWYRbv4PrZ1Yn0
-kHxc2eRoJchhr+5f4P7/uRyryDxFiPOiazY0QaOCj4MqK6j2lXIoj8qZWzFbKnti
-PAdH3bmZccZ5c3o37InMSyco7qOkSzWTJ9MUz6aNG40VArI8g1f7TtY9BWDdv0fq
-40uSBVacDsbOpNrTEg8CfAhZfHjWyB43yoXjBRJJvdEYJX1c/eUF5NRT/vR2Tb7y
-nYzpemdhwxFzt+1CqNuf3Wnv0DmBmEKDGCro8qxKdGIsaEPFLaBWKnI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wiki.imz.hs-furtwangen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wiki.imz.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIED6Im4zANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
-Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDAyMjIxNTU3MDdaFw0xNTAy
-MjExNTU3MDdaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
-ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
-IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxIjAgBgNV
-BAMTGXdpa2kuaW16LmhzLWZ1cnR3YW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCZOP6QOvIaPx9alcxqEPXebG4ScyjaFSOrbYl5h93A4w+T
-x5o5po56w2KRRZQE7T86r4dMvw6TkYyada0ANVzrYzs75rUn7VkarJzhWgTN1dte
-rKx5sqkudyMcnMGN5dWf107IKYTXZLNX+175D1vjM9jd2vCV0ODeeh3anldW/IlT
-TJUARIM/ZWS+6qeSoDr/VlISPzdTJTM212SXOm3xe7kCVab/zwBQhQf2/t3jJYw4
-QYsDWMZIxoudbANl3sUMSDF+7qTyzkR8QEglFnnAx9mKkLWPYGgJQyHaK9TkoD7F
-vrF8HS1NyL8qFk9Y7VesveFVurtUEipzkPbgXwNfAgMBAAGjggIeMIICGjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFB4nUD+0MySwB6ax1AJNJijrNx9AMB8GA1UdIwQYMBaAFGhw
-EA3JLXMG+YgYPp+LjO0pABbHMGgGA1UdEQRhMF+CGXdpa2kuaW16LmhzLWZ1cnR3
-YW5nZW4uZGWCHWhmdS1pbXotd2lraS5ocy1mdXJ0d2FuZ2VuLmRlgiNoZnUtaW16
-LXdpa2kuYWxwaGEuaHMtZnVydHdhbmdlbi5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7
-hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWZ1cnR3YW5nZW4tY2EvcHViL2Ny
-bC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVy
-dHdhbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYw
-SQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdl
-bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABuJEaN/Od5A+tIiXZf+PfG3qkGJteHX
-bVz2gTjdjGyV/m1wMqwFMpiRQU+JP7kN0hySMDvAo7R42an27EbWYRbv4PrZ1Yn0
-kHxc2eRoJchhr+5f4P7/uRyryDxFiPOiazY0QaOCj4MqK6j2lXIoj8qZWzFbKnti
-PAdH3bmZccZ5c3o37InMSyco7qOkSzWTJ9MUz6aNG40VArI8g1f7TtY9BWDdv0fq
-40uSBVacDsbOpNrTEg8CfAhZfHjWyB43yoXjBRJJvdEYJX1c/eUF5NRT/vR2Tb7y
-nYzpemdhwxFzt+1CqNuf3Wnv0DmBmEKDGCro8qxKdGIsaEPFLaBWKnI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">HFU</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Furtwangen University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-furtwangen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hendrik</GivenName>
-    <SurName>Kuijs</SurName>
-    <EmailAddress>kuijs@hs-furtwangen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml b/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml
deleted file mode 100644
index 080a79c0..00000000
--- a/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.surfnetlabs.nl/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:37:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SURFnetlabs Wiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nl">SURFnetlabs Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SURFnetlabs Wiki</mdui:Description>
-        <mdui:Description xml:lang="nl">SURFnetlabs Wiki</mdui:Description>
-        <mdui:Logo height="300" width="500" xml:lang="en">https://static.surfconext.nl/media/sp/SURFnetdienst.png</mdui:Logo>
-        <mdui:Logo height="300" width="500" xml:lang="nl">https://static.surfconext.nl/media/sp/SURFnetdienst.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">wiki surfnet surfnetlabs</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">wiki surfnet surfnetlabs</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://wiki.surfnetlabs.nl</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="nl">https://wiki.surfnetlabs.nl</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.surfnet.nl/Documents/best_practice_privacy_SURFfederatie_SURFconext_EN.pdf</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="nl">http://www.surfnet.nl/Documents/best_practice_privacy_SURFfederatie_SURFconext_NL.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wiki.surfnetlabs.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wiki.surfnetlabs.nl,OU=Services,O=SURFnet B.V.,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEfjCCA2agAwIBAgIRAPMC2j8GrCWf8rRjWzHCHh8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDAxMjUwMDAwMDBaFw0xMzAxMjQyMzU5NTlaMFUxCzAJBgNV
-BAYTAk5MMRUwEwYDVQQKEwxTVVJGbmV0IEIuVi4xETAPBgNVBAsTCFNlcnZpY2Vz
-MRwwGgYDVQQDExN3aWtpLnN1cmZuZXRsYWJzLm5sMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwy0KxkE03WH+r/G3yn4QLP7vEIXaslJXS2vD3Ba8vWIu
-MSvdtRrimSnwGAo8C3Dn4NwsRj8hmZN6KO1Rf22M5QEPAmskNdBlZrv4AmMOpqle
-YkJ16sp6GEX6yjrbzWlzl4GBE5K0DztjeBc+Uu+CUFWVrepGaj5Nic1mTprj2gRA
-Q5yUd16w91CG9WydPF5gqJ63xQAw1DwzUxjO3Ki7YHcNyJsmhzGOwD954UCLeAQ3
-xy+j02yx3WjzKkBcTJmb5WnzJnYNEqhI/s+Sur+ckm72iIfPSbcy8uP7LE0HGzwE
-SWXmo/Whxzm5WRvI8nVjZ2WQRXq+axWclAcf15yEjwIDAQABo4IBZjCCAWIwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLjh9r/BG1J6
-vyOl7kQ2uHFIXl9iMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB4GA1UdEQQXMBWCE3dpa2ku
-c3VyZm5ldGxhYnMubmwwDQYJKoZIhvcNAQEFBQADggEBABbwQZuJ3HjsyZmHJDDE
-6aAbaMp6WLPPcihEl5VIHnV/ymBxEREol0dzXLFP8RJWAZHc7lMoD9M8t1UNpOD2
-Ix6r3nrM6UX8cP5Efp84ESkRETW3l5QWw/4+SoArsRRLZiNZ9hAeQFLQB5pODpNk
-sb3PYtEIZRq4nV4kP7T2zRGkllvIzoF/Z/Tf88Uxb8y7/d6q6sJx1kqZascmxBg7
-qieRAqjAtVENnmJFmUbp/6t5jLQ0zwqbsO4SHloodPjv5j3rkRzUBWcPQLvyyl6q
-LD1R7DW6m/DT9iQfZ11P3CV92ehsHFNqlGxakYH7S3ghv+dzcwWq53T8kTPaQaC6
-Fxw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SURFnetlabs Wiki</md:ServiceName>
-      <md:ServiceName xml:lang="nl">SURFnetlabs Wiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SURFnetlabs Wiki</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="nl">SURFnetlabs Wiki</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" 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" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute 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">SURFnet B.V.</md:OrganizationName>
-    <md:OrganizationName xml:lang="nl">SURFnet B.V.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFnetlabs</md:GivenName>
-    <md:SurName>Beheer</md:SurName>
-    <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFnetlabs</md:GivenName>
-    <md:SurName>Beheer</md:SurName>
-    <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFnetlabs</md:GivenName>
-    <md:SurName>Beheer</md:SurName>
-    <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki2.redclara.net.xml b/swamid-interfederations-2.0/wiki2.redclara.net.xml
new file mode 100644
index 00000000..a1f6a97c
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki2.redclara.net.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki2.redclara.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">http://cofre.reuna.cl/index.php/es/reglas-federacion</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki2.redclara.net/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki2.redclara.net/Shibboleth.sso/DS" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Wiki - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Wiki - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's Wiki Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio de Wiki de RedCLARA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:KeyName>wiki2.redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=wiki2.redclara.net,C=CL,description=1xSAzgjAHzw7woBb</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDCtWmMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNjIwMjExNzM0
+WhcNMTQwNjIyMTgyNjQ1WjBtMRkwFwYDVQQNExAxeFNBemdqQUh6dzd3b0JiMQsw
+CQYDVQQGEwJDTDEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSYwJAYJKoZI
+hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAL7eM4xGr8OfOcdgXfqzCOz313uNIf7EFwoG52lk6r59
+S+gc4TKvDRDDsESFKLYrtkl2YfxuUfgZ8SgoLtDIVGOF+O4fsxTieI5nNFdBbpBb
+KzzIb6rZkSVAwvKL6ys3XSEf9ctv61QNSVaDSAuPGUC9ABZStHw5TpazDKk6diDH
+S8s23WeVNidmseX8Q+2FqotVT1kruUD5uyh1i1Xih9dv5CGk3kqYKCJ0sQj+cUT2
+Y/0uVRDj130UZIP/9k8IYGZP70d/euHHrKv/CWQ2T4h7bSZaQpJ1btqkeeUJ5q9a
+phxS4P/PFLPf3/DQmPXZeozIPEg2mzjU2CQmtl+WECUCAwEAAaOCAuUwggLhMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBRGemL+9llQ+fg2vILc9RJa1xteATAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
+awj3zGQu7w4sRTArBgNVHREEJDAighJ3aWtpMi5yZWRjbGFyYS5uZXSCDHJlZGNs
+YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
+AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
+aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
+Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
+b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
+IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
+YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
+dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
+AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
+ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
+L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
+LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBACrk1OrD+wo423QhsB9M
+7N8HfLUyAz9H4wsxDS0QyB1a63cJSxumCra9Jy8YYyb4DjOs7LhSEf2amYN//Gy/
+uWPyLVrmYHMl1WAAyTgaW/omoS/EZgkgIplkSqtLnwBPk55juuU8H+fwG9NQWh6+
+eupTB261Nb4d1Wxyhpty7uoDqMaT2BHLhdxUT/GAfV9znjdYhnMdkipGKm7LtL5/
+dXb0gsyp+eHHpb7k6/2i4j7nAhYTHze2ee5Ht2bGYFzXQuv5M8WJT5yzvwuRC7F5
+OGwMN1u8sCxrMjv/FLRPzSJNMmq9+IL2sEcwKt1o0FjVq+S//abbHNpYFHTGg31E
+U/M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:KeyName>wiki2.redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=wiki2.redclara.net,C=CL,description=1xSAzgjAHzw7woBb</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDCtWmMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNjIwMjExNzM0
+WhcNMTQwNjIyMTgyNjQ1WjBtMRkwFwYDVQQNExAxeFNBemdqQUh6dzd3b0JiMQsw
+CQYDVQQGEwJDTDEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSYwJAYJKoZI
+hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAL7eM4xGr8OfOcdgXfqzCOz313uNIf7EFwoG52lk6r59
+S+gc4TKvDRDDsESFKLYrtkl2YfxuUfgZ8SgoLtDIVGOF+O4fsxTieI5nNFdBbpBb
+KzzIb6rZkSVAwvKL6ys3XSEf9ctv61QNSVaDSAuPGUC9ABZStHw5TpazDKk6diDH
+S8s23WeVNidmseX8Q+2FqotVT1kruUD5uyh1i1Xih9dv5CGk3kqYKCJ0sQj+cUT2
+Y/0uVRDj130UZIP/9k8IYGZP70d/euHHrKv/CWQ2T4h7bSZaQpJ1btqkeeUJ5q9a
+phxS4P/PFLPf3/DQmPXZeozIPEg2mzjU2CQmtl+WECUCAwEAAaOCAuUwggLhMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBRGemL+9llQ+fg2vILc9RJa1xteATAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
+awj3zGQu7w4sRTArBgNVHREEJDAighJ3aWtpMi5yZWRjbGFyYS5uZXSCDHJlZGNs
+YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
+AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
+aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
+Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
+b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
+IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
+YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
+dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
+AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
+ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
+L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
+LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBACrk1OrD+wo423QhsB9M
+7N8HfLUyAz9H4wsxDS0QyB1a63cJSxumCra9Jy8YYyb4DjOs7LhSEf2amYN//Gy/
+uWPyLVrmYHMl1WAAyTgaW/omoS/EZgkgIplkSqtLnwBPk55juuU8H+fwG9NQWh6+
+eupTB261Nb4d1Wxyhpty7uoDqMaT2BHLhdxUT/GAfV9znjdYhnMdkipGKm7LtL5/
+dXb0gsyp+eHHpb7k6/2i4j7nAhYTHze2ee5Ht2bGYFzXQuv5M8WJT5yzvwuRC7F5
+OGwMN1u8sCxrMjv/FLRPzSJNMmq9+IL2sEcwKt1o0FjVq+S//abbHNpYFHTGg31E
+U/M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Urban</md:SurName>
+    <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml b/swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml
deleted file mode 100644
index cc82d1b0..00000000
--- a/swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wtc.tu-chemnitz.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-chemnitz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
-MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
-yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
-3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
-pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
-sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
-9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
-e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
-WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
-jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
-r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
-H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
-qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
-MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
-yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
-3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
-pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
-sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
-9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
-e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
-WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
-jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
-r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
-H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
-qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wtc.tu-chemnitz.de:8443/shibboleth-idp/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wtc.tu-chemnitz.de/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-chemnitz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
-MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
-yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
-3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
-pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
-sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
-9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
-e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
-WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
-jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
-r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
-H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
-qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
-MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
-yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
-3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
-pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
-sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
-9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
-e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
-WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
-jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
-r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
-H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
-qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wtc.tu-chemnitz.de:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Chemnitz (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">TU Chemnitz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-chemnitz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ronald</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ronald</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wws.redi-bw.de.xml b/swamid-interfederations-2.0/wws.redi-bw.de.xml
deleted file mode 100644
index c92e647c..00000000
--- a/swamid-interfederations-2.0/wws.redi-bw.de.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wws.redi-bw.de">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/DS" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wws-s.redi-bw.de/Shibboleth.sso/DS" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wws.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=wws.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIEENaFljANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTEwMTAxNDEzMzkxOVoXDTE1
-MTAxMzEzMzkxOVowgbgxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVy
-dHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRcw
-FQYDVQQDEw53d3MucmVkaS1idy5kZTEeMBwGCSqGSIb3DQEJARYPaW5mb0ByZWRp
-LWJ3LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0miEzWvjAqrX
-oT2H0778Bdd9+TLJD/jxbx7+fy0oN0NJF9nocIxMfMXiYFKWJy5dY0XEx7/33DKY
-5Df66Wk8o1x97xa9LGEaXe0+glZyaDsNKStlY1kW6pM/ohVUIXlHZGnDVLz+4yzh
-XPT/besq9w1YkUDI8R5zXhXgod7WsRXPaGlDj+MYd4+xAX5vPqga0KRtc9gwshKT
-Y+xrtD2W3Y4ynzMUT7N5OvPLF/Q807P5bHf3IaZ7PWhm1PF0FN5IOvw9iUci1hqo
-gRhR4q/ImFAOwUu0jkPdrU5RGauTAMI8rPdujB/FirqMdyCQbYZs3MgVRd3kq7nt
-hCcxIaTS8QIDAQABo4ICCTCCAgUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSMk/NR+7fUmRRd
-PORgM+0wtrTYSTAfBgNVHSMEGDAWgBQzZ6nW8ZNVNqyhMr3B5JY5/0xwMTBPBgNV
-HREESDBGgQ9pbmZvQHJlZGktYncuZGWCDnd3cy5yZWRpLWJ3LmRlghF3d3MtZnIu
-cmVkaS1idy5kZYIQd3dzLXMucmVkaS1idy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8
-hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY3Js
-L2dfY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1m
-cmVpYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCB
-mDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCRsfDQbyon67pB4jiHwtfok+nY
-dYgba+x93m6uO8+RD2MPBBhcVFF4uHfStxhRe8lttNNboTf7g/D4y041ZGSmQH/e
-YqRBVK5WiedYXpyFjB7tzjOmMsFKYEV5MRLpjt7V7y9cKPCFXGXwSvMgAWUHrSs5
-GoWj/xAoOWglllrxwC+gmwaPM8LNSbHDDh8QhA6NJYbYO9fUyLnI2ajgSjar4aTy
-/kygbVgZgqnFGd9prygGXaIc3hLkWcUQGS6t6NP2Ryt4i2w8Ib9ubnjgojS9e+x2
-TL82eFket8If6svRH9dTJHSQS+F2LmjUVQSSPyVt8ZUBFacRauRMyCQ9Ne3h
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ReDI Perinorm-Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.redi-bw.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Hans-Adolf</GivenName>
-    <SurName>Ruppert</SurName>
-    <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ReDI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>info@redi-bw.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-fr.redi-bw.de.xml b/swamid-interfederations-2.0/www-fr.redi-bw.de.xml
deleted file mode 100644
index f34f1e8e..00000000
--- a/swamid-interfederations-2.0/www-fr.redi-bw.de.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-fr.redi-bw.de">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www-fr.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-fr.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZzCCBE+gAwIBAgIEC0b00TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMDE4MjYxMFoXDTEy
-MTAyODE4MjYxMFowgYsxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRow
-GAYDVQQDExF3d3ctZnIucmVkaS1idy5kZTEeMBwGCSqGSIb3DQEJARYPaW5mb0By
-ZWRpLWJ3LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6jxBBaez
-yk+N8nQIDnifDR4br5D5zmQD3uF7oos01/lHBEfmNR+fj5qucgfxGAyecy74aFZ7
-p82QW6I01IOsqBphcNOsOihS16Bb5F3euq2LCUEmWiLsCYJOYhlZHZZRkSpzf0U1
-wNWjqYAXsT6T5TY+/9NPpAlIcNzxekZN/8VBXIPb2zxn7/KJwEY6Cow053XY0f4z
-BjRWPmnD7LV83MYrR3IOQQtRNQdtHJkMmN5L0IBUqI0cIqBMwNh7rdBXfkPWtWYl
-Fb9aCZ6RVdenuH6ek+KKfv6/M67Y+TS31GudIbdddzL+raA9/nwex9Y29hE2sg1+
-8o72bnYyvEuyxwIDAQABo4IB1DCCAdAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTNbO30k/O3
-ucEvGfqHiWE5jGi8fDAfBgNVHSMEGDAWgBQzZ6nW8ZNVNqyhMr3B5JY5/0xwMTAa
-BgNVHREEEzARgQ9pbmZvQHJlZGktYncuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9n
-X2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJl
-aWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgw
-SgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJn
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAYw9Q8c0vbIGm+B9qKv9zJGaulzsx
-nftJFaYxEpPsiTOBRmaL2Q4dXxgzUEgKyD98DxaZ+Jzz4LHa1ELwa3KS9ZUmOMQ3
-J52NKhsaqCUU/8NTISXf8ebCAKTkK+IjjrlEd3TIq7OwW60IUz7eSLMr/WdxbUFT
-Lq2Ex1DtuGQXMYv/YV3ky4Ci9lnAQkQ4aogfF5CH941sh8Qqd7iA9fAlCbYd2Vmh
-x7P4PILIaPEEHYBxetPmOeOiOEMm3DtsmqXK7XKQeR3opiJxY+xFP7EVid3M0B/+
-yGu46kaBjuW692bV3nPlvetlri3mceGe3/wc5hkfhsSbEsB+JflUsFjVIA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www-fr.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-fr.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZzCCBE+gAwIBAgIEC0b00TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMDE4MjYxMFoXDTEy
-MTAyODE4MjYxMFowgYsxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRow
-GAYDVQQDExF3d3ctZnIucmVkaS1idy5kZTEeMBwGCSqGSIb3DQEJARYPaW5mb0By
-ZWRpLWJ3LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6jxBBaez
-yk+N8nQIDnifDR4br5D5zmQD3uF7oos01/lHBEfmNR+fj5qucgfxGAyecy74aFZ7
-p82QW6I01IOsqBphcNOsOihS16Bb5F3euq2LCUEmWiLsCYJOYhlZHZZRkSpzf0U1
-wNWjqYAXsT6T5TY+/9NPpAlIcNzxekZN/8VBXIPb2zxn7/KJwEY6Cow053XY0f4z
-BjRWPmnD7LV83MYrR3IOQQtRNQdtHJkMmN5L0IBUqI0cIqBMwNh7rdBXfkPWtWYl
-Fb9aCZ6RVdenuH6ek+KKfv6/M67Y+TS31GudIbdddzL+raA9/nwex9Y29hE2sg1+
-8o72bnYyvEuyxwIDAQABo4IB1DCCAdAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTNbO30k/O3
-ucEvGfqHiWE5jGi8fDAfBgNVHSMEGDAWgBQzZ6nW8ZNVNqyhMr3B5JY5/0xwMTAa
-BgNVHREEEzARgQ9pbmZvQHJlZGktYncuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9n
-X2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJl
-aWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgw
-SgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJn
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAYw9Q8c0vbIGm+B9qKv9zJGaulzsx
-nftJFaYxEpPsiTOBRmaL2Q4dXxgzUEgKyD98DxaZ+Jzz4LHa1ELwa3KS9ZUmOMQ3
-J52NKhsaqCUU/8NTISXf8ebCAKTkK+IjjrlEd3TIq7OwW60IUz7eSLMr/WdxbUFT
-Lq2Ex1DtuGQXMYv/YV3ky4Ci9lnAQkQ4aogfF5CH941sh8Qqd7iA9fAlCbYd2Vmh
-x7P4PILIaPEEHYBxetPmOeOiOEMm3DtsmqXK7XKQeR3opiJxY+xFP7EVid3M0B/+
-yGu46kaBjuW692bV3nPlvetlri3mceGe3/wc5hkfhsSbEsB+JflUsFjVIA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/SOAP"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ReDI Freiburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Hans-Adolf</GivenName>
-    <SurName>Ruppert</SurName>
-    <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ReDI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>info@redi-bw.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-s.redi-bw.de.xml b/swamid-interfederations-2.0/www-s.redi-bw.de.xml
deleted file mode 100644
index eead5ecc..00000000
--- a/swamid-interfederations-2.0/www-s.redi-bw.de.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-s.redi-bw.de">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www-s.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-s.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEC0feAzANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMTExMDEwOFoXDTEy
-MTAyOTExMDEwOFowgYoxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRkw
-FwYDVQQDExB3d3ctcy5yZWRpLWJ3LmRlMR4wHAYJKoZIhvcNAQkBFg9pbmZvQHJl
-ZGktYncuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClimyACau2
-7dtk/2Cd4F7vJfsEiAnyHkXG5LbBNDK286gOIXROgnOwEb6fLc08eR6F/79PlGqA
-NCvzUyMnIDSnNwdiXkofOvNKjYBCpSWzmnZjz4Spn2Fzb9LyDpKe2QAqZ8P8MWYF
-P9Up9C/cRcyprhJHqzL/kMNPQUVPAZWgHhkqjlZifQqElASXJ3u3vNfbWZ6RbuZ1
-PK7Z8l++u1nGkAoBrNr7bpKx4hHbPjQI53XiwpH0VAstYZHnqe7B9z/XCCeYjQMx
-igd03a8+wg0tkDqHDErYyk9ueuHrD72qsi96tdIshudVobdpJVdG2AlBHBl2O3Yj
-QlF0PPqGWAvZAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
-BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKEmtco6yR2f
-nO4Yt4UbhdMLOFFwMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAxMBoG
-A1UdEQQTMBGBD2luZm9AcmVkaS1idy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY3JsL2df
-Y2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVp
-YnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmct
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBB6TJb5jerQHmk9LwCvwEQrQGo/C52
-5DOdukZ2zV9SzgRb877XjjwCfNgVRurYyyJnBj95/kX2R7Ry8tDgY3LiDyRRGhXT
-rMdWWZgyEZrn0Aqk28hk2zm+U5f9OFTnwj6wRWfIAglAZxnsTUGFoHw3f2+f7tl1
-dKaPVl2nTMUOq3mJrgkMDwKksVH7miOw2U1dxyXNnPYFJcPKy04wXN4hj5fgJrQk
-7B/eFzIlQAv58jPToJuIf0AQ/tE6s0HbdVQk704V3vJ0shgvYk9XRG79H7xmqKIU
-5+Ku1V1/b70GA9disF4/zyhDZf6InNqnJfDn9nsiBkFInMqCDijq7l12
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www-s.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-s.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEC0feAzANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMTExMDEwOFoXDTEy
-MTAyOTExMDEwOFowgYoxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRkw
-FwYDVQQDExB3d3ctcy5yZWRpLWJ3LmRlMR4wHAYJKoZIhvcNAQkBFg9pbmZvQHJl
-ZGktYncuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClimyACau2
-7dtk/2Cd4F7vJfsEiAnyHkXG5LbBNDK286gOIXROgnOwEb6fLc08eR6F/79PlGqA
-NCvzUyMnIDSnNwdiXkofOvNKjYBCpSWzmnZjz4Spn2Fzb9LyDpKe2QAqZ8P8MWYF
-P9Up9C/cRcyprhJHqzL/kMNPQUVPAZWgHhkqjlZifQqElASXJ3u3vNfbWZ6RbuZ1
-PK7Z8l++u1nGkAoBrNr7bpKx4hHbPjQI53XiwpH0VAstYZHnqe7B9z/XCCeYjQMx
-igd03a8+wg0tkDqHDErYyk9ueuHrD72qsi96tdIshudVobdpJVdG2AlBHBl2O3Yj
-QlF0PPqGWAvZAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
-BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKEmtco6yR2f
-nO4Yt4UbhdMLOFFwMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAxMBoG
-A1UdEQQTMBGBD2luZm9AcmVkaS1idy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY3JsL2df
-Y2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVp
-YnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmct
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBB6TJb5jerQHmk9LwCvwEQrQGo/C52
-5DOdukZ2zV9SzgRb877XjjwCfNgVRurYyyJnBj95/kX2R7Ry8tDgY3LiDyRRGhXT
-rMdWWZgyEZrn0Aqk28hk2zm+U5f9OFTnwj6wRWfIAglAZxnsTUGFoHw3f2+f7tl1
-dKaPVl2nTMUOq3mJrgkMDwKksVH7miOw2U1dxyXNnPYFJcPKy04wXN4hj5fgJrQk
-7B/eFzIlQAv58jPToJuIf0AQ/tE6s0HbdVQk704V3vJ0shgvYk9XRG79H7xmqKIU
-5+Ku1V1/b70GA9disF4/zyhDZf6InNqnJfDn9nsiBkFInMqCDijq7l12
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/SOAP"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ReDI Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Hans-Adolf</GivenName>
-    <SurName>Ruppert</SurName>
-    <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ReDI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>info@redi-bw.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ascopubs.org.xml b/swamid-interfederations-2.0/www.ascopubs.org.xml
deleted file mode 100644
index b4419368..00000000
--- a/swamid-interfederations-2.0/www.ascopubs.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ascopubs.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Journals of the American Society of Clinical Oncology</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Journals of the American Society of Clinical Oncology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ascopubs.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.b2i.de.xml b/swamid-interfederations-2.0/www.b2i.de.xml
deleted file mode 100644
index cd8fad71..00000000
--- a/swamid-interfederations-2.0/www.b2i.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.b2i.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.b2i.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.b2i.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.b2i.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHEnRZn3AzVDANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA3WhcNMTYw
-ODIyMTExMDA3WjCBkjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRMwEQYD
-VQQDEwp3d3cuYjJpLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-uXCPIiALHLNEC6a5kbCcJTiJoZ6Pn8OnSI5Mw4VhFMcnkOvMorpt/R4/3kioT3gL
-KRUhFDgWyO2pty8Q4xlyPRHGlt938C5XXvfcY9rzLgABKSn2+rjhb2bMS5Zlz+aW
-88r04kvZgR4PlmZa0GyXj/eWowh9Ic0tU6uh8g4RIdaryHuqbbqpFEAkONNIoH1g
-M+4CNSmj36LQNQFo+2ov3DyZ/dJt9jth4T5M1m03NeILolNujzW5Ce+JO0gHFDWJ
-Qp9+w13RDGDNQJuTfBYvhOfxPU2FrgdOkZaA7XDbmBVAQLhen/0AV98i3PXOvAID
-mmLoiqjhi+qS5OnPygeahQIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSv
-+qt8pTd2pwww9zj3CUvf/TbPqjAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMhWhsqivOf
-MeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNy
-bC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJpc2NoZS1z
-dGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBygYIKwYB
-BQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-YmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5
-ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAK6JlbJ+37MzXm6R6Lh0W9KsTc/ZYLdI
-QYxxeDiV8axPHmKhtnG/hhWucv0f2fG2gDi0kjSExZ4lpSfX0acTXv6CIF2zQMdG
-w9cCFbDZ8h2SgnH/tBb0/+M6bws1Xv0laxC9BZ7xAjVZq2d+YO4hTqQZCDvhcoR/
-B5aqFOuOpmXbjpP9ZeA9fMriC3GnB6JiAbPPzDEZgPGykcVl98lpQsFBcj8bNxRH
-eOe0rKs4xT+t4l/p5hbSp31Yef3mXJFRcXUtGjxuugaHYppXygc2v1iq9cletQoT
-k2wV8azDBD0V9CSHPwtltUaABXeMzxIGmTStfUIQeQ6+Aflofj72TfM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.b2i.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.b2i.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHEnRZn3AzVDANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA3WhcNMTYw
-ODIyMTExMDA3WjCBkjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRMwEQYD
-VQQDEwp3d3cuYjJpLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-uXCPIiALHLNEC6a5kbCcJTiJoZ6Pn8OnSI5Mw4VhFMcnkOvMorpt/R4/3kioT3gL
-KRUhFDgWyO2pty8Q4xlyPRHGlt938C5XXvfcY9rzLgABKSn2+rjhb2bMS5Zlz+aW
-88r04kvZgR4PlmZa0GyXj/eWowh9Ic0tU6uh8g4RIdaryHuqbbqpFEAkONNIoH1g
-M+4CNSmj36LQNQFo+2ov3DyZ/dJt9jth4T5M1m03NeILolNujzW5Ce+JO0gHFDWJ
-Qp9+w13RDGDNQJuTfBYvhOfxPU2FrgdOkZaA7XDbmBVAQLhen/0AV98i3PXOvAID
-mmLoiqjhi+qS5OnPygeahQIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSv
-+qt8pTd2pwww9zj3CUvf/TbPqjAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMhWhsqivOf
-MeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNy
-bC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJpc2NoZS1z
-dGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBygYIKwYB
-BQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-YmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5
-ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAK6JlbJ+37MzXm6R6Lh0W9KsTc/ZYLdI
-QYxxeDiV8axPHmKhtnG/hhWucv0f2fG2gDi0kjSExZ4lpSfX0acTXv6CIF2zQMdG
-w9cCFbDZ8h2SgnH/tBb0/+M6bws1Xv0laxC9BZ7xAjVZq2d+YO4hTqQZCDvhcoR/
-B5aqFOuOpmXbjpP9ZeA9fMriC3GnB6JiAbPPzDEZgPGykcVl98lpQsFBcj8bNxRH
-eOe0rKs4xT+t4l/p5hbSp31Yef3mXJFRcXUtGjxuugaHYppXygc2v1iq9cletQoT
-k2wV8azDBD0V9CSHPwtltUaABXeMzxIGmTStfUIQeQ6+Aflofj72TfM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.b2i.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.b2i.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.b2i.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.b2i.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.b2i.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.b2i.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.b2i.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.b2i.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.b2i.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.b2i.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.b2i.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.b2i.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.b2i.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.b2i.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.b2i.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.classiques-garnier.com.xml b/swamid-interfederations-2.0/www.classiques-garnier.com.xml
deleted file mode 100644
index 2b59c8ad..00000000
--- a/swamid-interfederations-2.0/www.classiques-garnier.com.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.classiques-garnier.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.classiques-garnier.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.classiques-garnier.com,O=Classiques Garnier,OU=IT,L=Paris,ST=Ile de france,C=FR</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFWzCCBEOgAwIBAgISESEko+D0ngEzpFmIWn1HeSK3MA0GCSqGSIb3DQEBBQUA
-MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
-VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
-HhcNMTIwMTAzMTY0MDAwWhcNMTQwNzI3MTM1MjM3WjCBhDELMAkGA1UEBhMCRlIx
-FjAUBgNVBAgTDUlsZSBkZSBmcmFuY2UxDjAMBgNVBAcTBVBhcmlzMQswCQYDVQQL
-EwJJVDEbMBkGA1UEChMSQ2xhc3NpcXVlcyBHYXJuaWVyMSMwIQYDVQQDExp3d3cu
-Y2xhc3NpcXVlcy1nYXJuaWVyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAL8nP9d6RChOzUaiDbYkFQAoV8Qz8cn11CiYwNBz/+SOQjrvQz2toPH8
-AblzFYG5YRA8krcqYS09yZ5ftk43PYwFu/RwFbv3AwmfOI+KfqAgSQBj2Qk3j37Z
-EYoS7n2qhcMUrbHOKkUFOTH8HB+Gn2jEnEmkNHAJr/TjHtA/Nx2nc5C9e3UX0Arh
-5f3pbyE9xhbyXjoF15sdIWepoZHD0IZkNdVDNOfMJ6CEPfIVPcjmEeFi37eMd7Gd
-LFMMwT6CxCL9EybL+cuVXHob7XTSLlqAg1ZN3cc3QhRtJ0iqbzJkGMLaL+iRJX6b
-m3RRDtP8z4kPrmv/KvuVQyPousdWzIUCAwEAAaOCAeswggHnMA4GA1UdDwEB/wQE
-AwIFoDBMBgNVHSAERTBDMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRw
-czovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzA9BgNVHREENjA0ghp3
-d3cuY2xhc3NpcXVlcy1nYXJuaWVyLmNvbYIWY2xhc3NpcXVlcy1nYXJuaWVyLmNv
-bTAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBFBgNV
-HR8EPjA8MDqgOKA2hjRodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzL2dzb3Jn
-YW5pemF0aW9udmFsZzIuY3JsMIGWBggrBgEFBQcBAQSBiTCBhjBHBggrBgEFBQcw
-AoY7aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6
-YXRpb252YWxnMi5jcnQwOwYIKwYBBQUHMAGGL2h0dHA6Ly9vY3NwMi5nbG9iYWxz
-aWduLmNvbS9nc29yZ2FuaXphdGlvbnZhbGcyMB0GA1UdDgQWBBQUAStvDufpti4t
-GxHlzG/rcv/EizAfBgNVHSMEGDAWgBRdRrKNxEt0HLvt9XO2Orc4j3WefjANBgkq
-hkiG9w0BAQUFAAOCAQEAvGqSTnpjheb/PWcaKD+QFn3b5Ed8qy53W10ZSrTPMylV
-/O5/jGSvLFFuw9rwNNlwZZAiZPuZe4zheMcZtKRT3K36kVUAMV/zJx1YJ2tyd2Lo
-GmuZSTxuCeeJ5K0uq8ekeXEoU+Zd5skrI3s/h0mGQzbhuFLAbDmVxZvjwvuXLjbR
-eJsog0AxuM6xIQT1fMPDHxslWN8j+Jhw1X0+xAcy/eqj+MpM8mK08IxFkyKvk0QV
-Il6dRAuy5qQxwAakFFyO+jKiyO9w7zAV0SAS6rYFz1IK+LE9515yQEo781I5hS4n
-GdssbIFwPbe/Qlc1dIpA0NqVVqwu3RMA3k/PMQ9u1Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.classiques-garnier.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.classiques-garnier.com,O=Classiques Garnier,OU=IT,L=Paris,ST=Ile de france,C=FR</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFWzCCBEOgAwIBAgISESEko+D0ngEzpFmIWn1HeSK3MA0GCSqGSIb3DQEBBQUA
-MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
-VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
-HhcNMTIwMTAzMTY0MDAwWhcNMTQwNzI3MTM1MjM3WjCBhDELMAkGA1UEBhMCRlIx
-FjAUBgNVBAgTDUlsZSBkZSBmcmFuY2UxDjAMBgNVBAcTBVBhcmlzMQswCQYDVQQL
-EwJJVDEbMBkGA1UEChMSQ2xhc3NpcXVlcyBHYXJuaWVyMSMwIQYDVQQDExp3d3cu
-Y2xhc3NpcXVlcy1nYXJuaWVyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAL8nP9d6RChOzUaiDbYkFQAoV8Qz8cn11CiYwNBz/+SOQjrvQz2toPH8
-AblzFYG5YRA8krcqYS09yZ5ftk43PYwFu/RwFbv3AwmfOI+KfqAgSQBj2Qk3j37Z
-EYoS7n2qhcMUrbHOKkUFOTH8HB+Gn2jEnEmkNHAJr/TjHtA/Nx2nc5C9e3UX0Arh
-5f3pbyE9xhbyXjoF15sdIWepoZHD0IZkNdVDNOfMJ6CEPfIVPcjmEeFi37eMd7Gd
-LFMMwT6CxCL9EybL+cuVXHob7XTSLlqAg1ZN3cc3QhRtJ0iqbzJkGMLaL+iRJX6b
-m3RRDtP8z4kPrmv/KvuVQyPousdWzIUCAwEAAaOCAeswggHnMA4GA1UdDwEB/wQE
-AwIFoDBMBgNVHSAERTBDMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRw
-czovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzA9BgNVHREENjA0ghp3
-d3cuY2xhc3NpcXVlcy1nYXJuaWVyLmNvbYIWY2xhc3NpcXVlcy1nYXJuaWVyLmNv
-bTAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBFBgNV
-HR8EPjA8MDqgOKA2hjRodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzL2dzb3Jn
-YW5pemF0aW9udmFsZzIuY3JsMIGWBggrBgEFBQcBAQSBiTCBhjBHBggrBgEFBQcw
-AoY7aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6
-YXRpb252YWxnMi5jcnQwOwYIKwYBBQUHMAGGL2h0dHA6Ly9vY3NwMi5nbG9iYWxz
-aWduLmNvbS9nc29yZ2FuaXphdGlvbnZhbGcyMB0GA1UdDgQWBBQUAStvDufpti4t
-GxHlzG/rcv/EizAfBgNVHSMEGDAWgBRdRrKNxEt0HLvt9XO2Orc4j3WefjANBgkq
-hkiG9w0BAQUFAAOCAQEAvGqSTnpjheb/PWcaKD+QFn3b5Ed8qy53W10ZSrTPMylV
-/O5/jGSvLFFuw9rwNNlwZZAiZPuZe4zheMcZtKRT3K36kVUAMV/zJx1YJ2tyd2Lo
-GmuZSTxuCeeJ5K0uq8ekeXEoU+Zd5skrI3s/h0mGQzbhuFLAbDmVxZvjwvuXLjbR
-eJsog0AxuM6xIQT1fMPDHxslWN8j+Jhw1X0+xAcy/eqj+MpM8mK08IxFkyKvk0QV
-Il6dRAuy5qQxwAakFFyO+jKiyO9w7zAV0SAS6rYFz1IK+LE9515yQEo781I5hS4n
-GdssbIFwPbe/Qlc1dIpA0NqVVqwu3RMA3k/PMQ9u1Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.classiques-garnier.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.classiques-garnier.com,O=Classiques Garnier,OU=IT,L=Paris,ST=Ile de france,C=FR</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFWzCCBEOgAwIBAgISESEko+D0ngEzpFmIWn1HeSK3MA0GCSqGSIb3DQEBBQUA
-MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
-VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
-HhcNMTIwMTAzMTY0MDAwWhcNMTQwNzI3MTM1MjM3WjCBhDELMAkGA1UEBhMCRlIx
-FjAUBgNVBAgTDUlsZSBkZSBmcmFuY2UxDjAMBgNVBAcTBVBhcmlzMQswCQYDVQQL
-EwJJVDEbMBkGA1UEChMSQ2xhc3NpcXVlcyBHYXJuaWVyMSMwIQYDVQQDExp3d3cu
-Y2xhc3NpcXVlcy1nYXJuaWVyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAL8nP9d6RChOzUaiDbYkFQAoV8Qz8cn11CiYwNBz/+SOQjrvQz2toPH8
-AblzFYG5YRA8krcqYS09yZ5ftk43PYwFu/RwFbv3AwmfOI+KfqAgSQBj2Qk3j37Z
-EYoS7n2qhcMUrbHOKkUFOTH8HB+Gn2jEnEmkNHAJr/TjHtA/Nx2nc5C9e3UX0Arh
-5f3pbyE9xhbyXjoF15sdIWepoZHD0IZkNdVDNOfMJ6CEPfIVPcjmEeFi37eMd7Gd
-LFMMwT6CxCL9EybL+cuVXHob7XTSLlqAg1ZN3cc3QhRtJ0iqbzJkGMLaL+iRJX6b
-m3RRDtP8z4kPrmv/KvuVQyPousdWzIUCAwEAAaOCAeswggHnMA4GA1UdDwEB/wQE
-AwIFoDBMBgNVHSAERTBDMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRw
-czovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzA9BgNVHREENjA0ghp3
-d3cuY2xhc3NpcXVlcy1nYXJuaWVyLmNvbYIWY2xhc3NpcXVlcy1nYXJuaWVyLmNv
-bTAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBFBgNV
-HR8EPjA8MDqgOKA2hjRodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzL2dzb3Jn
-YW5pemF0aW9udmFsZzIuY3JsMIGWBggrBgEFBQcBAQSBiTCBhjBHBggrBgEFBQcw
-AoY7aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6
-YXRpb252YWxnMi5jcnQwOwYIKwYBBQUHMAGGL2h0dHA6Ly9vY3NwMi5nbG9iYWxz
-aWduLmNvbS9nc29yZ2FuaXphdGlvbnZhbGcyMB0GA1UdDgQWBBQUAStvDufpti4t
-GxHlzG/rcv/EizAfBgNVHSMEGDAWgBRdRrKNxEt0HLvt9XO2Orc4j3WefjANBgkq
-hkiG9w0BAQUFAAOCAQEAvGqSTnpjheb/PWcaKD+QFn3b5Ed8qy53W10ZSrTPMylV
-/O5/jGSvLFFuw9rwNNlwZZAiZPuZe4zheMcZtKRT3K36kVUAMV/zJx1YJ2tyd2Lo
-GmuZSTxuCeeJ5K0uq8ekeXEoU+Zd5skrI3s/h0mGQzbhuFLAbDmVxZvjwvuXLjbR
-eJsog0AxuM6xIQT1fMPDHxslWN8j+Jhw1X0+xAcy/eqj+MpM8mK08IxFkyKvk0QV
-Il6dRAuy5qQxwAakFFyO+jKiyO9w7zAV0SAS6rYFz1IK+LE9515yQEo781I5hS4n
-GdssbIFwPbe/Qlc1dIpA0NqVVqwu3RMA3k/PMQ9u1Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.classiques-garnier.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.classiques-garnier.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.classiques-garnier.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.classiques-garnier.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.classiques-garnier.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.classiques-garnier.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.classiques-garnier.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.classiques-garnier.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Classiques Garnier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Classiques Garnier SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.classiques-garnier.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Didier</GivenName>
-    <SurName>Corbiere</SurName>
-    <EmailAddress>didiercorbiere@classiques-garnier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Claude</GivenName>
-    <SurName>Blum</SurName>
-    <EmailAddress>cblum@wanadoo.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.content-select.com.xml b/swamid-interfederations-2.0/www.content-select.com.xml
deleted file mode 100644
index 99d029a2..00000000
--- a/swamid-interfederations-2.0/www.content-select.com.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.content-select.com/simplesaml/module.php/saml/sp/metadata.php/preselect.media-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.content-select.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.content-select.com,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)11,OU=GT34580426,O=www.content-select.com,C=DE,serialNumber=KigR834DJIZuIEHAagJ0xVfd/ETeEvlJ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE9zCCA9+gAwIBAgIDBEopMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTExMjA1MTIxNzQ0WhcNMTIxMjA3MTIxMzAwWjCB8zEpMCcGA1UEBRMgS2ln
-UjgzNERKSVp1SUVIQWFnSjB4VmZkL0VUZUV2bEoxCzAJBgNVBAYTAkRFMR8wHQYD
-VQQKExZ3d3cuY29udGVudC1zZWxlY3QuY29tMRMwEQYDVQQLEwpHVDM0NTgwNDI2
-MTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNvbS9yZXNvdXJjZXMvY3BzIChj
-KTExMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQgLSBSYXBpZFNT
-TChSKTEfMB0GA1UEAxMWd3d3LmNvbnRlbnQtc2VsZWN0LmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANSTVbAyh0XF+bApU51WEeiotNOn7q/HQ7/Z
-0DSSTgsklWbB5kgDBBo4flY5a/PWuO0H5jBWAs2DXALafzelgMYssqA2up9xiK3M
-eIVDro2W+2yFv9CfODJyIVCD8vTZFjqSfoehHF2Pjzp1YAQE0MUbgtX+VCE8oUOL
-tpp2iT7XHOr6DPD/6k8dovxuKQyo1xSkiyJ4CW/HrZQ+heauzyTXalZEfJDMlKib
-WnhjdpoXUA6xOSXoh992UjuEQxXoCYkGZHJQCaHBRx9UFuG4TMVRzq6g9h//Xcld
-H+H8xRctL7G2q1ehJm0IDLd9fOkvYyHTJWDy184/92R9BUSAlk0CAwEAAaOCAUgw
-ggFEMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQE
-AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwNQYDVR0RBC4wLIIW
-d3d3LmNvbnRlbnQtc2VsZWN0LmNvbYISY29udGVudC1zZWxlY3QuY29tMEMGA1Ud
-HwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2Ny
-bHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBRjoYiCPyPt2k/XtEiyOs1ET+ygvjAM
-BgNVHRMBAf8EAjAAMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
-L3JhcGlkc3NsLWFpYS5nZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MA0GCSqGSIb3
-DQEBBQUAA4IBAQAYh5XWr45tlba/mmjOSw2HkGTqRk9rxN6K8VeXwG1+1hr7d2J7
-P34Tt8ln6vBAiSBrNW1j+kHXpxfUS+k/EGTn4m+2NfbKJfKHqEDgUGjYtI5/lu+T
-TrczpZ5qf+a8HSnnnbyH4IL7VKPUneQ22EGppDKLf1FznpJ4pXFmGyM4XU68mlmT
-VqFzNc/40cAysWElKPnDuaEeaNHPj+ygg16o2gELDdZVpcqNPj/u2sGyG8Ve0DoT
-5PFbqWVKT7ei0rDFL5jWiqrmDWQGDJ7afzoPozmz4jaZXVxOkC5bHTL0wtHVFG8Z
-XvtaOslqoxKB8TiLxGjJAXztJJFWwMwF5ebp
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.content-select.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.content-select.com,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)11,OU=GT34580426,O=www.content-select.com,C=DE,serialNumber=KigR834DJIZuIEHAagJ0xVfd/ETeEvlJ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE9zCCA9+gAwIBAgIDBEopMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTExMjA1MTIxNzQ0WhcNMTIxMjA3MTIxMzAwWjCB8zEpMCcGA1UEBRMgS2ln
-UjgzNERKSVp1SUVIQWFnSjB4VmZkL0VUZUV2bEoxCzAJBgNVBAYTAkRFMR8wHQYD
-VQQKExZ3d3cuY29udGVudC1zZWxlY3QuY29tMRMwEQYDVQQLEwpHVDM0NTgwNDI2
-MTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNvbS9yZXNvdXJjZXMvY3BzIChj
-KTExMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQgLSBSYXBpZFNT
-TChSKTEfMB0GA1UEAxMWd3d3LmNvbnRlbnQtc2VsZWN0LmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANSTVbAyh0XF+bApU51WEeiotNOn7q/HQ7/Z
-0DSSTgsklWbB5kgDBBo4flY5a/PWuO0H5jBWAs2DXALafzelgMYssqA2up9xiK3M
-eIVDro2W+2yFv9CfODJyIVCD8vTZFjqSfoehHF2Pjzp1YAQE0MUbgtX+VCE8oUOL
-tpp2iT7XHOr6DPD/6k8dovxuKQyo1xSkiyJ4CW/HrZQ+heauzyTXalZEfJDMlKib
-WnhjdpoXUA6xOSXoh992UjuEQxXoCYkGZHJQCaHBRx9UFuG4TMVRzq6g9h//Xcld
-H+H8xRctL7G2q1ehJm0IDLd9fOkvYyHTJWDy184/92R9BUSAlk0CAwEAAaOCAUgw
-ggFEMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQE
-AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwNQYDVR0RBC4wLIIW
-d3d3LmNvbnRlbnQtc2VsZWN0LmNvbYISY29udGVudC1zZWxlY3QuY29tMEMGA1Ud
-HwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2Ny
-bHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBRjoYiCPyPt2k/XtEiyOs1ET+ygvjAM
-BgNVHRMBAf8EAjAAMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
-L3JhcGlkc3NsLWFpYS5nZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MA0GCSqGSIb3
-DQEBBQUAA4IBAQAYh5XWr45tlba/mmjOSw2HkGTqRk9rxN6K8VeXwG1+1hr7d2J7
-P34Tt8ln6vBAiSBrNW1j+kHXpxfUS+k/EGTn4m+2NfbKJfKHqEDgUGjYtI5/lu+T
-TrczpZ5qf+a8HSnnnbyH4IL7VKPUneQ22EGppDKLf1FznpJ4pXFmGyM4XU68mlmT
-VqFzNc/40cAysWElKPnDuaEeaNHPj+ygg16o2gELDdZVpcqNPj/u2sGyG8Ve0DoT
-5PFbqWVKT7ei0rDFL5jWiqrmDWQGDJ7afzoPozmz4jaZXVxOkC5bHTL0wtHVFG8Z
-XvtaOslqoxKB8TiLxGjJAXztJJFWwMwF5ebp
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml2-logout.php/preselect.media-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml2-acs.php/preselect.media-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml1-acs.php/preselect.media-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml2-acs.php/preselect.media-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml1-acs.php/preselect.media-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Preselect.media GmbH, Gruenwald</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Preselect.media GmbH, Gruenwald</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.content-select.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Fuerlinger</SurName>
-    <EmailAddress>a.fuerlinger@preselect.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dawsonera.com.xml b/swamid-interfederations-2.0/www.dawsonera.com.xml
deleted file mode 100644
index 001581ea..00000000
--- a/swamid-interfederations-2.0/www.dawsonera.com.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dawsonera.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.dawsonera.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dawsonera.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dawsonera.com,O=Semantico,L=Brighton,ST=East Sussex,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIQOvdMPhrRfQvKM2FkVMlM6DANBgkqhkiG9w0BAQUFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEwMTAwODAwMDAwMFoXDTEzMTAyOTIzNTk1OVowZjEL
-MAkGA1UEBhMCR0IxFDASBgNVBAgTC0Vhc3QgU3Vzc2V4MREwDwYDVQQHFAhCcmln
-aHRvbjESMBAGA1UEChQJU2VtYW50aWNvMRowGAYDVQQDFBF3d3cuZGF3c29uZXJh
-LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1SMQWlmopgjZeH8ITGnf
-qjgJA+trii8i7lHAjm7EQZS0GS6A7gTtUFlc4pIPPzR2OpgkHM8TcjSQCTAPFmp1
-hfUts6JkWTTe0TVHC4VqKuUtWPmq4oo5XsTTzTRt0MV7iLROkI/NNMf0qbgHEFo+
-TkljHi1mmQhYsJ3LLO+Py4sCAwEAAaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9zdnItb3YtY3JsLnRoYXd0ZS5jb20vVGhhd3Rl
-T1YuY3JsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcB
-AQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZI
-hvcNAQEFBQADggEBAG8liYbeb9+qVKIX/QHZzbMck5+/jROd42ggIoIDJlGawBZA
-PJ8Q5zxoJwKWcBJ7M1sI/wcI4HntFJgB00fAFGwK1mQo8+kfOCAaSPWEOwomBffc
-ATMBokvtILGbxmsCtMEFE+R94Bjdvgn/WsOHqj1LO8xNHtOGvbPDMb0NdS+W3R1T
-yArxEur5uitLP7u/9AcboSbsWJr+EfPmyN4K5p433zWobY9gMpOaIZ5tt3nVuIof
-Q2zQ39BwHPIUmro1+VsSXK4/Vc2Mg0lraBHNHKBM9H7g7JhTtDZ3YejMB5LxyPSX
-A+7vljJkaaHxaiFXuPXHzIPyGnY9og0BorlaDE0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dawsonera.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dawsonera.com,O=Semantico,L=Brighton,ST=East Sussex,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIQOvdMPhrRfQvKM2FkVMlM6DANBgkqhkiG9w0BAQUFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEwMTAwODAwMDAwMFoXDTEzMTAyOTIzNTk1OVowZjEL
-MAkGA1UEBhMCR0IxFDASBgNVBAgTC0Vhc3QgU3Vzc2V4MREwDwYDVQQHFAhCcmln
-aHRvbjESMBAGA1UEChQJU2VtYW50aWNvMRowGAYDVQQDFBF3d3cuZGF3c29uZXJh
-LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1SMQWlmopgjZeH8ITGnf
-qjgJA+trii8i7lHAjm7EQZS0GS6A7gTtUFlc4pIPPzR2OpgkHM8TcjSQCTAPFmp1
-hfUts6JkWTTe0TVHC4VqKuUtWPmq4oo5XsTTzTRt0MV7iLROkI/NNMf0qbgHEFo+
-TkljHi1mmQhYsJ3LLO+Py4sCAwEAAaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9zdnItb3YtY3JsLnRoYXd0ZS5jb20vVGhhd3Rl
-T1YuY3JsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcB
-AQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZI
-hvcNAQEFBQADggEBAG8liYbeb9+qVKIX/QHZzbMck5+/jROd42ggIoIDJlGawBZA
-PJ8Q5zxoJwKWcBJ7M1sI/wcI4HntFJgB00fAFGwK1mQo8+kfOCAaSPWEOwomBffc
-ATMBokvtILGbxmsCtMEFE+R94Bjdvgn/WsOHqj1LO8xNHtOGvbPDMb0NdS+W3R1T
-yArxEur5uitLP7u/9AcboSbsWJr+EfPmyN4K5p433zWobY9gMpOaIZ5tt3nVuIof
-Q2zQ39BwHPIUmro1+VsSXK4/Vc2Mg0lraBHNHKBM9H7g7JhTtDZ3YejMB5LxyPSX
-A+7vljJkaaHxaiFXuPXHzIPyGnY9og0BorlaDE0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Dawson Books</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">dawsonera</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dawsonbooks.co.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Claire</GivenName>
-    <SurName>Chandler</SurName>
-    <EmailAddress>claire.chandler@dawsonbooks.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jude</GivenName>
-    <SurName>Norris</SurName>
-    <EmailAddress>jude.norris@dawsonbooks.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dbod.de.xml b/swamid-interfederations-2.0/www.dbod.de.xml
deleted file mode 100644
index 08cfe29f..00000000
--- a/swamid-interfederations-2.0/www.dbod.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dbod.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dbod.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dbod.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkTCCBHmgAwIBAgIEEXxf/jANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTEwMjE3MDg1NTExWhcNMTQw
-MjE2MDg1NTExWjCBnzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMRQwEgYDVQQDEwt3d3cuZGJvZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALuMaNZjp0yrjtPDHzW+rQG9wzGUET5nhfyr9KCz+SZTl82k
-e4jzNHpvkIr5qbmm+iEMllOzkGCcFCqSRq/LPyw/KqxcSJGDsgMjkM6BvczNUoQE
-LraQiZD/0K5Omzy/k35H8ORIRiNqMUhJHaDDT4veadScxhpIEVp2Nb2WY0P19tpX
-25sHSqsWHvryub76qcgnP4BIlvDrzBIRlCXDOW32ZeYWNtugrJz3e8mD/cOCRlKt
-j7AxdcOVSQ39Sov5pnvniOPzHI/rWdbekPwmztXMn+KHQ9FW8ey2zDVrfkK/E0k4
-dUwsP24skPmmhsIxoy0b+o3A9R9yuWijm/RagJkCAwEAAaOCAeswggHnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcD
-AQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBTk+peHdyI4FoF+ubcz
-XhMjwILo/zAfBgNVHSMEGDAWgBTFK1OTF4PJ9UZC7UNq37aApkfy4DAiBgNVHREE
-GzAZgRduaWVkZXJsQHNsdWItZHJlc2Rlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6
-hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2EvcHViL2NybC9n
-X2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1kcmVz
-ZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2Ev
-cHViL2NhY2VydC9nX2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAatFyUpdktAeX3l5aqPvdjv5wstVOEvYA1f/s
-zEdj/QLmpeUMi+tzXRnAVzvHs46dnDJrY5DGiy75/zBgd5AhEb0ZRfcg25RZnflP
-pSwc675wZoiUowr5yVwsjlnTHpBj5sVGruglTnePFxDlWSoeknTcI0d461ELz+l2
-rPyraiLMRud8qxLPorHQv/el35jYzatt2fPuGjNkB7Iq4LokT2cQ3Em1PKK+7ICk
-ZZK61G21eejcP9ymQWhDSjvBg+e2qUZsm+GzQoRniXkRb5S17fMjwu+IMRAk/2cV
-yMFeLSMQWDo5MjmDApWgf7WN5Nc/kBGqUi6DB3K3h6MI5O1scg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dbod.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dbod.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkTCCBHmgAwIBAgIEEXxf/jANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTEwMjE3MDg1NTExWhcNMTQw
-MjE2MDg1NTExWjCBnzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMRQwEgYDVQQDEwt3d3cuZGJvZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALuMaNZjp0yrjtPDHzW+rQG9wzGUET5nhfyr9KCz+SZTl82k
-e4jzNHpvkIr5qbmm+iEMllOzkGCcFCqSRq/LPyw/KqxcSJGDsgMjkM6BvczNUoQE
-LraQiZD/0K5Omzy/k35H8ORIRiNqMUhJHaDDT4veadScxhpIEVp2Nb2WY0P19tpX
-25sHSqsWHvryub76qcgnP4BIlvDrzBIRlCXDOW32ZeYWNtugrJz3e8mD/cOCRlKt
-j7AxdcOVSQ39Sov5pnvniOPzHI/rWdbekPwmztXMn+KHQ9FW8ey2zDVrfkK/E0k4
-dUwsP24skPmmhsIxoy0b+o3A9R9yuWijm/RagJkCAwEAAaOCAeswggHnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcD
-AQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBTk+peHdyI4FoF+ubcz
-XhMjwILo/zAfBgNVHSMEGDAWgBTFK1OTF4PJ9UZC7UNq37aApkfy4DAiBgNVHREE
-GzAZgRduaWVkZXJsQHNsdWItZHJlc2Rlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6
-hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2EvcHViL2NybC9n
-X2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1kcmVz
-ZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2Ev
-cHViL2NhY2VydC9nX2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAatFyUpdktAeX3l5aqPvdjv5wstVOEvYA1f/s
-zEdj/QLmpeUMi+tzXRnAVzvHs46dnDJrY5DGiy75/zBgd5AhEb0ZRfcg25RZnflP
-pSwc675wZoiUowr5yVwsjlnTHpBj5sVGruglTnePFxDlWSoeknTcI0d461ELz+l2
-rPyraiLMRud8qxLPorHQv/el35jYzatt2fPuGjNkB7Iq4LokT2cQ3Em1PKK+7ICk
-ZZK61G21eejcP9ymQWhDSjvBg+e2qUZsm+GzQoRniXkRb5S17fMjwu+IMRAk/2cV
-yMFeLSMQWDo5MjmDApWgf7WN5Nc/kBGqUi6DB3K3h6MI5O1scg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dbod.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dbod.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dbod.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dbod.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dbod.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dbod.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dbod.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dbod.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dbod.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dbod.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dbod.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dbod.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dbod.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dbod.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DBoD</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DBoD - Databases on Demand</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dbod.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Falk</GivenName>
-    <SurName>Niederlein</SurName>
-    <EmailAddress>niederl@slub-dresden.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.degruyter.com.xml b/swamid-interfederations-2.0/www.degruyter.com.xml
deleted file mode 100644
index 1d104706..00000000
--- a/swamid-interfederations-2.0/www.degruyter.com.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.degruyter.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.degruyter.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.degruyter.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIEEpCtsTANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDExF3
-d3cuZGVncnV5dGVyLmNvbTAeFw0xMjAxMjcwMzE2MzBaFw0xNTAxMjYwMzE2MzBa
-MBwxGjAYBgNVBAMTEXd3dy5kZWdydXl0ZXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtToxdgbSOQHMFtLO+p50jHIis3Cg1n08fU8scnC5mGnm
-QKBb+io0YLFMZ+pGrYWl3nOr3lsVnSj+7FWTJYWlGqkGf4fW0htYxeLUYTmw17pg
-2yzjaKKmefQ5EX03dVnMmFfG6n4ITBms/xm28u3JRWmAZ8i4SUZhsZM1UAKmyddv
-DeF4P/MDOg+HotkEZzv8Ce0Iqf5xS2Gl2NvJuQBVQfROyXvC1UvWFPJry8Sp5izg
-nekjb87CWD/sHj/1/ih+t7KTKhyqPEcdywOYzVAlL28LNJm1Sx2T6b+qmxu0sLe8
-e0A7K8/Klevx0c+L+1apbh1vYVH4e3KN+mhsUbBSyQIDAQABo2UwYzAdBgNVHQ4E
-FgQUX0SLbR2HWLTt/d7PhuyMq4CVAD0wQgYDVR0RBDswOYYkaHR0cHM6Ly93d3cu
-ZGVncnV5dGVyLmNvbS9zaGliYm9sZXRoghF3d3cuZGVncnV5dGVyLmNvbTANBgkq
-hkiG9w0BAQsFAAOCAQEAM/uD1qjWNFP9lOUk48zRve2pIZIkq+lOr4JB7ORLUaLn
-UFIC3ay1JwSGEoaic0VA9kNGCfevUluMLZJfAtYYQkTx0hqF264tf8W2MdvaFlJa
-WwqciyEhs/Wg4daMUoSfCrKUwhwb3veY5nToqgJ5zJ/5sZYRdjzDH7PumH3klSG0
-e6FV3DgCekCajSBjOoQLjlcgseHXTX3/JguL9uyJVxMNPArbW6ciE7nCAXwg2neL
-klxijSNZsJQno36M5UueC9aLK4mdoJrS06CRLOeyxBNQachanmq6XBx/yWSeBBq5
-vxnuL36+AybWxM2JdPoPKWxXLxi9KgtY1Fw/Heyaug==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.degruyter.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.degruyter.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIEEpCtsTANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDExF3
-d3cuZGVncnV5dGVyLmNvbTAeFw0xMjAxMjcwMzE2MzBaFw0xNTAxMjYwMzE2MzBa
-MBwxGjAYBgNVBAMTEXd3dy5kZWdydXl0ZXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtToxdgbSOQHMFtLO+p50jHIis3Cg1n08fU8scnC5mGnm
-QKBb+io0YLFMZ+pGrYWl3nOr3lsVnSj+7FWTJYWlGqkGf4fW0htYxeLUYTmw17pg
-2yzjaKKmefQ5EX03dVnMmFfG6n4ITBms/xm28u3JRWmAZ8i4SUZhsZM1UAKmyddv
-DeF4P/MDOg+HotkEZzv8Ce0Iqf5xS2Gl2NvJuQBVQfROyXvC1UvWFPJry8Sp5izg
-nekjb87CWD/sHj/1/ih+t7KTKhyqPEcdywOYzVAlL28LNJm1Sx2T6b+qmxu0sLe8
-e0A7K8/Klevx0c+L+1apbh1vYVH4e3KN+mhsUbBSyQIDAQABo2UwYzAdBgNVHQ4E
-FgQUX0SLbR2HWLTt/d7PhuyMq4CVAD0wQgYDVR0RBDswOYYkaHR0cHM6Ly93d3cu
-ZGVncnV5dGVyLmNvbS9zaGliYm9sZXRoghF3d3cuZGVncnV5dGVyLmNvbTANBgkq
-hkiG9w0BAQsFAAOCAQEAM/uD1qjWNFP9lOUk48zRve2pIZIkq+lOr4JB7ORLUaLn
-UFIC3ay1JwSGEoaic0VA9kNGCfevUluMLZJfAtYYQkTx0hqF264tf8W2MdvaFlJa
-WwqciyEhs/Wg4daMUoSfCrKUwhwb3veY5nToqgJ5zJ/5sZYRdjzDH7PumH3klSG0
-e6FV3DgCekCajSBjOoQLjlcgseHXTX3/JguL9uyJVxMNPArbW6ciE7nCAXwg2neL
-klxijSNZsJQno36M5UueC9aLK4mdoJrS06CRLOeyxBNQachanmq6XBx/yWSeBBq5
-vxnuL36+AybWxM2JdPoPKWxXLxi9KgtY1Fw/Heyaug==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.degruyter.com/oa/auth/rcv/shib/post" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.degruyter.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.degruyter.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.degruyter.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">De Gruyter Online</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">De Gruyter Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.degruyter.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Cipriano</SurName>
-    <EmailAddress>it@ifactory.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrike</GivenName>
-    <SurName>Engel</SurName>
-    <EmailAddress>ulrike.engel@degruyter.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.elearning.tum.de.xml b/swamid-interfederations-2.0/www.elearning.tum.de.xml
deleted file mode 100644
index 6120dc6d..00000000
--- a/swamid-interfederations-2.0/www.elearning.tum.de.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.elearning.tum.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.elearning.tum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.elearning.tum.de,OU=Projekt elecTUM,O=Technische Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIEDC0/vTANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgTXVlbmNoZW4xJjAk
-BgNVBAMTHVplcnRpZml6aWVydW5nc3N0ZWxsZSBkZXIgVFVNMB4XDTA4MDQyMjEw
-NDcwOVoXDTEzMDQyMTEwNDcwOVowgZUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-YXllcm4xETAPBgNVBAcTCE11ZW5jaGVuMSkwJwYDVQQKEyBUZWNobmlzY2hlIFVu
-aXZlcnNpdGFldCBNdWVuY2hlbjEYMBYGA1UECxMPUHJvamVrdCBlbGVjVFVNMR0w
-GwYDVQQDExR3d3cuZWxlYXJuaW5nLnR1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAM7mYPJAR+xABFJb/xPrYTGBLuLxeKuhBkYWtZGVrbMTsKi3
-pbVmXrTgsU0dZrYK6qa9CVsauocsH25bfv4lfaIFil0QVBWVj9BWEZLHAKILV4cT
-0G5Qeitk1Sms1N8cBb3R9PuBIGscCeqauezCmvXVhtJrkndyWYXSKPC51fBncZ/q
-QVsaMjG9paCzQV1MyhwWEmAOaGFkPRLw/81wTMhkn43YhAjsUuHKHsAMWbIN8Cbr
-A+oauyWyO+Hymp98fnFFJGxOVEy1LJvxif8vyEUsE4xsvfCKMivaedDyto5ZqVoe
-umrCKpw4bVr8VNpm79GnIedMUsGT6vFMrY9Wol0CAwEAAaOCAfgwggH0MAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUdcSHILTZvT6UzOzPXr1VtdwzdGAwHwYDVR0jBBgwFoAUnZ8j
-8BkbfscjXScqzKU2OqZp5YkwbQYDVR0RBGYwZIEYc3VwcG9ydEBlbGVhcm5pbmcu
-dHVtLmRlghR3d3cuZWxlYXJuaW5nLnR1bS5kZYIYZWxlYXJuMDEubHJ6LW11ZW5j
-aGVuLmRlghhlbGVhcm4wMy5scnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHVtLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDov
-L2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8G
-CCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1bS1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAJbraGE+3kyvCbfyUJqI
-oE6tr3Ilwu7A6EhAWGdsy1mNdLuSEI3BdoyKzr85c6k0g4ptc/C06GApQo5LKF3p
-2I5M3tU58nNWOmsu0VKQe1cP6oBZ60LOXaji8loUWcsOumNefZYnZVs7Tjcqqm0x
-nbvHB6UbxkMlHUoH9O8/Q0i9O6uanF7vuhJ8E+AbUV39cMfeGTA2oJeRHpj3BYwF
-eO9sT8rFaq/ij3JpDfNZ5RvZhwgN12fGssUVu/qK8BOrP6E3l68KMnXGfFxzVybL
-yhnKjkEA/K9OJhMb8hTnuUPGkaisGhNjd9/slKhYPkYZkkUUqX3ONUgYYWQ/i+zI
-CXA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.elearning.tum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.elearning.tum.de,OU=Projekt elecTUM,O=Technische Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIEDC0/vTANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgTXVlbmNoZW4xJjAk
-BgNVBAMTHVplcnRpZml6aWVydW5nc3N0ZWxsZSBkZXIgVFVNMB4XDTA4MDQyMjEw
-NDcwOVoXDTEzMDQyMTEwNDcwOVowgZUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-YXllcm4xETAPBgNVBAcTCE11ZW5jaGVuMSkwJwYDVQQKEyBUZWNobmlzY2hlIFVu
-aXZlcnNpdGFldCBNdWVuY2hlbjEYMBYGA1UECxMPUHJvamVrdCBlbGVjVFVNMR0w
-GwYDVQQDExR3d3cuZWxlYXJuaW5nLnR1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAM7mYPJAR+xABFJb/xPrYTGBLuLxeKuhBkYWtZGVrbMTsKi3
-pbVmXrTgsU0dZrYK6qa9CVsauocsH25bfv4lfaIFil0QVBWVj9BWEZLHAKILV4cT
-0G5Qeitk1Sms1N8cBb3R9PuBIGscCeqauezCmvXVhtJrkndyWYXSKPC51fBncZ/q
-QVsaMjG9paCzQV1MyhwWEmAOaGFkPRLw/81wTMhkn43YhAjsUuHKHsAMWbIN8Cbr
-A+oauyWyO+Hymp98fnFFJGxOVEy1LJvxif8vyEUsE4xsvfCKMivaedDyto5ZqVoe
-umrCKpw4bVr8VNpm79GnIedMUsGT6vFMrY9Wol0CAwEAAaOCAfgwggH0MAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUdcSHILTZvT6UzOzPXr1VtdwzdGAwHwYDVR0jBBgwFoAUnZ8j
-8BkbfscjXScqzKU2OqZp5YkwbQYDVR0RBGYwZIEYc3VwcG9ydEBlbGVhcm5pbmcu
-dHVtLmRlghR3d3cuZWxlYXJuaW5nLnR1bS5kZYIYZWxlYXJuMDEubHJ6LW11ZW5j
-aGVuLmRlghhlbGVhcm4wMy5scnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHVtLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDov
-L2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8G
-CCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1bS1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAJbraGE+3kyvCbfyUJqI
-oE6tr3Ilwu7A6EhAWGdsy1mNdLuSEI3BdoyKzr85c6k0g4ptc/C06GApQo5LKF3p
-2I5M3tU58nNWOmsu0VKQe1cP6oBZ60LOXaji8loUWcsOumNefZYnZVs7Tjcqqm0x
-nbvHB6UbxkMlHUoH9O8/Q0i9O6uanF7vuhJ8E+AbUV39cMfeGTA2oJeRHpj3BYwF
-eO9sT8rFaq/ij3JpDfNZ5RvZhwgN12fGssUVu/qK8BOrP6E3l68KMnXGfFxzVybL
-yhnKjkEA/K9OJhMb8hTnuUPGkaisGhNjd9/slKhYPkYZkkUUqX3ONUgYYWQ/i+zI
-CXA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elearning.tum.de/ACS" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität München (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Zentrale Lernplattform der TU München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Stephan</GivenName>
-    <SurName>Graf</SurName>
-    <EmailAddress>shibboleth@elearning.tum.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephan</GivenName>
-    <SurName>Graf</SurName>
-    <EmailAddress>shibboleth@elearning.tum.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml b/swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml
deleted file mode 100644
index e0ef7365..00000000
--- a/swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.hds.uni-leipzig.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.hds.uni-leipzig.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.hds.uni-leipzig.de,OU=Hochschuldidaktisches Zentrum Sachsen,O=Universitaet Leipzig,L=Leipzig,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFdTCCBF2gAwIBAgIEETAMJDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
-MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
-EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMDEyMjExMTI1MDhaFw0xNTEyMjAxMTI1
-MDhaMIGhMQswCQYDVQQGEwJERTEQMA4GA1UECBMHU2FjaHNlbjEQMA4GA1UEBxMH
-TGVpcHppZzEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxLjAsBgNVBAsT
-JUhvY2hzY2h1bGRpZGFrdGlzY2hlcyBaZW50cnVtIFNhY2hzZW4xHzAdBgNVBAMT
-Fnd3dy5oZHMudW5pLWxlaXB6aWcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCwt713W1EXhtA2GOp6k8kZxRhIm5LOsD2iqHs1pLZkbaxBO4y2bht6
-k6mdi4j0wbA0/wdv+JpYK1/wB6Cdaz6UEBwlqzy0+0pJ3G72xRPG/s/wmeAzOqzY
-ONGphoYWkGnz4aQ5tf3E+KILj0V3JisgZA7+pYyEXiX340NPzIyxOLKAyFxHwY/n
-aUWuQDLo+6dXRCFO6OqRW6v7tnyUji8Qa3gcv+BeEwRUZyvmoHQfirFhGP9FAYDZ
-s85KZ3pSU6046E/B1+8h9FOFEQB5vnZKmouF77h75DCJBDiSZd1TJaNWzvMScjzx
-ofFcCqn+wGTAMsijDm82iP0E1RY2/BaXAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFHlh5OdjyNAu5gk4Szo4xMeg5uqhMB8GA1UdIwQYMBaAFDaM3R6c0bqQ
-gPinird0ak3JN9oOMD0GA1UdEQQ2MDSCFnd3dy5oZHMudW5pLWxlaXB6aWcuZGWC
-GnZtaHNkaWRhLnJ6LnVuaS1sZWlwemlnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaWxlaS1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmlsZWktY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCRSA11s6iv
-eW6YcStHntggb0PZQ/LoT1mv+4cQ1KYkS7QJlSrJOqEjlsNYtB7LFGBOxYBSPm5g
-B/tipiS/tF/KOk8mjEVD1JhLHOoxE/JWNW7WKZ6pMsocJChRTRLalfSAFh88PHvo
-41zxUUhoj9LxXIdZn+Z06RbY+ssh76B1nqOghs0dYaMfH9MY/nGS742sA4Y5sGm4
-vhn4VI0GQGXWUiJi7FNfZkT7NTq7sX/FA04tgPui45NI5HfQCsvrZIiwXA9zaENp
-P6vvZAJd5omkVASomcfj5W9HEokIDNn3I8LTt07otBa9K1c64AZAoPaTpizm4w3a
-P4AvrRjtlBBB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.hds.uni-leipzig.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.hds.uni-leipzig.de,OU=Hochschuldidaktisches Zentrum Sachsen,O=Universitaet Leipzig,L=Leipzig,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFdTCCBF2gAwIBAgIEETAMJDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
-MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
-EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMDEyMjExMTI1MDhaFw0xNTEyMjAxMTI1
-MDhaMIGhMQswCQYDVQQGEwJERTEQMA4GA1UECBMHU2FjaHNlbjEQMA4GA1UEBxMH
-TGVpcHppZzEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxLjAsBgNVBAsT
-JUhvY2hzY2h1bGRpZGFrdGlzY2hlcyBaZW50cnVtIFNhY2hzZW4xHzAdBgNVBAMT
-Fnd3dy5oZHMudW5pLWxlaXB6aWcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCwt713W1EXhtA2GOp6k8kZxRhIm5LOsD2iqHs1pLZkbaxBO4y2bht6
-k6mdi4j0wbA0/wdv+JpYK1/wB6Cdaz6UEBwlqzy0+0pJ3G72xRPG/s/wmeAzOqzY
-ONGphoYWkGnz4aQ5tf3E+KILj0V3JisgZA7+pYyEXiX340NPzIyxOLKAyFxHwY/n
-aUWuQDLo+6dXRCFO6OqRW6v7tnyUji8Qa3gcv+BeEwRUZyvmoHQfirFhGP9FAYDZ
-s85KZ3pSU6046E/B1+8h9FOFEQB5vnZKmouF77h75DCJBDiSZd1TJaNWzvMScjzx
-ofFcCqn+wGTAMsijDm82iP0E1RY2/BaXAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFHlh5OdjyNAu5gk4Szo4xMeg5uqhMB8GA1UdIwQYMBaAFDaM3R6c0bqQ
-gPinird0ak3JN9oOMD0GA1UdEQQ2MDSCFnd3dy5oZHMudW5pLWxlaXB6aWcuZGWC
-GnZtaHNkaWRhLnJ6LnVuaS1sZWlwemlnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaWxlaS1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmlsZWktY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCRSA11s6iv
-eW6YcStHntggb0PZQ/LoT1mv+4cQ1KYkS7QJlSrJOqEjlsNYtB7LFGBOxYBSPm5g
-B/tipiS/tF/KOk8mjEVD1JhLHOoxE/JWNW7WKZ6pMsocJChRTRLalfSAFh88PHvo
-41zxUUhoj9LxXIdZn+Z06RbY+ssh76B1nqOghs0dYaMfH9MY/nGS742sA4Y5sGm4
-vhn4VI0GQGXWUiJi7FNfZkT7NTq7sX/FA04tgPui45NI5HfQCsvrZIiwXA9zaENp
-P6vvZAJd5omkVASomcfj5W9HEokIDNn3I8LTt07otBa9K1c64AZAoPaTpizm4w3a
-P4AvrRjtlBBB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschuldidaktisches Zentrum Sachsen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschuldidaktisches Zentrum Sachsen - Typo3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.hds.uni-leipzig.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Stefan</GivenName>
-    <SurName>Moch</SurName>
-    <EmailAddress>admin@bps-system.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.historicum.net.xml b/swamid-interfederations-2.0/www.historicum.net.xml
deleted file mode 100644
index 33983183..00000000
--- a/swamid-interfederations-2.0/www.historicum.net.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.historicum.net/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.historicum.net/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.historicum.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
-ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
-VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
-kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
-+qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
-/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
-V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
-3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
-syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
-cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
-3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
-2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
-bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
-J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
-IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
-CQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.historicum.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
-ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
-VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
-kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
-+qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
-/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
-V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
-3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
-syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
-cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
-3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
-2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
-bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
-J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
-IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
-CQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.historicum.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.historicum.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.historicum.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.historicum.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.historicum.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.historicum.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.historicum.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.historicum.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.historicum.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.historicum.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.historicum.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.historicum.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.historicum.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.historicum.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.historicum.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jstor.org.xml b/swamid-interfederations-2.0/www.jstor.org.xml
deleted file mode 100644
index 09fba2f1..00000000
--- a/swamid-interfederations-2.0/www.jstor.org.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jstor.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.jstor.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.jstor.org,OU=Terms of use at www.verisign.com/rpa (c)05,O=JSTOR (Ithaka Harbors\, Inc),L=Ann Arbor,ST=Michigan,C=US,serialNumber=DOC:19950731,businessCategory=V1.0\, Clause 5.(b),1.3.6.1.4.1.311.60.2.1.2=#14084E657720596F726B,1.3.6.1.4.1.311.60.2.1.3=#13025553</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGHzCCBQegAwIBAgIQXmXbqCJpgZQaxPy2I4z7MzANBgkqhkiG9w0BAQUFADCB
-ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr
-VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x
-MDAyMjYwMDAwMDBaFw0xMjAyMjQyMzU5NTlaMIIBCzETMBEGCysGAQQBgjc8AgED
-EwJVUzEZMBcGCysGAQQBgjc8AgECFAhOZXcgWW9yazEbMBkGA1UEDxMSVjEuMCwg
-Q2xhdXNlIDUuKGIpMRUwEwYDVQQFEwxET0M6MTk5NTA3MzExCzAJBgNVBAYTAlVT
-MREwDwYDVQQIFAhNaWNoaWdhbjESMBAGA1UEBxQJQW5uIEFyYm9yMSQwIgYDVQQK
-FBtKU1RPUiAoSXRoYWthIEhhcmJvcnMsIEluYykxMzAxBgNVBAsUKlRlcm1zIG9m
-IHVzZSBhdCB3d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNTEWMBQGA1UEAxQNd3d3
-LmpzdG9yLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALUHbY3t
-UhCGReVnUwqLCU7elcq4FNKRvTajIvfdnmwB4zXGtZZGoIIoCS8yVFAYPAsT48+m
-xJ3y3GxhNM38nuZjjZi3Rp3ab0RpNoHfmlozTdvMdlbOzOpC6RVSgnyYcKouIw1c
-X4UH0yRbd/8evLK1H7I4VIug1YoZfPC7mr8HCppJJlIfxilS46ruQL75jQEWks7C
-bmB5tQNCr5ah6OnnskGXRHF5hpQmF/3aBvRuPDa3wl3EIlnSAhCoMgE7gPHqLcjX
-hIKX/MrGPuMHEMhBfXMq3yOzuTjX03ukwqUM5Fb0LijWonQz1PQIN8QPaJLo+8Qj
-pKfkUJ6lmQY1Oy8CAwEAAaOCAcswggHHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWg
-MEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3VyZS1jcmwudmVyaXNpZ24u
-Y29tL0VWU2VjdXJlMjAwNi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXBjAq
-MCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vY3BzMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBT8ilC6nrklWntV
-hU+VAGOP6VhrQzBzBggrBgEFBQcBAQRnMGUwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLnZlcmlzaWduLmNvbTA9BggrBgEFBQcwAoYxaHR0cDovL0VWU2VjdXJlLWFp
-YS52ZXJpc2lnbi5jb20vRVZTZWN1cmUyMDA2LmNlcjBuBggrBgEFBQcBDARiMGCh
-XqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsp
-rEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYw
-DQYJKoZIhvcNAQEFBQADggEBAFdIEgpPjryqc6c4Cn5beVW3U6StHIHn6K1Pmdjm
-zg3KrMWh7q7XYwATkG3+E3xl/j0gcgp3JOZF/WudfIYlanoTIdwtcgH3atiD+V1E
-RuOy19Qagr5LZG6ZSfsUR+kGaQTRWolznngzKiJOhjYt0RH7IGnJ8NCNpFWFgCjJ
-UWJqHCSkQ+fmjmpJMa+XE7r2YeqamXA6RNA7tH6Sk/BM92PuI3yyPuMVxKVHSFEB
-Cp5hKvpnTsU7XXEyje/rfDvAVbO34z34/Z3uWPr5C710E2aV3/As2xRF9kYmMcsb
-1NGyA/5UtjYY/ZuPpIVnXu4ldkf2oMIohwcE9K/1j6k4B3Q=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.jstor.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.jstor.org,OU=Terms of use at www.verisign.com/rpa (c)05,O=JSTOR (Ithaka Harbors\, Inc),L=Ann Arbor,ST=Michigan,C=US,serialNumber=DOC:19950731,businessCategory=V1.0\, Clause 5.(b),1.3.6.1.4.1.311.60.2.1.2=#14084E657720596F726B,1.3.6.1.4.1.311.60.2.1.3=#13025553</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGHzCCBQegAwIBAgIQXmXbqCJpgZQaxPy2I4z7MzANBgkqhkiG9w0BAQUFADCB
-ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr
-VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x
-MDAyMjYwMDAwMDBaFw0xMjAyMjQyMzU5NTlaMIIBCzETMBEGCysGAQQBgjc8AgED
-EwJVUzEZMBcGCysGAQQBgjc8AgECFAhOZXcgWW9yazEbMBkGA1UEDxMSVjEuMCwg
-Q2xhdXNlIDUuKGIpMRUwEwYDVQQFEwxET0M6MTk5NTA3MzExCzAJBgNVBAYTAlVT
-MREwDwYDVQQIFAhNaWNoaWdhbjESMBAGA1UEBxQJQW5uIEFyYm9yMSQwIgYDVQQK
-FBtKU1RPUiAoSXRoYWthIEhhcmJvcnMsIEluYykxMzAxBgNVBAsUKlRlcm1zIG9m
-IHVzZSBhdCB3d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNTEWMBQGA1UEAxQNd3d3
-LmpzdG9yLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALUHbY3t
-UhCGReVnUwqLCU7elcq4FNKRvTajIvfdnmwB4zXGtZZGoIIoCS8yVFAYPAsT48+m
-xJ3y3GxhNM38nuZjjZi3Rp3ab0RpNoHfmlozTdvMdlbOzOpC6RVSgnyYcKouIw1c
-X4UH0yRbd/8evLK1H7I4VIug1YoZfPC7mr8HCppJJlIfxilS46ruQL75jQEWks7C
-bmB5tQNCr5ah6OnnskGXRHF5hpQmF/3aBvRuPDa3wl3EIlnSAhCoMgE7gPHqLcjX
-hIKX/MrGPuMHEMhBfXMq3yOzuTjX03ukwqUM5Fb0LijWonQz1PQIN8QPaJLo+8Qj
-pKfkUJ6lmQY1Oy8CAwEAAaOCAcswggHHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWg
-MEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3VyZS1jcmwudmVyaXNpZ24u
-Y29tL0VWU2VjdXJlMjAwNi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXBjAq
-MCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vY3BzMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBT8ilC6nrklWntV
-hU+VAGOP6VhrQzBzBggrBgEFBQcBAQRnMGUwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLnZlcmlzaWduLmNvbTA9BggrBgEFBQcwAoYxaHR0cDovL0VWU2VjdXJlLWFp
-YS52ZXJpc2lnbi5jb20vRVZTZWN1cmUyMDA2LmNlcjBuBggrBgEFBQcBDARiMGCh
-XqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsp
-rEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYw
-DQYJKoZIhvcNAQEFBQADggEBAFdIEgpPjryqc6c4Cn5beVW3U6StHIHn6K1Pmdjm
-zg3KrMWh7q7XYwATkG3+E3xl/j0gcgp3JOZF/WudfIYlanoTIdwtcgH3atiD+V1E
-RuOy19Qagr5LZG6ZSfsUR+kGaQTRWolznngzKiJOhjYt0RH7IGnJ8NCNpFWFgCjJ
-UWJqHCSkQ+fmjmpJMa+XE7r2YeqamXA6RNA7tH6Sk/BM92PuI3yyPuMVxKVHSFEB
-Cp5hKvpnTsU7XXEyje/rfDvAVbO34z34/Z3uWPr5C710E2aV3/As2xRF9kYmMcsb
-1NGyA/5UtjYY/ZuPpIVnXu4ldkf2oMIohwcE9K/1j6k4B3Q=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://omega.jstor.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.jstor.org/action/samlACS" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jstor.org/action/samlACS" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://firefly.jstor.org/action/samlACS" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">JSTOR</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">JSTOR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.jstor.org</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Matt</GivenName>
-    <SurName>Callow</SurName>
-    <EmailAddress>support@jstor.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tara</GivenName>
-    <SurName>Kalro</SurName>
-    <EmailAddress>tara.kalro@ithaka.org.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ken</GivenName>
-    <SurName>Alexander</SurName>
-    <EmailAddress>ken.alexander@ithaka.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jwatch.org.xml b/swamid-interfederations-2.0/www.jwatch.org.xml
deleted file mode 100644
index 884c094a..00000000
--- a/swamid-interfederations-2.0/www.jwatch.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jwatch.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Journal Watch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Journal Watch</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.jwatch.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.meertens.knaw.nl.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
index 26550b5d..c73ffb5e 100644
--- a/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
@@ -5,6 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
@@ -15,6 +20,7 @@
         <mdui:Description xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture</mdui:Description>
         <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
diff --git a/swamid-interfederations-2.0/www.propylaeum.de.xml b/swamid-interfederations-2.0/www.propylaeum.de.xml
deleted file mode 100644
index 40099fd5..00000000
--- a/swamid-interfederations-2.0/www.propylaeum.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.propylaeum.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.propylaeum.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.propylaeum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.propylaeum.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzDCCBLSgAwIBAgIHEnRZnq0yrjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA2WhcNMTYw
-ODIyMTExMDA2WjCBmTELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRowGAYD
-VQQDExF3d3cucHJvcHlsYWV1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKFh9caPIFhS2jIdLooVk30LY730XWVZ1lmaMu7k3C0btX4Vjjl3htj4
-0Z3zDNCQl3R09ITueC+gyHV6ADKeQLCuNh3AlY7bXKukYufUzDkdmGo6QyCUU4X9
-0KWBGez3D1PMbEAv2ay3D57GLJwtRP4LO8x+Y+Z3g0i3kb+4rC/k58g/V4Utqk5d
-3nA/iFMh2aD6clHUQ/fUBgicdloy1NW8G8Y9YIIj7TZBxxegPaIFBlt443SHuhr0
-bJ6DbFdhq+n4FyNQh3BNe2bs3Nsx4g8neQ1QFZp80wV6wlarLfJuDWQdRxzJDwUo
-l0QHuYKNQ8aEUW9EWMTDd5i1z63ejY8CAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUBqxCuJApxSI5xMQce7FuA23RsgQwHwYDVR0jBBgwFoAUemeMWxoTRIKz
-IVobKorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVy
-aXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmww
-gcoGCCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQB6fmD4RCUhevBRvqaLb0sA
-gX2csj3pjfD+Q53sm6d1sk9CPuCMWYBHTUBKKIo6h9UZgGjj6NlmAt+iA9DxZHFY
-g+PSfw6t6SMvfZ7RslIcoZy4bsTLON71edCPccPWpKx7x0TSfg+aH+eu1kpSe47K
-R5TihEHKgIi36RCA6AY1JDDsNGjonZR4lG48NRXZ1HqY2Rh/kph3tNqfFQG9TkNj
-RtuYg/2um9+CjJnvI9wik7tMJKVkB2fToqRItNhxa7YEF001koHmSDZT7w3xAtQc
-ohe+mhgrSBbjpHrLTJhtrRalopdfAwCUGwWP4fZdikWiAjZmgFnUqYfTOQ+Qng/2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.propylaeum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.propylaeum.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzDCCBLSgAwIBAgIHEnRZnq0yrjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA2WhcNMTYw
-ODIyMTExMDA2WjCBmTELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRowGAYD
-VQQDExF3d3cucHJvcHlsYWV1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKFh9caPIFhS2jIdLooVk30LY730XWVZ1lmaMu7k3C0btX4Vjjl3htj4
-0Z3zDNCQl3R09ITueC+gyHV6ADKeQLCuNh3AlY7bXKukYufUzDkdmGo6QyCUU4X9
-0KWBGez3D1PMbEAv2ay3D57GLJwtRP4LO8x+Y+Z3g0i3kb+4rC/k58g/V4Utqk5d
-3nA/iFMh2aD6clHUQ/fUBgicdloy1NW8G8Y9YIIj7TZBxxegPaIFBlt443SHuhr0
-bJ6DbFdhq+n4FyNQh3BNe2bs3Nsx4g8neQ1QFZp80wV6wlarLfJuDWQdRxzJDwUo
-l0QHuYKNQ8aEUW9EWMTDd5i1z63ejY8CAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUBqxCuJApxSI5xMQce7FuA23RsgQwHwYDVR0jBBgwFoAUemeMWxoTRIKz
-IVobKorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVy
-aXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmww
-gcoGCCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQB6fmD4RCUhevBRvqaLb0sA
-gX2csj3pjfD+Q53sm6d1sk9CPuCMWYBHTUBKKIo6h9UZgGjj6NlmAt+iA9DxZHFY
-g+PSfw6t6SMvfZ7RslIcoZy4bsTLON71edCPccPWpKx7x0TSfg+aH+eu1kpSe47K
-R5TihEHKgIi36RCA6AY1JDDsNGjonZR4lG48NRXZ1HqY2Rh/kph3tNqfFQG9TkNj
-RtuYg/2um9+CjJnvI9wik7tMJKVkB2fToqRItNhxa7YEF001koHmSDZT7w3xAtQc
-ohe+mhgrSBbjpHrLTJhtrRalopdfAwCUGwWP4fZdikWiAjZmgFnUqYfTOQ+Qng/2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.propylaeum.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.propylaeum.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.propylaeum.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rcpsych.org.xml b/swamid-interfederations-2.0/www.rcpsych.org.xml
deleted file mode 100644
index 525cd700..00000000
--- a/swamid-interfederations-2.0/www.rcpsych.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rcpsych.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Journals of the Royal College of Psychiatrists</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Journals of the Royal College of Psychiatrists</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rcpsych.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.reference-global.com.xml b/swamid-interfederations-2.0/www.reference-global.com.xml
deleted file mode 100644
index a7e771e7..00000000
--- a/swamid-interfederations-2.0/www.reference-global.com.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.reference-global.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.reference-global.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.reference-global.com,OU=Domain Control Validated - QuickSSL(R) Premium,OU=See www.geotrust.com/resources/cps (c)10,OU=GT86856594,O=www.reference-global.com,C=US,serialNumber=F64bTdYFo0e1I3PpwWZbE9qF8lv3gFV2</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDdTCCAt6gAwIBAgIDEK7BMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNDEzMTEwMTE3WhcNMTIwNjEzMDc1OTM5
-WjCB/zEpMCcGA1UEBRMgRjY0YlRkWUZvMGUxSTNQcHdXWmJFOXFGOGx2M2dGVjIx
-CzAJBgNVBAYTAlVTMSEwHwYDVQQKExh3d3cucmVmZXJlbmNlLWdsb2JhbC5jb20x
-EzARBgNVBAsTCkdUODY4NTY1OTQxMTAvBgNVBAsTKFNlZSB3d3cuZ2VvdHJ1c3Qu
-Y29tL3Jlc291cmNlcy9jcHMgKGMpMTAxNzA1BgNVBAsTLkRvbWFpbiBDb250cm9s
-IFZhbGlkYXRlZCAtIFF1aWNrU1NMKFIpIFByZW1pdW0xITAfBgNVBAMTGHd3dy5y
-ZWZlcmVuY2UtZ2xvYmFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-xGW90TpoiSz3aeTJn9sgOiPDvGWY+otD9xeJS3xjeca/iBeTKYtUMI5aIjb4B+DE
-bOV6pJubHlfnGKuAfLhGUEoIgxLypy0uxHicRjp9g/STNeEkYVPDTL+NMv5nS2Iq
-y2E74Mxkpk0wEljnVN8zFZuTLYgGQNhIv2g6xWJUVD0CAwEAAaOBrjCBqzAOBgNV
-HQ8BAf8EBAMCBPAwHQYDVR0OBBYEFHryJ6Umw2HfC1wUYi/3m+iy0G2AMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2VvdHJ1c3QuY29tL2NybHMvc2VjdXJl
-Y2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQW
-MBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOBgQBCETxy0M7q
-+E5Eq5Pb/23enEvUZVkBjdSvWmhrqj2XAxpZcEbLzscbcvAvDd1tO6w9m4oXFfSz
-peQvMRaw/8/85Ud7RXRx9Ql1xVW74kWOjfD3WHzJpRnsO3iLqp+7mLPfbZJe+Hj6
-kmjmbkbwJaC+fTIr9vRbKHG7B23wgCJqHg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.reference-global.com/action/samlACS" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Walter de Gruyter GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">De Gruyter</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.degruyter.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Frank</GivenName>
-    <SurName>Kebbedies</SurName>
-    <EmailAddress>fkebbedies@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrike</GivenName>
-    <SurName>Engel</SurName>
-    <EmailAddress>ulrike.engel@degruyter.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rsmjournals.com.xml b/swamid-interfederations-2.0/www.rsmjournals.com.xml
deleted file mode 100644
index 5f466a1c..00000000
--- a/swamid-interfederations-2.0/www.rsmjournals.com.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rsmjournals.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">The Royal Society of Medicine Press Journals</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">The Royal Society of Medicine Press Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rsmjournals.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ruhrcampusonline.de.xml b/swamid-interfederations-2.0/www.ruhrcampusonline.de.xml
deleted file mode 100644
index 1099f0d4..00000000
--- a/swamid-interfederations-2.0/www.ruhrcampusonline.de.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ruhrcampusonline.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.ruhrcampusonline.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ruhrcampusonline.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkDCCBHigAwIBAgIEDrxkazANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-OTA5MDEwOTE4MjBaFw0xNDA4MzEwOTE4MjBaMFUxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIDAeBgNVBAMTF3d3dy5y
-dWhyY2FtcHVzb25saW5lLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA4P8ltGTd9GpzjL6hf9/BBFpEw95wPWcQzEnuzR2MbMkKY/QSdhcGOjg+dfe0
-9XmtwF8Ru+9l27Dqw0dyfQELeobPgQzrc3nBV59wGGP9iRa1ys9KlLH8IKx5KB+m
-XM/yP1CniDgfjaK4vKnVkXxQTlxqSMFnVEWVoFxyEW8YbxErsJU9iTGLWh9ER+KK
-AuF8kpk4h+zEEXzcuVFry5EMKkuYjoOBuZ7VfjnnRp0zpSGc0oR0HviTDU6rh0HU
-5mEQQaIrnDNXcJoPvdG/zzSwS08XyzAmmwopdLdT8pZBGdCdW0aOnC9QEn6r2Wvm
-WZ4KKcHFAj5Rotq2mNmGq+EGKwIDAQABo4IB9DCCAfAwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBRVeqakcEl0XyWuI/gcFGDmeLCwEzAfBgNVHSMEGDAWgBRmZryWm0hN6N28Iqem
-W9WoQZ+V7jAqBgNVHREEIzAhgR9zZXJ2ZXJhZG1pbkBydWhyY2FtcHVzb25saW5l
-LmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESgQqBAhj5o
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUHMAKGQmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIa27/Y4KIekT6td4FywbzC3myEbaDNVJGWspT
-xHgNV5fMf+fdGETbUoBGH+v/T28oOQm4z1rc0EDGWZvK/kG4crPb1B8nQ9HQjwhJ
-ME7vmMQJgmPzVRjSTb/kZYp6VCPbFx99WrQulq6YSwkQVf8O8nwAIkR6FntWW7UU
-dhmX0qhElbuwA4hG/C27MyUxKTy6emb1smzF5qdOJlD2Lf4yw8W3b5f4xwxf+5K+
-vIhxKJay0WKT4TbkGGXnmJUqbMQcnXeAyqIvH3ExXF9P3erL1kr3XrOBZV4D4UyG
-gb/vsRda7NPGVMQ05vCGinQt/+nogQgVNRH9VeV7D8Ouf4Wq
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.ruhrcampusonline.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ruhrcampusonline.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkDCCBHigAwIBAgIEDrxkazANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-OTA5MDEwOTE4MjBaFw0xNDA4MzEwOTE4MjBaMFUxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIDAeBgNVBAMTF3d3dy5y
-dWhyY2FtcHVzb25saW5lLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA4P8ltGTd9GpzjL6hf9/BBFpEw95wPWcQzEnuzR2MbMkKY/QSdhcGOjg+dfe0
-9XmtwF8Ru+9l27Dqw0dyfQELeobPgQzrc3nBV59wGGP9iRa1ys9KlLH8IKx5KB+m
-XM/yP1CniDgfjaK4vKnVkXxQTlxqSMFnVEWVoFxyEW8YbxErsJU9iTGLWh9ER+KK
-AuF8kpk4h+zEEXzcuVFry5EMKkuYjoOBuZ7VfjnnRp0zpSGc0oR0HviTDU6rh0HU
-5mEQQaIrnDNXcJoPvdG/zzSwS08XyzAmmwopdLdT8pZBGdCdW0aOnC9QEn6r2Wvm
-WZ4KKcHFAj5Rotq2mNmGq+EGKwIDAQABo4IB9DCCAfAwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBRVeqakcEl0XyWuI/gcFGDmeLCwEzAfBgNVHSMEGDAWgBRmZryWm0hN6N28Iqem
-W9WoQZ+V7jAqBgNVHREEIzAhgR9zZXJ2ZXJhZG1pbkBydWhyY2FtcHVzb25saW5l
-LmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESgQqBAhj5o
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUHMAKGQmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIa27/Y4KIekT6td4FywbzC3myEbaDNVJGWspT
-xHgNV5fMf+fdGETbUoBGH+v/T28oOQm4z1rc0EDGWZvK/kG4crPb1B8nQ9HQjwhJ
-ME7vmMQJgmPzVRjSTb/kZYp6VCPbFx99WrQulq6YSwkQVf8O8nwAIkR6FntWW7UU
-dhmX0qhElbuwA4hG/C27MyUxKTy6emb1smzF5qdOJlD2Lf4yw8W3b5f4xwxf+5K+
-vIhxKJay0WKT4TbkGGXnmJUqbMQcnXeAyqIvH3ExXF9P3erL1kr3XrOBZV4D4UyG
-gb/vsRda7NPGVMQ05vCGinQt/+nogQgVNRH9VeV7D8Ouf4Wq
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Duisburg-Essen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>Hölterhof</SurName>
-    <EmailAddress>tobias.hoelterhof@uni-duisburg-essen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk.xml b/swamid-interfederations-2.0/www.scran.ac.uk.xml
new file mode 100644
index 00000000..7375a2b9
--- /dev/null
+++ b/swamid-interfederations-2.0/www.scran.ac.uk.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.scran.ac.uk/shibboleth">
+  <!--
+		This is a "Scran" Shibboleth SP belonging to Scran Limited.
+	-->
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T15:54:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <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">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Scran</mdui:DisplayName>
+        <mdui:Description xml:lang="en">370,000 images from museums, galleries &amp; archives. All resources rights cleared for use in teaching and learning.</mdui:Description>
+        <mdui:Logo height="109" width="350">https://shib.scran.ac.uk/images/logo-scran.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-scran.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/glow"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/Shibboleth.sso/DS/UKFederation" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
+						MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
+						bi5hYy51azEkMCIGCSqGSIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrMB4X
+						DTEwMDIyMjExNDU1OVoXDTIwMDIyMDExNDU1OVowgZMxCzAJBgNVBAYTAkdCMREw
+						DwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJRWRpbmJ1cmdoMQ8wDQYDVQQKEwZS
+						Q0FITVMxDjAMBgNVBAsTBVNjcmFuMRYwFAYDVQQDDA0qLnNjcmFuLmFjLnVrMSQw
+						IgYJKoZIhvcNAQkBFhV3ZWJhZG1pbnNAc2NyYW4uYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDEywuow7F7KjwlfTa4vj/2QWvtexIy+OO0hWvn
+						SJ8B3goDjqaC7Mv1fNJdxtZMl/kR6ZfMT86Xa2VfK47NOe14jJDgZxN/0lbwsLwb
+						GyyxcZeDg0NCcv/jFKUiH6m2jSLkpSrSTHuUqRUhGpR0wcr3+HZjLZrpHI0FQ5EH
+						cnkhg1fYwZ5Z6vth+0NhZt9HjWLrUtia4Bj0orj0MkUAKlGEBudrPsC/OITO9oUp
+						pXV0PBi0hILJdbgeJXDFhxfcEpCczQlQgdx/KWD6q/6nSOmT9hNGMjkiprn/w/q1
+						SsAMRqSfrWrR6q8hWTkWmNsm/c39bJFuMvkfkiOgvvBVqE3nAgMBAAGjgfswgfgw
+						HQYDVR0OBBYEFG8UIQ7Hc9WHtlS6PKYYP/7RWNcrMIHIBgNVHSMEgcAwgb2AFG8U
+						IQ7Hc9WHtlS6PKYYP/7RWNcroYGZpIGWMIGTMQswCQYDVQQGEwJHQjERMA8GA1UE
+						CBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEPMA0GA1UEChMGUkNBSE1T
+						MQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jhbi5hYy51azEkMCIGCSqG
+						SIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrggkAmv27K7DL9jYwDAYDVR0T
+						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWSSnSaVz28lDBISUNRmNJFwKvjo5
+						nC4+WM7h6Tg9QbC/EYNCwkH7bOoEcCJs28jn0EwRfn4GUgc1LFkf9UYc3rJ+mihD
+						+RZDHjaJSZDbQgZI55y8dpuYT8r70rCg+xtq1Iwv0NzcM+Q/3cEeiMlIXY6YFAAA
+						Dsp1/4NlItMUs6ZwAyMLjyIlSjIHjTVLI2bRTDlY4nUgZhqz4spvqDtnmq7PERUN
+						LTUxK70J8DSNHEuzC8s+rTfXhsn01ZUKGDQqeFDO3TccF/x8iespeHPJO7uD/klz
+						bjQPf6gJKSkRW/uiwoDLkt/CChMGLGbYpQcx/7RpyzUpN4u4PHLduf03kQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Scran</ServiceName>
+      <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"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Scran Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Scran</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.scran.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Scran/RCAHMS Web Admins</GivenName>
+    <EmailAddress>mailto:webadmins@rcahms.gov.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Scran/RCAHMS Web Admins</GivenName>
+    <EmailAddress>mailto:webadmins@rcahms.gov.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studisoft.de.xml b/swamid-interfederations-2.0/www.studisoft.de.xml
deleted file mode 100644
index 7449cbe9..00000000
--- a/swamid-interfederations-2.0/www.studisoft.de.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studisoft.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.studisoft.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studisoft.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIECzboczANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MTAxODE0MTcwOFoXDTEyMTAxNjE0MTcwOFowYTELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xGTAXBgNVBAMTEHd3dy5zdHVkaXNvZnQuZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDTExofgogpkczc1XEXBBt7gQH2h5XmoUs5RDT9
-/wqMtkbtJBOWE7kfvx7Li4FUAGwqo5P9alawtgFIahNkozTT5D2JsmT9lgxrR4fl
-1/jbhhVUidjWrM/CWPoe4+jwng8drApN/m7JzZ0KCe4d5VptwjsyGUCfJf180Mj5
-gJOLKnUGz+nflj98AjMTWKT/yNaXQ/KWE54EcSIYYD+wmcENuz5mTcY768BPKsqN
-9qFeHfx7pSpMJr7z9AVYbGrYoLt331VLvAVNgW0dHD2xti+Cf/JeyBNqIdIo1C93
-xDiCStjbOe4y9zfVzevqVGM7kgWCO6C3K/ZRlU3fSzid1bCHAgMBAAGjggG7MIIB
-tzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFOrTE5iQ2NW8kEo+8hOX1NlmXD+MMB8GA1UdIwQY
-MBaAFH0fqED2pvYyToHl+DILw20rxDNuMCQGA1UdEQQdMBuBGW9yZGVyQHJ6LnVu
-aS13dWVyemJ1cmcuZGUwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9jYWNybC5jcmwwOKA2oDSGMmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGY
-BggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bml3dWUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEIGCCsGAQUFBzAC
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI5+tSTQQkjtpmWeUFtcjtrR4n4o
-yB/GK0mRNrU/dN3BGn7P9r/5M6w2brH5QC7DPrUlgdKe8Ao1DpOGvELEwYGcmigH
-X4REnphfQT1WoP6QjjAiDwyZeTB/K4sV7/abjMmJg89dTOmVESxmtP9C81+qDSBt
-TTd8xVXrUisPhEpr7jBk7DzS8SC7yrPQFNzUGvVZtsek7lc9h7T1+sjqcwWRpkMo
-vGgP+2MxPd4ugXfwH7bDDEvbc85B21JzuNRP4wRW68PvI4oHSt7pRBAVMiuHmt7W
-jopqxA5r6hkuCk/BNT5k/LHjtxNFHhocXRlkUw3tKlKxIE+7i+KNI2Mgvnw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.studisoft.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studisoft.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIECzboczANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MTAxODE0MTcwOFoXDTEyMTAxNjE0MTcwOFowYTELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xGTAXBgNVBAMTEHd3dy5zdHVkaXNvZnQuZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDTExofgogpkczc1XEXBBt7gQH2h5XmoUs5RDT9
-/wqMtkbtJBOWE7kfvx7Li4FUAGwqo5P9alawtgFIahNkozTT5D2JsmT9lgxrR4fl
-1/jbhhVUidjWrM/CWPoe4+jwng8drApN/m7JzZ0KCe4d5VptwjsyGUCfJf180Mj5
-gJOLKnUGz+nflj98AjMTWKT/yNaXQ/KWE54EcSIYYD+wmcENuz5mTcY768BPKsqN
-9qFeHfx7pSpMJr7z9AVYbGrYoLt331VLvAVNgW0dHD2xti+Cf/JeyBNqIdIo1C93
-xDiCStjbOe4y9zfVzevqVGM7kgWCO6C3K/ZRlU3fSzid1bCHAgMBAAGjggG7MIIB
-tzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFOrTE5iQ2NW8kEo+8hOX1NlmXD+MMB8GA1UdIwQY
-MBaAFH0fqED2pvYyToHl+DILw20rxDNuMCQGA1UdEQQdMBuBGW9yZGVyQHJ6LnVu
-aS13dWVyemJ1cmcuZGUwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9jYWNybC5jcmwwOKA2oDSGMmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGY
-BggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bml3dWUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEIGCCsGAQUFBzAC
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI5+tSTQQkjtpmWeUFtcjtrR4n4o
-yB/GK0mRNrU/dN3BGn7P9r/5M6w2brH5QC7DPrUlgdKe8Ao1DpOGvELEwYGcmigH
-X4REnphfQT1WoP6QjjAiDwyZeTB/K4sV7/abjMmJg89dTOmVESxmtP9C81+qDSBt
-TTd8xVXrUisPhEpr7jBk7DzS8SC7yrPQFNzUGvVZtsek7lc9h7T1+sjqcwWRpkMo
-vGgP+2MxPd4ugXfwH7bDDEvbc85B21JzuNRP4wRW68PvI4oHSt7pRBAVMiuHmt7W
-jopqxA5r6hkuCk/BNT5k/LHjtxNFHhocXRlkUw3tKlKxIE+7i+KNI2Mgvnw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studisoft.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studisoft.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studisoft.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studisoft.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studisoft.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studisoft.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studisoft.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studisoft.de/Shibboleth.sso/NIM/SOAP"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studisoft.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sptest.rz.uni-wuerzburg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studisoft.de/Shibboleth.sso/SAML/Artifact" index="7"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Würzburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Rechenzentrum Uni Würzburg studisoft-sp</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-wuerzburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hartmut</GivenName>
-    <SurName>Plehn</SurName>
-    <EmailAddress>serverzertifikate@rz.uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Rossa</SurName>
-    <EmailAddress>leitung@rz.uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.swetswise.com.xml b/swamid-interfederations-2.0/www.swetswise.com.xml
deleted file mode 100644
index 914007ec..00000000
--- a/swamid-interfederations-2.0/www.swetswise.com.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.swetswise.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.swetswise.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.swetswise.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=SDC,O=Swets Information Services B.V.,L=Lisse,ST=Zuid-Holland,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIQfAsfYeaJkMOkD6YbIZXGLDANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNjA4
-MDAwMDAwWhcNMTUwODA2MjM1OTU5WjCBxDELMAkGA1UEBhMCTkwxFTATBgNVBAgT
-DFp1aWQtSG9sbGFuZDEOMAwGA1UEBxQFTGlzc2UxKDAmBgNVBAoUH1N3ZXRzIElu
-Zm9ybWF0aW9uIFNlcnZpY2VzIEIuVi4xDDAKBgNVBAsUA1NEQzEzMDEGA1UECxQq
-VGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MSEwHwYD
-VQQDFBhzaGliYm9sZXRoLnN3ZXRzd2lzZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBAJaCV/oHiN0Djbc0QfFHqJyl3dZLv6L14ixU7TRMhVBdm1EnsUhq
-JbqvF8DX9vCIa8BrShITPjXex+UpMpjdTr8V/nQGbQ7+NR4/HrV4g6ms4r8OVh8V
-ibGC2jqtNJF4NELRjdWdrkxhxoZcpn6rGYUjAPkvF2TpdFnL1hkJuhwLAgMBAAGj
-ggHRMIIBzTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2
-hjRodHRwOi8vU1ZSU2VjdXJlLUcyLWNybC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJl
-RzIuY3JsMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHFwMwKjAoBggrBgEFBQcCARYc
-aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUpe8LEc7AQQOjSmWQSLIc4FctfUcwdgYI
-KwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5j
-b20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9TVlJTZWN1cmUtRzItYWlhLnZlcmlzaWdu
-LmNvbS9TVlJTZWN1cmVHMi5jZXIwbgYIKwYBBQUHAQwEYjBgoV6gXDBaMFgwVhYJ
-aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUS2u5KJYGDLvQUjibKaxLB4shBRgwJhYk
-aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nbzEuZ2lmMA0GCSqGSIb3DQEB
-BQUAA4IBAQB6CxYoKRtfv/Wfw+bCZzxyBYZuqzY3DSzp+DpstY0UwqDQ1I7UVMFc
-EN1TQVEStKD3BlJUyUJnQlH3tMaRdWwqvi1of9adUQO/3u0mD0s6p5zOW2GKrEQM
-aCxJwOiYsWyk6LD2h8Gvx0eU2paPr+GR8MBB1m10icK5/YauDVh7z+Yk3NAgsv+u
-LvQirh8/tPxghLWofCqDMMHlGevdJ9IV6A5bEZ2FivhYqjKISMAN7vROy3wrr1cZ
-XYSgZsFGgkzcnZr1RJeNJ4WuY8ZQmsRoTnLV7fSRXHM/ykFZ8J9Z8rfOe2Fxp7+P
-hFcdbbuzmY4fmKSXQjAQgp4qquHXJRDr
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/uat" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/maint" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/training" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/uat" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/maint" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/training" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="23"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Swets Information Services B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">SwetsWise</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.swetswise.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Erwin</GivenName>
-    <SurName>Booy</SurName>
-    <EmailAddress>ebooy@nl.swets.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kees Jan</GivenName>
-    <SurName>Voogd</SurName>
-    <EmailAddress>kjvoogd@nl.swets.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.thieme-connect.de.xml b/swamid-interfederations-2.0/www.thieme-connect.de.xml
deleted file mode 100644
index fab54077..00000000
--- a/swamid-interfederations-2.0/www.thieme-connect.de.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.thieme-connect.de/ejournals/shib-login">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.thieme-connect.de/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.thieme-connect.com/Shibboleth.sso/Login" index="2"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.thieme-connect.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.thieme-connect.de,OU=Terms of use at www.verisign.com/rpa (c)05,OU=EDV,O=Georg Thieme Verlag KG,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIQaPkkRHSsYs5cFgJ+NXut4zANBgkqhkiG9w0BAQUFADCB
-vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-DTExMDUyNDAwMDAwMFoXDTEzMDYyNDIzNTk1OVowgcIxCzAJBgNVBAYTAkRFMRsw
-GQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcUCVN0dXR0Z2FydDEf
-MB0GA1UEChQWR2VvcmcgVGhpZW1lIFZlcmxhZyBLRzEMMAoGA1UECxQDRURWMTMw
-MQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMp
-MDUxHjAcBgNVBAMUFXd3dy50aGllbWUtY29ubmVjdC5kZTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAy7N3v5982eULiKneK7c/7GQEF7mSUwS4WT6IGQUFacPR
-y+UaIWYpkD2fo3JOzD9EvJYY31Jr2D7woUxUEGhOZPIihkXV3wmnFYH1MZOuAFGu
-vv9xRNtuZy0xQL9XBfMhXl8tZzlSk6Q+c5O29zn7KsnAHqMuLCLWe1sGvmRFvjkC
-AwEAAaOCAbMwggGvMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEQGA1UdIAQ9MDsw
-OQYLYIZIAYb4RQEHFwMwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNp
-Z24uY29tL3JwYTBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vU1ZSSW50bC1HMy1j
-cmwudmVyaXNpZ24uY29tL1NWUkludGxHMy5jcmwwKAYDVR0lBCEwHwYIKwYBBQUH
-AwEGCCsGAQUFBwMCBglghkgBhvhCBAEwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6
-Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjBuBggr
-BgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRL
-a7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20v
-dnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAFfyCoUP94l9AvTkRjl/ZFm9
-zp/r8MojOzcYHeYJ6ICJ92utCJSJSoErI2BH4Ril61esPJW6OtVEqRpbnv3DHHx6
-yFzZuLXEd+AMz0uBiGBrDs9pA0PVsY3jwaKgDrfJ/QvD5tz/Pl3NS1NR4NVPmbwr
-XyFtLfp8jQpAwbiY1oI8JOKidxvJrQ9HU55PI4rPfC4jOn1lvHsls2KOzButAcXh
-ZMeJk4CGI8D/IajWeE5LKbEWWIvneaICam2oTmU3L1OWMSD7kfht9KYTTA/FEcD+
-nwgsd3yT09XaawJMzO16JyyCoE/Mg/CXs70KAkju/noY71pLGmyJ44r/QTnAtCw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.thieme-connect.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.thieme-connect.de,OU=Terms of use at www.verisign.com/rpa (c)05,OU=EDV,O=Georg Thieme Verlag KG,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIQaPkkRHSsYs5cFgJ+NXut4zANBgkqhkiG9w0BAQUFADCB
-vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-DTExMDUyNDAwMDAwMFoXDTEzMDYyNDIzNTk1OVowgcIxCzAJBgNVBAYTAkRFMRsw
-GQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcUCVN0dXR0Z2FydDEf
-MB0GA1UEChQWR2VvcmcgVGhpZW1lIFZlcmxhZyBLRzEMMAoGA1UECxQDRURWMTMw
-MQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMp
-MDUxHjAcBgNVBAMUFXd3dy50aGllbWUtY29ubmVjdC5kZTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAy7N3v5982eULiKneK7c/7GQEF7mSUwS4WT6IGQUFacPR
-y+UaIWYpkD2fo3JOzD9EvJYY31Jr2D7woUxUEGhOZPIihkXV3wmnFYH1MZOuAFGu
-vv9xRNtuZy0xQL9XBfMhXl8tZzlSk6Q+c5O29zn7KsnAHqMuLCLWe1sGvmRFvjkC
-AwEAAaOCAbMwggGvMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEQGA1UdIAQ9MDsw
-OQYLYIZIAYb4RQEHFwMwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNp
-Z24uY29tL3JwYTBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vU1ZSSW50bC1HMy1j
-cmwudmVyaXNpZ24uY29tL1NWUkludGxHMy5jcmwwKAYDVR0lBCEwHwYIKwYBBQUH
-AwEGCCsGAQUFBwMCBglghkgBhvhCBAEwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6
-Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjBuBggr
-BgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRL
-a7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20v
-dnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAFfyCoUP94l9AvTkRjl/ZFm9
-zp/r8MojOzcYHeYJ6ICJ92utCJSJSoErI2BH4Ril61esPJW6OtVEqRpbnv3DHHx6
-yFzZuLXEd+AMz0uBiGBrDs9pA0PVsY3jwaKgDrfJ/QvD5tz/Pl3NS1NR4NVPmbwr
-XyFtLfp8jQpAwbiY1oI8JOKidxvJrQ9HU55PI4rPfC4jOn1lvHsls2KOzButAcXh
-ZMeJk4CGI8D/IajWeE5LKbEWWIvneaICam2oTmU3L1OWMSD7kfht9KYTTA/FEcD+
-nwgsd3yT09XaawJMzO16JyyCoE/Mg/CXs70KAkju/noY71pLGmyJ44r/QTnAtCw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Georg Thieme Verlag KG</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">https://www.thieme-connect.de/</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.thieme-connect.de/ejournals/home.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Manfred</GivenName>
-    <SurName>Deutsch</SurName>
-    <EmailAddress>thiemedev@fiz-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ute</GivenName>
-    <SurName>Günther</SurName>
-    <EmailAddress>ute.guenther@thieme.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.tu-chemnitz.de.xml b/swamid-interfederations-2.0/www.tu-chemnitz.de.xml
deleted file mode 100644
index b82677fb..00000000
--- a/swamid-interfederations-2.0/www.tu-chemnitz.de.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tu-chemnitz.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECkKcyjANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzA0MTYwNzAx
-MTZaFw0xMjA0MTQwNzAxMTZaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd3dy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRkHtGWL06QzWqk422QXnfS
-Uw9ZswH5vtTEYN2N0OX1IKcAZ2Hf8fAy6jnk0nQ1ckUpDzQ2XWNHYWSkx1w8rBZL
-PgoBh8fZDU5xFbZdr9hiuS3CAySR7AvEJpOIiFVjLhr659dW+xwCvMre01d/7gez
-bw395QTkRvTtACBwYjv202bYfeuEoW+EBIfk44sDIUlid9VvB0Bk2VDaQEXsmqgK
-P9Wx/F+KdoFLIbR6pTfyOi8U/3SvRWIhKedYEwr3InfbHScd7E21AqQ2MqaQUbTG
-FBNU6wc+Y90gvLPJgVyKqsL+L4SYY/05r1Z8iMAp2ak7ze2oi4GmpQQvDisZ3r8C
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjphXqaHhxFUlbVxkQtqt4iVC
-3u0wHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAGuJSdTDZbQl6D9b0nJcTOB9ZQLMTq3gQVrYtqR8IpsjBzi8E
-JdTTTeNQ6K3ZhoiD+CwDG55qFGWKPQF3Mf5x+KTKfCIjgjnIrrBJyev72rVxqiK0
-og7H1PbkUg1lbEimCSWg+Wx/BJSwpmddxnVYcEXMYxmGcdt66Swxlg+CowC5dVL9
-6Hr98O+KtqI2NRhuH6aqUqumD8EP6YR6/0JZeo1SNM3y/QQEQoyVgPLob5uNofdr
-g2twMUgpt0hGea3sPbmrlTLIuIvtAWqjaDidsyUKiuveWSlh4YbshZCNH+r6TzLe
-zBo9/9WlA25buTEEDwGKCBOkN47rnnVLwcmqBw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECkKcyjANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzA0MTYwNzAx
-MTZaFw0xMjA0MTQwNzAxMTZaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd3dy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRkHtGWL06QzWqk422QXnfS
-Uw9ZswH5vtTEYN2N0OX1IKcAZ2Hf8fAy6jnk0nQ1ckUpDzQ2XWNHYWSkx1w8rBZL
-PgoBh8fZDU5xFbZdr9hiuS3CAySR7AvEJpOIiFVjLhr659dW+xwCvMre01d/7gez
-bw395QTkRvTtACBwYjv202bYfeuEoW+EBIfk44sDIUlid9VvB0Bk2VDaQEXsmqgK
-P9Wx/F+KdoFLIbR6pTfyOi8U/3SvRWIhKedYEwr3InfbHScd7E21AqQ2MqaQUbTG
-FBNU6wc+Y90gvLPJgVyKqsL+L4SYY/05r1Z8iMAp2ak7ze2oi4GmpQQvDisZ3r8C
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjphXqaHhxFUlbVxkQtqt4iVC
-3u0wHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAGuJSdTDZbQl6D9b0nJcTOB9ZQLMTq3gQVrYtqR8IpsjBzi8E
-JdTTTeNQ6K3ZhoiD+CwDG55qFGWKPQF3Mf5x+KTKfCIjgjnIrrBJyev72rVxqiK0
-og7H1PbkUg1lbEimCSWg+Wx/BJSwpmddxnVYcEXMYxmGcdt66Swxlg+CowC5dVL9
-6Hr98O+KtqI2NRhuH6aqUqumD8EP6YR6/0JZeo1SNM3y/QQEQoyVgPLob5uNofdr
-g2twMUgpt0hGea3sPbmrlTLIuIvtAWqjaDidsyUKiuveWSlh4YbshZCNH+r6TzLe
-zBo9/9WlA25buTEEDwGKCBOkN47rnnVLwcmqBw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tu-chemnitz.de/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tu-chemnitz.de/Shibboleth.sso/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Chemnitz (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">www.tu-chemnitz.de</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-chemnitz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ronald</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ronald</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vho.de.xml b/swamid-interfederations-2.0/www.vho.de.xml
deleted file mode 100644
index c3a694d9..00000000
--- a/swamid-interfederations-2.0/www.vho.de.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vho.de/idpvzg">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">vzg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.vho.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.vho.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGfzCCBWegAwIBAgIED/+i6zANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA3
-WhcNMTUwNTAzMTM0NzA3WjCBnDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazETMBEGA1UEAxMKd3d3LnZoby5kZTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAMxWPQ1x7VFjjh85oQNHMLrIR7U9ZlB5Hc+hHs5YWLDv
-eRfoW/C3LZF8sLkd1BH1bd9W6EuB5IRzPSHxn10mxYQWfezalgY/NCSxag5EUzJG
-o45Shd5B//dBXMFuVxd3mCGZ7Gpi2YwvKQZOjPTgs6WJeCsNy9nsrNe8dhK3rswV
-I/f5pjhHDd5o43348uMY4bjVmtBke2IWo/PY4OMZIxsHMm5wu3mW9VfmTx2Deb2G
-8PUHNeqdiyv1AfOsCgRC8BhHq5tg0tzA8u52CDXFIR7zuvlPdBN/LMb6DMIdyE5C
-qFGabY/n/EKFexAiTz+evlpHihPTjx0s00lnd4W0yPwZEtaGxzcOnLygE/NjoGA+
-2Dym0Oo+NnGAvFN2FVTRrqKJV/6D/3Oh1xX2yAAMYv+1GlyeJOReCD+Fki5cHo/J
-bgpu1yC23wYrst/25BIlPvDxrdveZuVTdXc4n7n51PBTX70R/GvkQ9Sv9T5yGwbV
-CnT1ostCj/QwwAyxC8H1dch5hEvRRQy+zme5AXcwXhtAjErUEmkn13eXRWQwLkrt
-ZcbBY8ibdlQhdguwXdtkrS38tX4WyFd4j51olwoEPLXjU52u96nCjkHtO6GyXnU9
-+ZcWSxJePmrmGWxOtu3NsOpcm9RhrtOlDxYp7n17tZ64pIZFIiPbv2fGMXStPJNz
-AgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFIHlCTp0Hw2ixtPSg7IXjQOH
-onjFMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQMA6B
-DGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYB
-BQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-Z3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBAE/4u0zjwF5+yQkcpeCNoSdH8JIhMJofYyWfQPD+
-Q36nQBqrolaFCe94zThj+gJmabfIDEvpwCLCa2YtCDosWsI9rX4GF1ZUsxKqxgBB
-IH1rFZlKKEeDYieR8lRH4vy4RGh9dkvhhXLgyrekt3iyfWHxCz/n47awnmYgO2st
-dqh2nY2bXoDASUlgzO59ghsfi6pT5WAGRUwZhMS3iErLglDYoT6AqEdr406TWeLp
-Mw04ESW7mR05nhLcIBNf23UPKjMpNTwBQC1BAbssGMMMbPojg1K+80aLKAB32ZPw
-CFNwbRrYB0gGPASPkZD9WxiosAZp/uqr6QTZIUDSSmWt2B0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.vho.de/idpvzg/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vho.de/idpvzg/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vho.de/idpvzg/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vho.de/idpvzg/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">vzg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.vho.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.vho.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGfzCCBWegAwIBAgIED/+i6zANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA3
-WhcNMTUwNTAzMTM0NzA3WjCBnDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazETMBEGA1UEAxMKd3d3LnZoby5kZTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAMxWPQ1x7VFjjh85oQNHMLrIR7U9ZlB5Hc+hHs5YWLDv
-eRfoW/C3LZF8sLkd1BH1bd9W6EuB5IRzPSHxn10mxYQWfezalgY/NCSxag5EUzJG
-o45Shd5B//dBXMFuVxd3mCGZ7Gpi2YwvKQZOjPTgs6WJeCsNy9nsrNe8dhK3rswV
-I/f5pjhHDd5o43348uMY4bjVmtBke2IWo/PY4OMZIxsHMm5wu3mW9VfmTx2Deb2G
-8PUHNeqdiyv1AfOsCgRC8BhHq5tg0tzA8u52CDXFIR7zuvlPdBN/LMb6DMIdyE5C
-qFGabY/n/EKFexAiTz+evlpHihPTjx0s00lnd4W0yPwZEtaGxzcOnLygE/NjoGA+
-2Dym0Oo+NnGAvFN2FVTRrqKJV/6D/3Oh1xX2yAAMYv+1GlyeJOReCD+Fki5cHo/J
-bgpu1yC23wYrst/25BIlPvDxrdveZuVTdXc4n7n51PBTX70R/GvkQ9Sv9T5yGwbV
-CnT1ostCj/QwwAyxC8H1dch5hEvRRQy+zme5AXcwXhtAjErUEmkn13eXRWQwLkrt
-ZcbBY8ibdlQhdguwXdtkrS38tX4WyFd4j51olwoEPLXjU52u96nCjkHtO6GyXnU9
-+ZcWSxJePmrmGWxOtu3NsOpcm9RhrtOlDxYp7n17tZ64pIZFIiPbv2fGMXStPJNz
-AgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFIHlCTp0Hw2ixtPSg7IXjQOH
-onjFMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQMA6B
-DGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYB
-BQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-Z3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBAE/4u0zjwF5+yQkcpeCNoSdH8JIhMJofYyWfQPD+
-Q36nQBqrolaFCe94zThj+gJmabfIDEvpwCLCa2YtCDosWsI9rX4GF1ZUsxKqxgBB
-IH1rFZlKKEeDYieR8lRH4vy4RGh9dkvhhXLgyrekt3iyfWHxCz/n47awnmYgO2st
-dqh2nY2bXoDASUlgzO59ghsfi6pT5WAGRUwZhMS3iErLglDYoT6AqEdr406TWeLp
-Mw04ESW7mR05nhLcIBNf23UPKjMpNTwBQC1BAbssGMMMbPojg1K+80aLKAB32ZPw
-CFNwbRrYB0gGPASPkZD9WxiosAZp/uqr6QTZIUDSSmWt2B0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">IdP der Verbundzentrale</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verbundzentrale Göttingen (VZG)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.vho.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>borel@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerald</GivenName>
-    <SurName>Steilen</SurName>
-    <EmailAddress>steilen@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Till</GivenName>
-    <SurName>Kinstler</SurName>
-    <EmailAddress>kinstler@gbv.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.video2brain.com.xml b/swamid-interfederations-2.0/www.video2brain.com.xml
deleted file mode 100644
index 693c03c3..00000000
--- a/swamid-interfederations-2.0/www.video2brain.com.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.video2brain.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.video2brain.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.video2brain.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.video2brain.com,OU=Terms of use at www.verisign.com/rpa (c)05,O=video2brain GmbH,L=Graz,ST=Steiermark,C=AT,serialNumber=310510h,businessCategory=Private Organization,1.3.6.1.4.1.311.60.2.1.1=#140120,1.3.6.1.4.1.311.60.2.1.2=#140120,1.3.6.1.4.1.311.60.2.1.3=#13024154</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIQNS1m8T236j2soVAkQJv7jzANBgkqhkiG9w0BAQUFADCB
-ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr
-VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x
-MjAxMDMwMDAwMDBaFw0xNDAxMDIyMzU5NTlaMIIBDTETMBEGCysGAQQBgjc8AgED
-EwJBVDESMBAGCysGAQQBgjc8AgECFAEgMRIwEAYLKwYBBAGCNzwCAQEUASAxHTAb
-BgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRAwDgYDVQQFEwczMTA1MTBoMQsw
-CQYDVQQGEwJBVDETMBEGA1UECBQKU3RlaWVybWFyazENMAsGA1UEBxQER3JhejEZ
-MBcGA1UEChQQdmlkZW8yYnJhaW4gR21iSDEzMDEGA1UECxQqVGVybXMgb2YgdXNl
-IGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MRwwGgYDVQQDFBN3d3cudmlk
-ZW8yYnJhaW4uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo1oh
-XDUGMkwc2fgsmGnYwPOwCAEeYtZI5du0E40rE+h9f1Ruaq+niJUOI4Rz0bVTP/o9
-1Ae2+PyNbV+tlhcUT60OsSVVEkl6oya6o4mTO/bvXM2O+/EUnG/l3a8jNFddL9Zr
-y162ybEnwjxMo37EWtLE3/8yr3Hrz151BXRWAGfu3eXSAGzgJkNjDv78e2gm7MCL
-FMjEl9j3j2Oivzvn4OLTm0Nt+amNh9BEXPcWu2bnID4gddiFF3aGeb8lfJix1HVV
-cM6GEgxmBvoypNUj7Fu/nvO1K2UERhGiHvZfLjjndRoNheYulPtNsHXH1esrGlp8
-GRC5VHe3isUsAZsq2QIDAQABo4IByzCCAccwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BaAwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL0VWU2VjdXJlLWNybC52ZXJpc2ln
-bi5jb20vRVZTZWN1cmUyMDA2LmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcG
-MCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9jcHMwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFPyKULqeuSVa
-e1WFT5UAY4/pWGtDMHMGCCsGAQUFBwEBBGcwZTAkBggrBgEFBQcwAYYYaHR0cDov
-L29jc3AudmVyaXNpZ24uY29tMD0GCCsGAQUFBzAChjFodHRwOi8vRVZTZWN1cmUt
-YWlhLnZlcmlzaWduLmNvbS9FVlNlY3VyZTIwMDYuY2VyMG4GCCsGAQUFBwEMBGIw
-YKFeoFwwWjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4
-mymsSweLIQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdp
-ZjANBgkqhkiG9w0BAQUFAAOCAQEAhEs/7E2y3/HBHrqo/K7HP4Tdh3R2wlYqgBcW
-bMryxFyEAeL3DRwyx5YP8ZvVGdDoYeR0nMiZOK/mM5Z6HrI5SctILAvzRCvA5vd4
-BDwQn6ywEFaCcbjKLn+qWp9+Edb4eKlfX+iy6biEyhU4xxM7l/oTi60XqUwjMhrB
-vYhJG7vUAHPzBorZdAVFX0mDKyQk6biUYK/FYdQ80FeZMgDUf3snKZfmh8ZCQTRp
-RMwhC+WtUjgR8YGq8g9Cr7IwKbigkuL52fruRz2uK/wJr4e4A2/UdkMsAwBAWr+5
-EHbDtbx/A7fv7IBuW8MyR8JQuf5kfqS8ca8cH47paHLRK9BzNA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.video2brain.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.video2brain.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.video2brain.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.video2brain.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.video2brain.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.video2brain.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.video2brain.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.video2brain.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.video2brain.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.video2brain.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">video2brain</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">video2brain</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.video2brain.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ammar</GivenName>
-    <SurName>Aganovic</SurName>
-    <EmailAddress>aganovic@parkside.at</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Thomas</GivenName>
-    <SurName>Lauter</SurName>
-    <EmailAddress>tlauter@video2brain.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vifamusik.de.xml b/swamid-interfederations-2.0/www.vifamusik.de.xml
deleted file mode 100644
index 12d821ca..00000000
--- a/swamid-interfederations-2.0/www.vifamusik.de.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vifamusik.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.vifamusik.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.historicum.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
-ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
-VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
-kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
-+qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
-/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
-V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
-3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
-syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
-cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
-3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
-2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
-bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
-J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
-IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
-CQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.historicum.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
-ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
-VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
-kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
-+qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
-/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
-V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
-3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
-syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
-cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
-3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
-2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
-bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
-J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
-IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
-CQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.vifamusik.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.vifamusik.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.vifamusik.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vifarom.de.xml b/swamid-interfederations-2.0/www.vifarom.de.xml
deleted file mode 100644
index 13378f58..00000000
--- a/swamid-interfederations-2.0/www.vifarom.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vifarom.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.vifarom.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.vifarom.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.vifarom.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHEnRY6lxAVTANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTEwNzA3WhcNMTYw
-ODIyMTEwNzA3WjCBljELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRcwFQYD
-VQQDEw53d3cudmlmYXJvbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMVCVmepur2mn7u0TH+e8FmYI2pDpSH5jvgZG2e97/iB26diSvba9zNQz64m
-WTJx7ZAKY3UYFd32qLNJ+0aNJ0cPzdB+fcOE7zVnVZLVvyiFn7/SLkP0F2DPSilX
-XDQYB9y5RZQt7MP0liE78qdQLNbw7EEuX9GZozpspMKelRskhzBXXcS5POYM/9b7
-e/vcaKmR10RKtapeiYma06DD+oyBVkWpmM0EGS9DzdtI629D3WfP+J4TPHnkeOz1
-JdZ5/qsclJH3iejl47e936qeTsDgMH+wD8teK9N6MZS6+y5bBnoCbOsX+Rf8HnQU
-KlOZxg8n0qTm4LWXIZfjRt/xhWsCAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUx1w8vbdgEF52KU46RaAj5IwM650wHwYDVR0jBBgwFoAUemeMWxoTRIKzIVob
-KorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVyaXNj
-aGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmwwgcoG
-CCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBU8lbpQq5A7JJjsY9yACjaowfp
-NoP7w3+GisbTZFMXn+IHPlseyap7dBPFCVqxqjOT4bRiNKGmUa/upcZDSSZ3dwp7
-MggO8Nj+mPPUy88lY0IUjYNY5I+q3CAkpqV5MrQCxP19jwDNEPWXTjf3fIBAoDeo
-iTFSZYYAtPvA35TeyS/s7rwg/XvQ4/42XxOpkiV6363IObcIVgt9febaw8Z1sK2P
-6FzsA6UXH+xSh40bQV02YjuWrQtAK1dkjJmUrjQL5+t45hCO0lnYb3njX6oGzTSw
-7pkahKXfb58uiLQ9fj/0PEmoMlI00WUMINoB2jjwwA7gISALB3eB8V+9TKCU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.vifarom.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.vifarom.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHEnRY6lxAVTANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTEwNzA3WhcNMTYw
-ODIyMTEwNzA3WjCBljELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRcwFQYD
-VQQDEw53d3cudmlmYXJvbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMVCVmepur2mn7u0TH+e8FmYI2pDpSH5jvgZG2e97/iB26diSvba9zNQz64m
-WTJx7ZAKY3UYFd32qLNJ+0aNJ0cPzdB+fcOE7zVnVZLVvyiFn7/SLkP0F2DPSilX
-XDQYB9y5RZQt7MP0liE78qdQLNbw7EEuX9GZozpspMKelRskhzBXXcS5POYM/9b7
-e/vcaKmR10RKtapeiYma06DD+oyBVkWpmM0EGS9DzdtI629D3WfP+J4TPHnkeOz1
-JdZ5/qsclJH3iejl47e936qeTsDgMH+wD8teK9N6MZS6+y5bBnoCbOsX+Rf8HnQU
-KlOZxg8n0qTm4LWXIZfjRt/xhWsCAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUx1w8vbdgEF52KU46RaAj5IwM650wHwYDVR0jBBgwFoAUemeMWxoTRIKzIVob
-KorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVyaXNj
-aGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmwwgcoG
-CCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBU8lbpQq5A7JJjsY9yACjaowfp
-NoP7w3+GisbTZFMXn+IHPlseyap7dBPFCVqxqjOT4bRiNKGmUa/upcZDSSZ3dwp7
-MggO8Nj+mPPUy88lY0IUjYNY5I+q3CAkpqV5MrQCxP19jwDNEPWXTjf3fIBAoDeo
-iTFSZYYAtPvA35TeyS/s7rwg/XvQ4/42XxOpkiV6363IObcIVgt9febaw8Z1sK2P
-6FzsA6UXH+xSh40bQV02YjuWrQtAK1dkjJmUrjQL5+t45hCO0lnYb3njX6oGzTSw
-7pkahKXfb58uiLQ9fj/0PEmoMlI00WUMINoB2jjwwA7gISALB3eB8V+9TKCU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifarom.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifarom.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifarom.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifarom.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifarom.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifarom.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifarom.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifarom.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.vifarom.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.vifarom.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.vifarom.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www2.munzinger.de.xml b/swamid-interfederations-2.0/www2.munzinger.de.xml
deleted file mode 100644
index 76cd045e..00000000
--- a/swamid-interfederations-2.0/www2.munzinger.de.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.munzinger.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/WAYF/CM" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www2.munzinger.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www2.munzinger.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBTCCA+2gAwIBAgIEDG9M8jANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wODA2MTExMzEzMDZaFw0xMzA2
-MTAxMzEzMDZaMFAxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRowGAYDVQQDExF3d3cyLm11bnppbmdlci5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOouvAtoDQ13S1vtkcStbSTF+86X
-tE+aXnZdV6QakFLpdlHCbvjzkMw014S0cExxwV8XyDo9eTz3QqfMkUxAQMi9bDjh
-vCDby/9navCkBYFtU0ZXCVKy/07jsGn+wBN0mPtTatnDvdLnZjMgDMGDR7GFBFBa
-R+Z1X873XK7M506lDl7JQhNwmDgkJ5vOisrguTs9VVlqTu30SCqvrA18KuqSdc+N
-+yC7Bqp7Keg/8j1lIjsfH9HXRpAiy4rDxmYN1WAS/sr4r8VhcGQUMletDgL/bOEa
-aAHbphz3cp/Oz2X6hpVpu1EHe0xabpKLdoyIhzwj9VdLnwFfiNz+ANgmPtsCAwEA
-AaOCAeAwggHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/OmtBwhF0wtWUf6Gs+gnRYZjoIsw
-HwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIgYDVR0RBBswGYEXaG9z
-dG1hc3RlckBtdW56aW5nZXIuZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNy
-bC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
-Y2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCBmjBLBggr
-BgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMt
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAFwrMvwYiwLfRsdnjMEWc9PWe54Wd3dU
-NiRSZSf73BaO75Jrp24kMrkjpby2SUNp0mkHtOJcYzzqMnM0cqxl+9HEhC0V0Dyw
-OS3I6/s+6G52kYuXklJ6cF/LAVInsBwypG7QGqQnSZLsdNLLHaqoqsitW9rghifn
-Cq6zE4S8CunLgcBuq6OqceH6UG5xCKok4CNu+CRP58gd/kOVBY9OMxKz2qd0SI+V
-V8pzrKBUVi+WWpDKk4Zl/WUkw2Wghb47KdkwoiAc+jxJKb+DmmJqRDHC2TDcz7+y
-gygw6R99wEGZNbIaNZXpwjroeAeNLtrGbBJPyfhQt3D1r/MYdepa4T8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Munzinger-Archiv GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Munzinger-Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.munzinger.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Bernhard</GivenName>
-    <SurName>Ziegler</SurName>
-    <EmailAddress>zi@munzinger.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Willi</GivenName>
-    <SurName>Mader</SurName>
-    <EmailAddress>ma@munzinger.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zividp.uni-muenster.de.xml b/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
new file mode 100644
index 00000000..d8a6281b
--- /dev/null
+++ b/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zividp.uni-muenster.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-08-09T14:28:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Münster</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Westfälischen Wilhelms-Universität Münster.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of the Westfälische Wilhelms-Universität Münster.</mdui:Description>
+        <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
+dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
+MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
+MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
+cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
+5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
+fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
+D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
+brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
+/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
+h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
+3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
+FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
+hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
+BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
+Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
+fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
+2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
+DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
+v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
+pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
+dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
+MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
+MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
+cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
+5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
+fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
+D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
+brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
+/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
+h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
+3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
+FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
+hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
+BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
+Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
+fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
+2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
+DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
+v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
+pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zividp.uni-muenster.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
+dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
+MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
+MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
+cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
+5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
+fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
+D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
+brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
+/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
+h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
+3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
+FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
+hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
+BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
+Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
+fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
+2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
+DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
+v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
+pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
+dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
+MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
+MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
+cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
+5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
+fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
+D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
+brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
+/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
+h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
+3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
+FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
+hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
+BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
+Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
+fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
+2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
+DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
+v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
+pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e247</OrganizationName>
+    <OrganizationName xml:lang="en">e247</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-muenster.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Christian</GivenName>
+    <SurName>Schild</SurName>
+    <EmailAddress>mailto:schild@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Christian</GivenName>
+    <SurName>Schild</SurName>
+    <EmailAddress>mailto:schild@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
author	Fredrik Åslund <fredrik.aslund@umu.se>	2014-03-11 10:55:41 +0100
committer	Fredrik Åslund <fredrik.aslund@umu.se>	2014-03-11 10:55:41 +0100
commit	f42e9ed213788b0335c80cb25408d89270313cbc (patch)
tree	205fe0b17b12783e64c032476641eb2db3105929 /swamid-interfederations-2.0
parent	b26bbb98b31766b432cc74f4905a9e1966a5ab4b (diff)
parent	503169139d1f1974e3be567c905d623d65d233d8 (diff)